diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
deleted file mode 100644
index dd55441296a..00000000000
--- a/.devcontainer/Dockerfile
+++ /dev/null
@@ -1,70 +0,0 @@
-FROM ubuntu:22.04 as deps
-
-ARG TARGETARCH
-
-# Avoid interactive prompts during package installation
-ENV DEBIAN_FRONTEND=noninteractive
-
-# Install system dependencies, python 3.10, and java 17
-RUN apt-get update && \
-    apt-get install -y \
-    curl wget git build-essential pkg-config libssl-dev libffi-dev software-properties-common \
-    python3.10 python3.10-dev \
-    openjdk-17-jdk \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install maven 3.9.10
-RUN wget https://dlcdn.apache.org/maven/maven-3/3.9.10/binaries/apache-maven-3.9.10-bin.tar.gz \
-    && tar -xzf apache-maven-3.9.10-bin.tar.gz \
-    && mv apache-maven-3.9.10 /opt/maven \
-    && rm apache-maven-3.9.10-bin.tar.gz
-
-# Install go 1.23.0
-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.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 \
-    && ./configure --without-rs --enable-libs=no --enable-tests=no \
-    && make -j$(nproc) \
-    && make install \
-    && cd .. \
-    && rm -rf thrift-0.22.0 thrift-0.22.0.tar.gz
-
-# Create non-root user (developer)
-RUN useradd -m -s /bin/bash developer
-USER developer
-WORKDIR /home/developer
-
-# Set environment variables
-ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-$TARGETARCH
-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 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 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
deleted file mode 100644
index 0d57e5e080b..00000000000
--- a/.devcontainer/database_scripts/init/00-accounts.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 0f253c84308..00000000000
--- a/.devcontainer/database_scripts/init/01-databases.sql
+++ /dev/null
@@ -1,3617 +0,0 @@
--- MySQL dump 10.13  Distrib 5.7.21, for Linux (x86_64)
---
--- Host: localhost    Database: app_catalog
--- ------------------------------------------------------
--- Server version	5.7.21
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Current Database: `app_catalog`
---
-
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `app_catalog` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci */;
-
-USE `app_catalog`;
-
---
--- Table structure for table `APPLICATION_DEPLOYMENT`
---
-
-DROP TABLE IF EXISTS `APPLICATION_DEPLOYMENT`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `APPLICATION_DEPLOYMENT` (
-  `DEPLOYMENT_ID` varchar(255) NOT NULL,
-  `APP_MODULE_ID` varchar(255) NOT NULL,
-  `COMPUTE_HOSTID` varchar(255) NOT NULL,
-  `EXECUTABLE_PATH` varchar(255) DEFAULT NULL,
-  `PARALLELISM` varchar(255) DEFAULT NULL,
-  `APPLICATION_DESC` varchar(255) DEFAULT NULL,
-  `ENV_MODULE_LOAD_CMD` varchar(255) DEFAULT NULL,
-  `CREATION_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `UPDATE_TIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `GATEWAY_ID` varchar(255) NOT NULL,
-  `DEFAULT_QUEUE_NAME` varchar(255) DEFAULT NULL,
-  `DEFAULT_NODE_COUNT` int(11) DEFAULT NULL,
-  `DEFAULT_CPU_COUNT` int(11) DEFAULT NULL,
-  `DEFAULT_WALLTIME` int(11) DEFAULT NULL,
-  `EDITABLE_BY_USER` tinyint(1) DEFAULT NULL,
-  PRIMARY KEY (`DEPLOYMENT_ID`),
-  KEY `COMPUTE_HOSTID` (`COMPUTE_HOSTID`),
-  KEY `APP_MODULE_ID` (`APP_MODULE_ID`),
-  CONSTRAINT `application_deployment_ibfk_1` FOREIGN KEY (`COMPUTE_HOSTID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE,
-  CONSTRAINT `application_deployment_ibfk_2` FOREIGN KEY (`APP_MODULE_ID`) REFERENCES `APPLICATION_MODULE` (`MODULE_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `APPLICATION_DEPLOYMENT`
---
-
-LOCK TABLES `APPLICATION_DEPLOYMENT` WRITE;
-/*!40000 ALTER TABLE `APPLICATION_DEPLOYMENT` DISABLE KEYS */;
-INSERT INTO `APPLICATION_DEPLOYMENT` VALUES ('js-156-93.jetstream-cloud.org_Echo_88202f35-beef-414a-84a4-6ee9dd4f5a84','Echo_88202f35-beef-414a-84a4-6ee9dd4f5a84','js-156-93.jetstream-cloud.org_f0813875-de5b-4abb-b56f-eb9237809c61','/home/grid_user/apps/echo_wrapper.sh','SERIAL','',NULL,'2019-02-26 10:42:01','2019-02-26 10:42:01','default','cloud',1,2,0,0);
-/*!40000 ALTER TABLE `APPLICATION_DEPLOYMENT` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `APPLICATION_INPUT`
---
-
-DROP TABLE IF EXISTS `APPLICATION_INPUT`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `APPLICATION_INPUT` (
-  `INTERFACE_ID` varchar(255) NOT NULL,
-  `INPUT_KEY` varchar(255) NOT NULL,
-  `INPUT_VALUE` varchar(255) DEFAULT NULL,
-  `DATA_TYPE` varchar(255) DEFAULT NULL,
-  `METADATA` varchar(4096) DEFAULT NULL,
-  `APP_ARGUMENT` varchar(255) DEFAULT NULL,
-  `STANDARD_INPUT` smallint(6) DEFAULT NULL,
-  `USER_FRIENDLY_DESC` varchar(255) DEFAULT NULL,
-  `INPUT_ORDER` int(11) DEFAULT NULL,
-  `IS_REQUIRED` smallint(6) DEFAULT NULL,
-  `REQUIRED_TO_COMMANDLINE` smallint(6) DEFAULT NULL,
-  `DATA_STAGED` smallint(6) DEFAULT NULL,
-  `IS_READ_ONLY` smallint(6) DEFAULT NULL,
-  PRIMARY KEY (`INTERFACE_ID`,`INPUT_KEY`),
-  CONSTRAINT `application_input_ibfk_1` FOREIGN KEY (`INTERFACE_ID`) REFERENCES `APPLICATION_INTERFACE` (`INTERFACE_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `APPLICATION_INPUT`
---
-
-LOCK TABLES `APPLICATION_INPUT` WRITE;
-/*!40000 ALTER TABLE `APPLICATION_INPUT` DISABLE KEYS */;
-INSERT INTO `APPLICATION_INPUT` VALUES ('Echo_661f23c7-eca7-49ba-987b-55f4202b60bb','Input-To-Echo','','STRING',NULL,'',0,'',0,1,1,0,0);
-/*!40000 ALTER TABLE `APPLICATION_INPUT` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `APPLICATION_INTERFACE`
---
-
-DROP TABLE IF EXISTS `APPLICATION_INTERFACE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `APPLICATION_INTERFACE` (
-  `INTERFACE_ID` varchar(255) NOT NULL,
-  `APPLICATION_NAME` varchar(255) DEFAULT NULL,
-  `APPLICATION_DESCRIPTION` varchar(500) DEFAULT NULL,
-  `GATEWAY_ID` varchar(255) NOT NULL,
-  `ARCHIVE_WORKING_DIRECTORY` smallint(6) DEFAULT NULL,
-  `HAS_OPTIONAL_FILE_INPUTS` tinyint(1) DEFAULT NULL,
-  `CREATION_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `UPDATE_TIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  PRIMARY KEY (`INTERFACE_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `APPLICATION_INTERFACE`
---
-
-LOCK TABLES `APPLICATION_INTERFACE` WRITE;
-/*!40000 ALTER TABLE `APPLICATION_INTERFACE` DISABLE KEYS */;
-INSERT INTO `APPLICATION_INTERFACE` VALUES ('Echo_661f23c7-eca7-49ba-987b-55f4202b60bb','Echo','A Simple Echo Application','default',1,0,'2019-02-25 18:57:38','2019-02-25 18:57:38');
-/*!40000 ALTER TABLE `APPLICATION_INTERFACE` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `APPLICATION_MODULE`
---
-
-DROP TABLE IF EXISTS `APPLICATION_MODULE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `APPLICATION_MODULE` (
-  `MODULE_ID` varchar(255) NOT NULL,
-  `MODULE_NAME` varchar(255) DEFAULT NULL,
-  `MODULE_VERSION` varchar(255) DEFAULT NULL,
-  `MODULE_DESC` varchar(500) DEFAULT NULL,
-  `GATEWAY_ID` varchar(255) NOT NULL,
-  `CREATION_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `UPDATE_TIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  PRIMARY KEY (`MODULE_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `APPLICATION_MODULE`
---
-
-LOCK TABLES `APPLICATION_MODULE` WRITE;
-/*!40000 ALTER TABLE `APPLICATION_MODULE` DISABLE KEYS */;
-INSERT INTO `APPLICATION_MODULE` VALUES ('Echo_88202f35-beef-414a-84a4-6ee9dd4f5a84','Echo','','','default','2019-02-25 18:53:41','2019-02-25 18:53:41');
-/*!40000 ALTER TABLE `APPLICATION_MODULE` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `APPLICATION_OUTPUT`
---
-
-DROP TABLE IF EXISTS `APPLICATION_OUTPUT`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `APPLICATION_OUTPUT` (
-  `INTERFACE_ID` varchar(255) NOT NULL,
-  `OUTPUT_KEY` varchar(255) NOT NULL,
-  `OUTPUT_VALUE` varchar(255) DEFAULT NULL,
-  `DATA_TYPE` varchar(255) DEFAULT NULL,
-  `IS_REQUIRED` smallint(6) DEFAULT NULL,
-  `REQUIRED_TO_COMMANDLINE` smallint(6) DEFAULT NULL,
-  `DATA_MOVEMENT` smallint(6) DEFAULT NULL,
-  `DATA_NAME_LOCATION` varchar(255) DEFAULT NULL,
-  `SEARCH_QUERY` varchar(255) DEFAULT NULL,
-  `APP_ARGUMENT` varchar(255) DEFAULT NULL,
-  `OUTPUT_STREAMING` smallint(6) DEFAULT NULL,
-  `METADATA` varchar(4096) DEFAULT NULL,
-  PRIMARY KEY (`INTERFACE_ID`,`OUTPUT_KEY`),
-  CONSTRAINT `application_output_ibfk_1` FOREIGN KEY (`INTERFACE_ID`) REFERENCES `APPLICATION_INTERFACE` (`INTERFACE_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `APPLICATION_OUTPUT`
---
-
-LOCK TABLES `APPLICATION_OUTPUT` WRITE;
-/*!40000 ALTER TABLE `APPLICATION_OUTPUT` DISABLE KEYS */;
-INSERT INTO `APPLICATION_OUTPUT` VALUES ('Echo_661f23c7-eca7-49ba-987b-55f4202b60bb','Echo-Standard-Error','','STDERR',1,0,0,NULL,'','',0, NULL),('Echo_661f23c7-eca7-49ba-987b-55f4202b60bb','Echo-Standard-Out','','STDOUT',1,0,0,NULL,'','',0, NULL);
-/*!40000 ALTER TABLE `APPLICATION_OUTPUT` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `APP_ENVIRONMENT`
---
-
-DROP TABLE IF EXISTS `APP_ENVIRONMENT`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `APP_ENVIRONMENT` (
-  `DEPLOYMENT_ID` varchar(255) NOT NULL,
-  `NAME` varchar(255) NOT NULL,
-  `VALUE` varchar(255) DEFAULT NULL,
-  `ENV_ORDER` int(11) DEFAULT NULL,
-  PRIMARY KEY (`DEPLOYMENT_ID`,`NAME`),
-  CONSTRAINT `app_environment_ibfk_1` FOREIGN KEY (`DEPLOYMENT_ID`) REFERENCES `APPLICATION_DEPLOYMENT` (`DEPLOYMENT_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `APP_ENVIRONMENT`
---
-
-LOCK TABLES `APP_ENVIRONMENT` WRITE;
-/*!40000 ALTER TABLE `APP_ENVIRONMENT` DISABLE KEYS */;
-/*!40000 ALTER TABLE `APP_ENVIRONMENT` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `APP_MODULE_MAPPING`
---
-
-DROP TABLE IF EXISTS `APP_MODULE_MAPPING`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `APP_MODULE_MAPPING` (
-  `INTERFACE_ID` varchar(255) NOT NULL,
-  `MODULE_ID` varchar(255) NOT NULL,
-  PRIMARY KEY (`INTERFACE_ID`,`MODULE_ID`),
-  KEY `MODULE_ID` (`MODULE_ID`),
-  CONSTRAINT `app_module_mapping_ibfk_1` FOREIGN KEY (`INTERFACE_ID`) REFERENCES `APPLICATION_INTERFACE` (`INTERFACE_ID`) ON DELETE CASCADE,
-  CONSTRAINT `app_module_mapping_ibfk_2` FOREIGN KEY (`MODULE_ID`) REFERENCES `APPLICATION_MODULE` (`MODULE_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `APP_MODULE_MAPPING`
---
-
-LOCK TABLES `APP_MODULE_MAPPING` WRITE;
-/*!40000 ALTER TABLE `APP_MODULE_MAPPING` DISABLE KEYS */;
-INSERT INTO `APP_MODULE_MAPPING` VALUES ('Echo_661f23c7-eca7-49ba-987b-55f4202b60bb','Echo_88202f35-beef-414a-84a4-6ee9dd4f5a84');
-/*!40000 ALTER TABLE `APP_MODULE_MAPPING` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `BATCH_QUEUE`
---
-
-DROP TABLE IF EXISTS `BATCH_QUEUE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `BATCH_QUEUE` (
-  `COMPUTE_RESOURCE_ID` varchar(255) NOT NULL,
-  `MAX_RUNTIME` int(11) DEFAULT NULL,
-  `MAX_JOB_IN_QUEUE` int(11) DEFAULT NULL,
-  `QUEUE_DESCRIPTION` varchar(255) DEFAULT NULL,
-  `QUEUE_NAME` varchar(255) NOT NULL,
-  `MAX_PROCESSORS` int(11) DEFAULT NULL,
-  `MAX_NODES` int(11) DEFAULT NULL,
-  `MAX_MEMORY` int(11) DEFAULT NULL,
-  `CPU_PER_NODE` int(11) DEFAULT NULL,
-  `DEFAULT_NODE_COUNT` int(11) DEFAULT NULL,
-  `DEFAULT_CPU_COUNT` int(11) DEFAULT NULL,
-  `DEFAULT_WALLTIME` int(11) DEFAULT NULL,
-  `QUEUE_SPECIFIC_MACROS` varchar(255) DEFAULT NULL,
-  `IS_DEFAULT_QUEUE` tinyint(1) DEFAULT NULL,
-  PRIMARY KEY (`COMPUTE_RESOURCE_ID`,`QUEUE_NAME`),
-  CONSTRAINT `batch_queue_ibfk_1` FOREIGN KEY (`COMPUTE_RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `BATCH_QUEUE`
---
-
-LOCK TABLES `BATCH_QUEUE` WRITE;
-/*!40000 ALTER TABLE `BATCH_QUEUE` DISABLE KEYS */;
-INSERT INTO `BATCH_QUEUE` VALUES ('js-156-93.jetstream-cloud.org_f0813875-de5b-4abb-b56f-eb9237809c61',180,300,'cloud partition','cloud',4,2,0,2,1,2,30,'',0);
-/*!40000 ALTER TABLE `BATCH_QUEUE` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `BATCH_QUEUE_RESOURCE_POLICY`
---
-
-DROP TABLE IF EXISTS `BATCH_QUEUE_RESOURCE_POLICY`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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` int(11) DEFAULT NULL,
-  `MAX_ALLOWED_CORES` int(11) DEFAULT NULL,
-  `MAX_ALLOWED_WALLTIME` int(11) DEFAULT NULL,
-  PRIMARY KEY (`RESOURCE_POLICY_ID`),
-  KEY `COMPUTE_RESOURCE_ID` (`COMPUTE_RESOURCE_ID`),
-  KEY `GROUP_RESOURCE_PROFILE_ID` (`GROUP_RESOURCE_PROFILE_ID`),
-  CONSTRAINT `batch_queue_resource_policy_ibfk_1` FOREIGN KEY (`COMPUTE_RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE,
-  CONSTRAINT `batch_queue_resource_policy_ibfk_2` FOREIGN KEY (`GROUP_RESOURCE_PROFILE_ID`) REFERENCES `GROUP_RESOURCE_PROFILE` (`GROUP_RESOURCE_PROFILE_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `BATCH_QUEUE_RESOURCE_POLICY`
---
-
-LOCK TABLES `BATCH_QUEUE_RESOURCE_POLICY` WRITE;
-/*!40000 ALTER TABLE `BATCH_QUEUE_RESOURCE_POLICY` DISABLE KEYS */;
-/*!40000 ALTER TABLE `BATCH_QUEUE_RESOURCE_POLICY` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `CLOUD_JOB_SUBMISSION`
---
-
-DROP TABLE IF EXISTS `CLOUD_JOB_SUBMISSION`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `CLOUD_JOB_SUBMISSION`
---
-
-LOCK TABLES `CLOUD_JOB_SUBMISSION` WRITE;
-/*!40000 ALTER TABLE `CLOUD_JOB_SUBMISSION` DISABLE KEYS */;
-/*!40000 ALTER TABLE `CLOUD_JOB_SUBMISSION` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `COMPUTE_RESOURCE`
---
-
-DROP TABLE IF EXISTS `COMPUTE_RESOURCE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `COMPUTE_RESOURCE` (
-  `RESOURCE_ID` varchar(255) NOT NULL,
-  `HOST_NAME` varchar(255) NOT NULL,
-  `RESOURCE_DESCRIPTION` varchar(255) DEFAULT NULL,
-  `CREATION_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `UPDATE_TIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `MAX_MEMORY_NODE` int(11) DEFAULT NULL,
-  `CPUS_PER_NODE` int(11) DEFAULT NULL,
-  `DEFAULT_NODE_COUNT` int(11) DEFAULT NULL,
-  `DEFAULT_CPU_COUNT` int(11) DEFAULT NULL,
-  `DEFAULT_WALLTIME` int(11) DEFAULT NULL,
-  `ENABLED` smallint(6) DEFAULT NULL,
-  `GATEWAY_USAGE_REPORTING` tinyint(1) DEFAULT NULL,
-  `GATEWAY_USAGE_MODULE_LOAD_CMD` varchar(500) DEFAULT NULL,
-  `GATEWAY_USAGE_EXECUTABLE` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`RESOURCE_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `COMPUTE_RESOURCE`
---
-
-LOCK TABLES `COMPUTE_RESOURCE` WRITE;
-/*!40000 ALTER TABLE `COMPUTE_RESOURCE` DISABLE KEYS */;
-INSERT INTO `COMPUTE_RESOURCE` VALUES ('js-156-93.jetstream-cloud.org_f0813875-de5b-4abb-b56f-eb9237809c61','js-156-93.jetstream-cloud.org','','2019-02-25 23:50:45','2019-02-25 23:50:45',0,NULL,NULL,NULL,NULL,1,0,NULL,NULL);
-/*!40000 ALTER TABLE `COMPUTE_RESOURCE` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `COMPUTE_RESOURCE_FILE_SYSTEM`
---
-
-DROP TABLE IF EXISTS `COMPUTE_RESOURCE_FILE_SYSTEM`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `COMPUTE_RESOURCE_FILE_SYSTEM` (
-  `COMPUTE_RESOURCE_ID` varchar(255) NOT NULL,
-  `PATH` varchar(255) DEFAULT NULL,
-  `FILE_SYSTEM` varchar(255) NOT NULL,
-  PRIMARY KEY (`COMPUTE_RESOURCE_ID`,`FILE_SYSTEM`),
-  CONSTRAINT `compute_resource_file_system_ibfk_1` FOREIGN KEY (`COMPUTE_RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `COMPUTE_RESOURCE_FILE_SYSTEM`
---
-
-LOCK TABLES `COMPUTE_RESOURCE_FILE_SYSTEM` WRITE;
-/*!40000 ALTER TABLE `COMPUTE_RESOURCE_FILE_SYSTEM` DISABLE KEYS */;
-/*!40000 ALTER TABLE `COMPUTE_RESOURCE_FILE_SYSTEM` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `COMPUTE_RESOURCE_POLICY`
---
-
-DROP TABLE IF EXISTS `COMPUTE_RESOURCE_POLICY`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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`),
-  KEY `COMPUTE_RESOURCE_ID` (`COMPUTE_RESOURCE_ID`),
-  KEY `GROUP_RESOURCE_PROFILE_ID` (`GROUP_RESOURCE_PROFILE_ID`),
-  CONSTRAINT `compute_resource_policy_ibfk_1` FOREIGN KEY (`COMPUTE_RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE,
-  CONSTRAINT `compute_resource_policy_ibfk_2` FOREIGN KEY (`GROUP_RESOURCE_PROFILE_ID`) REFERENCES `GROUP_RESOURCE_PROFILE` (`GROUP_RESOURCE_PROFILE_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `COMPUTE_RESOURCE_POLICY`
---
-
-LOCK TABLES `COMPUTE_RESOURCE_POLICY` WRITE;
-/*!40000 ALTER TABLE `COMPUTE_RESOURCE_POLICY` DISABLE KEYS */;
-INSERT INTO `COMPUTE_RESOURCE_POLICY` VALUES ('ae1b950e-b714-4d59-949b-338c6d6cf640','js-156-93.jetstream-cloud.org_f0813875-de5b-4abb-b56f-eb9237809c61','af03c63d-a40e-4ed1-aee0-759a6ed0202c');
-/*!40000 ALTER TABLE `COMPUTE_RESOURCE_POLICY` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `COMPUTE_RESOURCE_POLICY_QUEUES`
---
-
-DROP TABLE IF EXISTS `COMPUTE_RESOURCE_POLICY_QUEUES`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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`),
-  CONSTRAINT `compute_resource_policy_queues_ibfk_1` FOREIGN KEY (`RESOURCE_POLICY_ID`) REFERENCES `COMPUTE_RESOURCE_POLICY` (`RESOURCE_POLICY_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `COMPUTE_RESOURCE_POLICY_QUEUES`
---
-
-LOCK TABLES `COMPUTE_RESOURCE_POLICY_QUEUES` WRITE;
-/*!40000 ALTER TABLE `COMPUTE_RESOURCE_POLICY_QUEUES` DISABLE KEYS */;
-INSERT INTO `COMPUTE_RESOURCE_POLICY_QUEUES` VALUES ('ae1b950e-b714-4d59-949b-338c6d6cf640','cloud');
-/*!40000 ALTER TABLE `COMPUTE_RESOURCE_POLICY_QUEUES` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `COMPUTE_RESOURCE_PREFERENCE`
---
-
-DROP TABLE IF EXISTS `COMPUTE_RESOURCE_PREFERENCE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `COMPUTE_RESOURCE_PREFERENCE` (
-  `GATEWAY_ID` varchar(255) NOT NULL,
-  `RESOURCE_ID` varchar(255) NOT NULL,
-  `OVERRIDE_BY_AIRAVATA` smallint(6) DEFAULT NULL,
-  `PREFERED_JOB_SUB_PROTOCOL` varchar(255) DEFAULT NULL,
-  `PREFERED_DATA_MOVE_PROTOCOL` varchar(255) DEFAULT NULL,
-  `PREFERED_BATCH_QUEUE` varchar(255) DEFAULT NULL,
-  `SCRATCH_LOCATION` varchar(255) DEFAULT NULL,
-  `ALLOCATION_PROJECT_NUMBER` varchar(255) DEFAULT NULL,
-  `LOGIN_USERNAME` varchar(255) DEFAULT NULL,
-  `RESOURCE_CS_TOKEN` varchar(255) DEFAULT NULL,
-  `USAGE_REPORTING_GATEWAY_ID` varchar(255) DEFAULT NULL,
-  `QUALITY_OF_SERVICE` varchar(255) DEFAULT NULL,
-  `RESERVATION` varchar(255) DEFAULT NULL,
-  `RESERVATION_START_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `RESERVATION_END_TIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `SSH_ACCOUNT_PROVISIONER` varchar(255) DEFAULT NULL,
-  `SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO` varchar(1000) DEFAULT NULL,
-  PRIMARY KEY (`GATEWAY_ID`,`RESOURCE_ID`),
-  KEY `RESOURCE_ID` (`RESOURCE_ID`),
-  CONSTRAINT `compute_resource_preference_ibfk_1` FOREIGN KEY (`RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE,
-  CONSTRAINT `compute_resource_preference_ibfk_2` FOREIGN KEY (`GATEWAY_ID`) REFERENCES `GATEWAY_PROFILE` (`GATEWAY_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `COMPUTE_RESOURCE_PREFERENCE`
---
-
-LOCK TABLES `COMPUTE_RESOURCE_PREFERENCE` WRITE;
-/*!40000 ALTER TABLE `COMPUTE_RESOURCE_PREFERENCE` DISABLE KEYS */;
-INSERT INTO `COMPUTE_RESOURCE_PREFERENCE` VALUES ('default','js-156-93.jetstream-cloud.org_f0813875-de5b-4abb-b56f-eb9237809c61',1,'SSH','SCP','cloud','/home/grid_user/airavata-workdirs','','grid_user','46a99a5a-8b55-4982-bfd7-90fe72b00d46',NULL,'','','2010-12-31 19:00:00','2030-12-31 19:00:00',NULL,NULL);
-/*!40000 ALTER TABLE `COMPUTE_RESOURCE_PREFERENCE` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `CONFIGURATION`
---
-
-DROP TABLE IF EXISTS `CONFIGURATION`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `CONFIGURATION` (
-  `CONFIG_KEY` varchar(255) NOT NULL,
-  `CONFIG_VAL` varchar(255) NOT NULL,
-  PRIMARY KEY (`CONFIG_KEY`,`CONFIG_VAL`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `CONFIGURATION`
---
-
-LOCK TABLES `CONFIGURATION` WRITE;
-/*!40000 ALTER TABLE `CONFIGURATION` DISABLE KEYS */;
-INSERT INTO `CONFIGURATION` VALUES ('app_catalog_version','0.16');
-/*!40000 ALTER TABLE `CONFIGURATION` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `DATA_MOVEMENT_INTERFACE`
---
-
-DROP TABLE IF EXISTS `DATA_MOVEMENT_INTERFACE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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` int(11) DEFAULT NULL,
-  `CREATION_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `UPDATE_TIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  PRIMARY KEY (`COMPUTE_RESOURCE_ID`,`DATA_MOVEMENT_INTERFACE_ID`),
-  CONSTRAINT `data_movement_interface_ibfk_1` FOREIGN KEY (`COMPUTE_RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `DATA_MOVEMENT_INTERFACE`
---
-
-LOCK TABLES `DATA_MOVEMENT_INTERFACE` WRITE;
-/*!40000 ALTER TABLE `DATA_MOVEMENT_INTERFACE` DISABLE KEYS */;
-INSERT INTO `DATA_MOVEMENT_INTERFACE` VALUES ('js-156-93.jetstream-cloud.org_f0813875-de5b-4abb-b56f-eb9237809c61','SCP','SCP_1e775974-c405-4793-9e6c-a88d98013a28',0,'2019-02-25 23:53:15','2019-02-25 23:53:15');
-/*!40000 ALTER TABLE `DATA_MOVEMENT_INTERFACE` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `GATEWAY_GROUPS`
---
-
-DROP TABLE IF EXISTS `GATEWAY_GROUPS`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `GATEWAY_GROUPS` (
-  `GATEWAY_ID` varchar(255) NOT NULL,
-  `ADMINS_GROUP_ID` varchar(255) DEFAULT NULL,
-  `READ_ONLY_ADMINS_GROUP_ID` varchar(255) DEFAULT NULL,
-  `DEFAULT_GATEWAY_USERS_GROUP_ID` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`GATEWAY_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `GATEWAY_GROUPS`
---
-
-LOCK TABLES `GATEWAY_GROUPS` WRITE;
-/*!40000 ALTER TABLE `GATEWAY_GROUPS` DISABLE KEYS */;
-INSERT INTO `GATEWAY_GROUPS` VALUES ('default','Admin_Users_ba3e4af7-9b1d-4f46-b43a-2b44790f6868','Read_Only_Admin_Users_68f97cb6-9d9a-4a41-a15e-1db24ec087b3','Gateway_Users_2e4e6eb4-05ad-4a0f-92d1-02aa26c56004');
-/*!40000 ALTER TABLE `GATEWAY_GROUPS` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `GATEWAY_PROFILE`
---
-
-DROP TABLE IF EXISTS `GATEWAY_PROFILE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `GATEWAY_PROFILE` (
-  `GATEWAY_ID` varchar(255) NOT NULL,
-  `CREATION_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `UPDATE_TIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `CS_TOKEN` varchar(255) DEFAULT NULL,
-  `IDENTITY_SERVER_TENANT` varchar(255) DEFAULT NULL,
-  `IDENTITY_SERVER_PWD_CRED_TOKEN` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`GATEWAY_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `GATEWAY_PROFILE`
---
-
-LOCK TABLES `GATEWAY_PROFILE` WRITE;
-/*!40000 ALTER TABLE `GATEWAY_PROFILE` DISABLE KEYS */;
-INSERT INTO `GATEWAY_PROFILE` VALUES ('default','2019-02-26 15:15:34','2019-02-26 10:15:34',NULL,'default','daf89639-bf92-4161-9c54-34571372d092');
-/*!40000 ALTER TABLE `GATEWAY_PROFILE` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `GLOBUS_GK_ENDPOINT`
---
-
-DROP TABLE IF EXISTS `GLOBUS_GK_ENDPOINT`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `GLOBUS_GK_ENDPOINT` (
-  `SUBMISSION_ID` varchar(255) NOT NULL,
-  `ENDPOINT` varchar(255) NOT NULL,
-  PRIMARY KEY (`SUBMISSION_ID`,`ENDPOINT`),
-  CONSTRAINT `globus_gk_endpoint_ibfk_1` FOREIGN KEY (`SUBMISSION_ID`) REFERENCES `GLOBUS_SUBMISSION` (`SUBMISSION_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `GLOBUS_GK_ENDPOINT`
---
-
-LOCK TABLES `GLOBUS_GK_ENDPOINT` WRITE;
-/*!40000 ALTER TABLE `GLOBUS_GK_ENDPOINT` DISABLE KEYS */;
-/*!40000 ALTER TABLE `GLOBUS_GK_ENDPOINT` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `GLOBUS_SUBMISSION`
---
-
-DROP TABLE IF EXISTS `GLOBUS_SUBMISSION`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `GLOBUS_SUBMISSION` (
-  `SUBMISSION_ID` varchar(255) NOT NULL,
-  `RESOURCE_JOB_MANAGER` varchar(255) DEFAULT NULL,
-  `SECURITY_PROTOCAL` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`SUBMISSION_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `GLOBUS_SUBMISSION`
---
-
-LOCK TABLES `GLOBUS_SUBMISSION` WRITE;
-/*!40000 ALTER TABLE `GLOBUS_SUBMISSION` DISABLE KEYS */;
-/*!40000 ALTER TABLE `GLOBUS_SUBMISSION` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `GRIDFTP_DATA_MOVEMENT`
---
-
-DROP TABLE IF EXISTS `GRIDFTP_DATA_MOVEMENT`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `GRIDFTP_DATA_MOVEMENT` (
-  `DATA_MOVEMENT_INTERFACE_ID` varchar(255) NOT NULL,
-  `SECURITY_PROTOCOL` varchar(255) NOT NULL,
-  `CREATION_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `UPDATE_TIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  PRIMARY KEY (`DATA_MOVEMENT_INTERFACE_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `GRIDFTP_DATA_MOVEMENT`
---
-
-LOCK TABLES `GRIDFTP_DATA_MOVEMENT` WRITE;
-/*!40000 ALTER TABLE `GRIDFTP_DATA_MOVEMENT` DISABLE KEYS */;
-/*!40000 ALTER TABLE `GRIDFTP_DATA_MOVEMENT` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `GRIDFTP_ENDPOINT`
---
-
-DROP TABLE IF EXISTS `GRIDFTP_ENDPOINT`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `GRIDFTP_ENDPOINT` (
-  `ENDPOINT` varchar(255) NOT NULL,
-  `DATA_MOVEMENT_INTERFACE_ID` varchar(255) NOT NULL,
-  `CREATION_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `UPDATE_TIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  PRIMARY KEY (`DATA_MOVEMENT_INTERFACE_ID`,`ENDPOINT`),
-  CONSTRAINT `gridftp_endpoint_ibfk_1` FOREIGN KEY (`DATA_MOVEMENT_INTERFACE_ID`) REFERENCES `GRIDFTP_DATA_MOVEMENT` (`DATA_MOVEMENT_INTERFACE_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `GRIDFTP_ENDPOINT`
---
-
-LOCK TABLES `GRIDFTP_ENDPOINT` WRITE;
-/*!40000 ALTER TABLE `GRIDFTP_ENDPOINT` DISABLE KEYS */;
-/*!40000 ALTER TABLE `GRIDFTP_ENDPOINT` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `GROUP_COMPUTE_RESOURCE_PREFERENCE`
---
-
-DROP TABLE IF EXISTS `GROUP_COMPUTE_RESOURCE_PREFERENCE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `GROUP_COMPUTE_RESOURCE_PREFERENCE` (
-  `RESOURCE_ID` varchar(255) NOT NULL,
-  `GROUP_RESOURCE_PROFILE_ID` varchar(255) NOT NULL,
-  `OVERRIDE_BY_AIRAVATA` smallint(6) DEFAULT NULL,
-  `PREFERED_JOB_SUB_PROTOCOL` varchar(255) DEFAULT NULL,
-  `PREFERED_DATA_MOVE_PROTOCOL` varchar(255) DEFAULT NULL,
-  `PREFERED_BATCH_QUEUE` varchar(255) DEFAULT NULL,
-  `SCRATCH_LOCATION` varchar(255) DEFAULT NULL,
-  `ALLOCATION_PROJECT_NUMBER` varchar(255) DEFAULT NULL,
-  `LOGIN_USERNAME` varchar(255) DEFAULT NULL,
-  `RESOURCE_CS_TOKEN` varchar(255) DEFAULT NULL,
-  `USAGE_REPORTING_GATEWAY_ID` varchar(255) DEFAULT NULL,
-  `QUALITY_OF_SERVICE` varchar(255) DEFAULT NULL,
-  `RESERVATION` varchar(255) DEFAULT NULL,
-  `RESERVATION_START_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `RESERVATION_END_TIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `SSH_ACCOUNT_PROVISIONER` varchar(255) DEFAULT NULL,
-  `SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO` varchar(1000) DEFAULT NULL,
-  PRIMARY KEY (`RESOURCE_ID`,`GROUP_RESOURCE_PROFILE_ID`),
-  KEY `GROUP_RESOURCE_PROFILE_ID` (`GROUP_RESOURCE_PROFILE_ID`),
-  CONSTRAINT `group_compute_resource_preference_ibfk_1` FOREIGN KEY (`RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE,
-  CONSTRAINT `group_compute_resource_preference_ibfk_2` FOREIGN KEY (`GROUP_RESOURCE_PROFILE_ID`) REFERENCES `GROUP_RESOURCE_PROFILE` (`GROUP_RESOURCE_PROFILE_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `GROUP_COMPUTE_RESOURCE_PREFERENCE`
---
-
-LOCK TABLES `GROUP_COMPUTE_RESOURCE_PREFERENCE` WRITE;
-/*!40000 ALTER TABLE `GROUP_COMPUTE_RESOURCE_PREFERENCE` DISABLE KEYS */;
-INSERT INTO `GROUP_COMPUTE_RESOURCE_PREFERENCE` VALUES ('js-156-93.jetstream-cloud.org_f0813875-de5b-4abb-b56f-eb9237809c61','af03c63d-a40e-4ed1-aee0-759a6ed0202c',1,NULL,NULL,NULL,'/home/grid_user/airavata-workdirs',NULL,'grid_user',NULL,NULL,NULL,NULL,'2019-03-11 15:41:14','2019-03-11 15:41:14',NULL,NULL);
-/*!40000 ALTER TABLE `GROUP_COMPUTE_RESOURCE_PREFERENCE` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `GROUP_RESOURCE_PROFILE`
---
-
-DROP TABLE IF EXISTS `GROUP_RESOURCE_PROFILE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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(20) NOT NULL,
-  `UPDATE_TIME` bigint(20) NOT NULL,
-  `DEFAULT_CREDENTIAL_STORE_TOKEN` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`GROUP_RESOURCE_PROFILE_ID`),
-  UNIQUE KEY `GATEWAY_ID` (`GATEWAY_ID`,`GROUP_RESOURCE_PROFILE_NAME`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `GROUP_RESOURCE_PROFILE`
---
-
-LOCK TABLES `GROUP_RESOURCE_PROFILE` WRITE;
-/*!40000 ALTER TABLE `GROUP_RESOURCE_PROFILE` DISABLE KEYS */;
-INSERT INTO `GROUP_RESOURCE_PROFILE` VALUES ('default','af03c63d-a40e-4ed1-aee0-759a6ed0202c','Default-Group-Resource-Profile',1552318871758,1552318871760,'46a99a5a-8b55-4982-bfd7-90fe72b00d46');
-/*!40000 ALTER TABLE `GROUP_RESOURCE_PROFILE` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `GRP_SSH_ACC_PROV_CONFIG`
---
-
-DROP TABLE IF EXISTS `GRP_SSH_ACC_PROV_CONFIG`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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) DEFAULT NULL,
-  PRIMARY KEY (`RESOURCE_ID`,`CONFIG_NAME`,`GROUP_RESOURCE_PROFILE_ID`),
-  KEY `RESOURCE_ID` (`RESOURCE_ID`,`GROUP_RESOURCE_PROFILE_ID`),
-  CONSTRAINT `grp_ssh_acc_prov_config_ibfk_1` FOREIGN KEY (`RESOURCE_ID`, `GROUP_RESOURCE_PROFILE_ID`) REFERENCES `GROUP_COMPUTE_RESOURCE_PREFERENCE` (`RESOURCE_ID`, `GROUP_RESOURCE_PROFILE_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `GRP_SSH_ACC_PROV_CONFIG`
---
-
-LOCK TABLES `GRP_SSH_ACC_PROV_CONFIG` WRITE;
-/*!40000 ALTER TABLE `GRP_SSH_ACC_PROV_CONFIG` DISABLE KEYS */;
-/*!40000 ALTER TABLE `GRP_SSH_ACC_PROV_CONFIG` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `GSISSH_EXPORT`
---
-
-DROP TABLE IF EXISTS `GSISSH_EXPORT`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `GSISSH_EXPORT` (
-  `SUBMISSION_ID` varchar(255) NOT NULL,
-  `EXPORT` varchar(255) NOT NULL,
-  PRIMARY KEY (`SUBMISSION_ID`,`EXPORT`),
-  CONSTRAINT `gsissh_export_ibfk_1` FOREIGN KEY (`SUBMISSION_ID`) REFERENCES `GSISSH_SUBMISSION` (`SUBMISSION_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `GSISSH_EXPORT`
---
-
-LOCK TABLES `GSISSH_EXPORT` WRITE;
-/*!40000 ALTER TABLE `GSISSH_EXPORT` DISABLE KEYS */;
-/*!40000 ALTER TABLE `GSISSH_EXPORT` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `GSISSH_POSTJOBCOMMAND`
---
-
-DROP TABLE IF EXISTS `GSISSH_POSTJOBCOMMAND`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `GSISSH_POSTJOBCOMMAND` (
-  `SUBMISSION_ID` varchar(255) NOT NULL,
-  `COMMAND` varchar(255) NOT NULL,
-  PRIMARY KEY (`SUBMISSION_ID`,`COMMAND`),
-  CONSTRAINT `gsissh_postjobcommand_ibfk_1` FOREIGN KEY (`SUBMISSION_ID`) REFERENCES `GSISSH_SUBMISSION` (`SUBMISSION_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `GSISSH_POSTJOBCOMMAND`
---
-
-LOCK TABLES `GSISSH_POSTJOBCOMMAND` WRITE;
-/*!40000 ALTER TABLE `GSISSH_POSTJOBCOMMAND` DISABLE KEYS */;
-/*!40000 ALTER TABLE `GSISSH_POSTJOBCOMMAND` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `GSISSH_PREJOBCOMMAND`
---
-
-DROP TABLE IF EXISTS `GSISSH_PREJOBCOMMAND`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `GSISSH_PREJOBCOMMAND` (
-  `SUBMISSION_ID` varchar(255) NOT NULL,
-  `COMMAND` varchar(255) NOT NULL,
-  PRIMARY KEY (`SUBMISSION_ID`,`COMMAND`),
-  CONSTRAINT `gsissh_prejobcommand_ibfk_1` FOREIGN KEY (`SUBMISSION_ID`) REFERENCES `GSISSH_SUBMISSION` (`SUBMISSION_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `GSISSH_PREJOBCOMMAND`
---
-
-LOCK TABLES `GSISSH_PREJOBCOMMAND` WRITE;
-/*!40000 ALTER TABLE `GSISSH_PREJOBCOMMAND` DISABLE KEYS */;
-/*!40000 ALTER TABLE `GSISSH_PREJOBCOMMAND` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `GSISSH_SUBMISSION`
---
-
-DROP TABLE IF EXISTS `GSISSH_SUBMISSION`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `GSISSH_SUBMISSION` (
-  `SUBMISSION_ID` varchar(255) NOT NULL,
-  `RESOURCE_JOB_MANAGER` varchar(255) DEFAULT NULL,
-  `SSH_PORT` int(11) DEFAULT NULL,
-  `INSTALLED_PATH` varchar(255) DEFAULT NULL,
-  `MONITOR_MODE` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`SUBMISSION_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `GSISSH_SUBMISSION`
---
-
-LOCK TABLES `GSISSH_SUBMISSION` WRITE;
-/*!40000 ALTER TABLE `GSISSH_SUBMISSION` DISABLE KEYS */;
-/*!40000 ALTER TABLE `GSISSH_SUBMISSION` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `HOST_ALIAS`
---
-
-DROP TABLE IF EXISTS `HOST_ALIAS`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `HOST_ALIAS` (
-  `RESOURCE_ID` varchar(255) NOT NULL,
-  `ALIAS` varchar(255) NOT NULL,
-  PRIMARY KEY (`RESOURCE_ID`,`ALIAS`),
-  CONSTRAINT `host_alias_ibfk_1` FOREIGN KEY (`RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `HOST_ALIAS`
---
-
-LOCK TABLES `HOST_ALIAS` WRITE;
-/*!40000 ALTER TABLE `HOST_ALIAS` DISABLE KEYS */;
-/*!40000 ALTER TABLE `HOST_ALIAS` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `HOST_IPADDRESS`
---
-
-DROP TABLE IF EXISTS `HOST_IPADDRESS`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `HOST_IPADDRESS` (
-  `RESOURCE_ID` varchar(255) NOT NULL,
-  `IP_ADDRESS` varchar(255) NOT NULL,
-  PRIMARY KEY (`RESOURCE_ID`,`IP_ADDRESS`),
-  CONSTRAINT `host_ipaddress_ibfk_1` FOREIGN KEY (`RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `HOST_IPADDRESS`
---
-
-LOCK TABLES `HOST_IPADDRESS` WRITE;
-/*!40000 ALTER TABLE `HOST_IPADDRESS` DISABLE KEYS */;
-/*!40000 ALTER TABLE `HOST_IPADDRESS` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `JOB_MANAGER_COMMAND`
---
-
-DROP TABLE IF EXISTS `JOB_MANAGER_COMMAND`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `JOB_MANAGER_COMMAND` (
-  `RESOURCE_JOB_MANAGER_ID` varchar(255) NOT NULL,
-  `COMMAND_TYPE` varchar(255) NOT NULL,
-  `COMMAND` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`RESOURCE_JOB_MANAGER_ID`,`COMMAND_TYPE`),
-  CONSTRAINT `job_manager_command_ibfk_1` FOREIGN KEY (`RESOURCE_JOB_MANAGER_ID`) REFERENCES `RESOURCE_JOB_MANAGER` (`RESOURCE_JOB_MANAGER_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `JOB_MANAGER_COMMAND`
---
-
-LOCK TABLES `JOB_MANAGER_COMMAND` WRITE;
-/*!40000 ALTER TABLE `JOB_MANAGER_COMMAND` DISABLE KEYS */;
-INSERT INTO `JOB_MANAGER_COMMAND` VALUES ('RJM_11132688-7ff1-48fb-802a-0203f8d8b14b','CHECK_JOB','squeue'),('RJM_11132688-7ff1-48fb-802a-0203f8d8b14b','DELETION','scancel'),('RJM_11132688-7ff1-48fb-802a-0203f8d8b14b','JOB_MONITORING','squeue -t all'),('RJM_11132688-7ff1-48fb-802a-0203f8d8b14b','SUBMISSION','sbatch');
-/*!40000 ALTER TABLE `JOB_MANAGER_COMMAND` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `JOB_SUBMISSION_INTERFACE`
---
-
-DROP TABLE IF EXISTS `JOB_SUBMISSION_INTERFACE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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` int(11) DEFAULT NULL,
-  `CREATION_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `UPDATE_TIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  PRIMARY KEY (`COMPUTE_RESOURCE_ID`,`JOB_SUBMISSION_INTERFACE_ID`),
-  CONSTRAINT `job_submission_interface_ibfk_1` FOREIGN KEY (`COMPUTE_RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `JOB_SUBMISSION_INTERFACE`
---
-
-LOCK TABLES `JOB_SUBMISSION_INTERFACE` WRITE;
-/*!40000 ALTER TABLE `JOB_SUBMISSION_INTERFACE` DISABLE KEYS */;
-INSERT INTO `JOB_SUBMISSION_INTERFACE` VALUES ('SSH_8cdb13a9-130b-4527-96fe-dcd0c5ffd185','js-156-93.jetstream-cloud.org_f0813875-de5b-4abb-b56f-eb9237809c61','SSH',0,'2019-02-25 23:52:55','2019-02-25 23:52:55');
-/*!40000 ALTER TABLE `JOB_SUBMISSION_INTERFACE` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `LIBRARY_APEND_PATH`
---
-
-DROP TABLE IF EXISTS `LIBRARY_APEND_PATH`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `LIBRARY_APEND_PATH` (
-  `DEPLOYMENT_ID` varchar(255) NOT NULL,
-  `NAME` varchar(255) NOT NULL,
-  `VALUE` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`DEPLOYMENT_ID`,`NAME`),
-  CONSTRAINT `library_apend_path_ibfk_1` FOREIGN KEY (`DEPLOYMENT_ID`) REFERENCES `APPLICATION_DEPLOYMENT` (`DEPLOYMENT_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `LIBRARY_APEND_PATH`
---
-
-LOCK TABLES `LIBRARY_APEND_PATH` WRITE;
-/*!40000 ALTER TABLE `LIBRARY_APEND_PATH` DISABLE KEYS */;
-/*!40000 ALTER TABLE `LIBRARY_APEND_PATH` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `LIBRARY_PREPAND_PATH`
---
-
-DROP TABLE IF EXISTS `LIBRARY_PREPAND_PATH`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `LIBRARY_PREPAND_PATH` (
-  `DEPLOYMENT_ID` varchar(255) NOT NULL,
-  `NAME` varchar(255) NOT NULL,
-  `VALUE` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`DEPLOYMENT_ID`,`NAME`),
-  CONSTRAINT `library_prepand_path_ibfk_1` FOREIGN KEY (`DEPLOYMENT_ID`) REFERENCES `APPLICATION_DEPLOYMENT` (`DEPLOYMENT_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `LIBRARY_PREPAND_PATH`
---
-
-LOCK TABLES `LIBRARY_PREPAND_PATH` WRITE;
-/*!40000 ALTER TABLE `LIBRARY_PREPAND_PATH` DISABLE KEYS */;
-/*!40000 ALTER TABLE `LIBRARY_PREPAND_PATH` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `LOCAL_DATA_MOVEMENT`
---
-
-DROP TABLE IF EXISTS `LOCAL_DATA_MOVEMENT`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `LOCAL_DATA_MOVEMENT` (
-  `DATA_MOVEMENT_INTERFACE_ID` varchar(255) NOT NULL,
-  PRIMARY KEY (`DATA_MOVEMENT_INTERFACE_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `LOCAL_DATA_MOVEMENT`
---
-
-LOCK TABLES `LOCAL_DATA_MOVEMENT` WRITE;
-/*!40000 ALTER TABLE `LOCAL_DATA_MOVEMENT` DISABLE KEYS */;
-/*!40000 ALTER TABLE `LOCAL_DATA_MOVEMENT` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `LOCAL_SUBMISSION`
---
-
-DROP TABLE IF EXISTS `LOCAL_SUBMISSION`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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 NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `UPDATE_TIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  PRIMARY KEY (`JOB_SUBMISSION_INTERFACE_ID`),
-  KEY `RESOURCE_JOB_MANAGER_ID` (`RESOURCE_JOB_MANAGER_ID`),
-  CONSTRAINT `local_submission_ibfk_1` FOREIGN KEY (`RESOURCE_JOB_MANAGER_ID`) REFERENCES `RESOURCE_JOB_MANAGER` (`RESOURCE_JOB_MANAGER_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `LOCAL_SUBMISSION`
---
-
-LOCK TABLES `LOCAL_SUBMISSION` WRITE;
-/*!40000 ALTER TABLE `LOCAL_SUBMISSION` DISABLE KEYS */;
-/*!40000 ALTER TABLE `LOCAL_SUBMISSION` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `MODULE_LOAD_CMD`
---
-
-DROP TABLE IF EXISTS `MODULE_LOAD_CMD`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `MODULE_LOAD_CMD` (
-  `CMD` varchar(255) NOT NULL,
-  `APP_DEPLOYMENT_ID` varchar(255) NOT NULL,
-  `COMMAND_ORDER` int(11) DEFAULT NULL,
-  PRIMARY KEY (`APP_DEPLOYMENT_ID`,`CMD`),
-  CONSTRAINT `module_load_cmd_ibfk_1` FOREIGN KEY (`APP_DEPLOYMENT_ID`) REFERENCES `APPLICATION_DEPLOYMENT` (`DEPLOYMENT_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `MODULE_LOAD_CMD`
---
-
-LOCK TABLES `MODULE_LOAD_CMD` WRITE;
-/*!40000 ALTER TABLE `MODULE_LOAD_CMD` DISABLE KEYS */;
-/*!40000 ALTER TABLE `MODULE_LOAD_CMD` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `PARALLELISM_COMMAND`
---
-
-DROP TABLE IF EXISTS `PARALLELISM_COMMAND`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `PARALLELISM_COMMAND` (
-  `RESOURCE_JOB_MANAGER_ID` varchar(255) NOT NULL,
-  `COMMAND_TYPE` varchar(255) NOT NULL,
-  `COMMAND` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`RESOURCE_JOB_MANAGER_ID`,`COMMAND_TYPE`),
-  CONSTRAINT `parallelism_command_ibfk_1` FOREIGN KEY (`RESOURCE_JOB_MANAGER_ID`) REFERENCES `RESOURCE_JOB_MANAGER` (`RESOURCE_JOB_MANAGER_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `PARALLELISM_COMMAND`
---
-
-LOCK TABLES `PARALLELISM_COMMAND` WRITE;
-/*!40000 ALTER TABLE `PARALLELISM_COMMAND` DISABLE KEYS */;
-/*!40000 ALTER TABLE `PARALLELISM_COMMAND` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `PARSER`
---
-
-DROP TABLE IF EXISTS `PARSER`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `PARSER`
---
-
-LOCK TABLES `PARSER` WRITE;
-/*!40000 ALTER TABLE `PARSER` DISABLE KEYS */;
-/*!40000 ALTER TABLE `PARSER` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `PARSER_CONNECTOR`
---
-
-DROP TABLE IF EXISTS `PARSER_CONNECTOR`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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`),
-  KEY `PARENT_PARSER_ID` (`PARENT_PARSER_ID`),
-  KEY `CHILD_PARSER_ID` (`CHILD_PARSER_ID`),
-  KEY `PARSING_TEMPLATE_ID` (`PARSING_TEMPLATE_ID`),
-  CONSTRAINT `parser_connector_ibfk_1` FOREIGN KEY (`PARENT_PARSER_ID`) REFERENCES `PARSER` (`PARSER_ID`) ON DELETE CASCADE,
-  CONSTRAINT `parser_connector_ibfk_2` FOREIGN KEY (`CHILD_PARSER_ID`) REFERENCES `PARSER` (`PARSER_ID`) ON DELETE CASCADE,
-  CONSTRAINT `parser_connector_ibfk_3` FOREIGN KEY (`PARSING_TEMPLATE_ID`) REFERENCES `PARSING_TEMPLATE` (`PARSING_TEMPLATE_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `PARSER_CONNECTOR`
---
-
-LOCK TABLES `PARSER_CONNECTOR` WRITE;
-/*!40000 ALTER TABLE `PARSER_CONNECTOR` DISABLE KEYS */;
-/*!40000 ALTER TABLE `PARSER_CONNECTOR` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `PARSER_CONNECTOR_INPUT`
---
-
-DROP TABLE IF EXISTS `PARSER_CONNECTOR_INPUT`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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) DEFAULT NULL,
-  `VALUE` varchar(255) DEFAULT NULL,
-  `PARSER_CONNECTOR_ID` varchar(255) NOT NULL,
-  PRIMARY KEY (`PARSER_CONNECTOR_INPUT_ID`),
-  KEY `PARSER_INPUT_ID` (`PARSER_INPUT_ID`),
-  KEY `PARSER_OUTPUT_ID` (`PARSER_OUTPUT_ID`),
-  KEY `PARSER_CONNECTOR_ID` (`PARSER_CONNECTOR_ID`),
-  CONSTRAINT `parser_connector_input_ibfk_1` FOREIGN KEY (`PARSER_INPUT_ID`) REFERENCES `PARSER_INPUT` (`PARSER_INPUT_ID`) ON DELETE CASCADE,
-  CONSTRAINT `parser_connector_input_ibfk_2` FOREIGN KEY (`PARSER_OUTPUT_ID`) REFERENCES `PARSER_OUTPUT` (`PARSER_OUTPUT_ID`) ON DELETE CASCADE,
-  CONSTRAINT `parser_connector_input_ibfk_3` FOREIGN KEY (`PARSER_CONNECTOR_ID`) REFERENCES `PARSER_CONNECTOR` (`PARSER_CONNECTOR_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `PARSER_CONNECTOR_INPUT`
---
-
-LOCK TABLES `PARSER_CONNECTOR_INPUT` WRITE;
-/*!40000 ALTER TABLE `PARSER_CONNECTOR_INPUT` DISABLE KEYS */;
-/*!40000 ALTER TABLE `PARSER_CONNECTOR_INPUT` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `PARSER_INPUT`
---
-
-DROP TABLE IF EXISTS `PARSER_INPUT`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `PARSER_INPUT` (
-  `PARSER_INPUT_ID` varchar(255) NOT NULL,
-  `PARSER_INPUT_NAME` varchar(255) NOT NULL,
-  `PARSER_INPUT_REQUIRED` tinyint(1) NOT NULL,
-  `PARSER_ID` varchar(255) NOT NULL,
-  `INPUT_TYPE` varchar(255) NOT NULL,
-  PRIMARY KEY (`PARSER_INPUT_ID`),
-  KEY `PARSER_ID` (`PARSER_ID`),
-  CONSTRAINT `parser_input_ibfk_1` FOREIGN KEY (`PARSER_ID`) REFERENCES `PARSER` (`PARSER_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `PARSER_INPUT`
---
-
-LOCK TABLES `PARSER_INPUT` WRITE;
-/*!40000 ALTER TABLE `PARSER_INPUT` DISABLE KEYS */;
-/*!40000 ALTER TABLE `PARSER_INPUT` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `PARSER_OUTPUT`
---
-
-DROP TABLE IF EXISTS `PARSER_OUTPUT`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `PARSER_OUTPUT` (
-  `PARSER_OUTPUT_ID` varchar(255) NOT NULL,
-  `PARSER_OUTPUT_NAME` varchar(255) NOT NULL,
-  `PARSER_OUTPUT_REQUIRED` tinyint(1) NOT NULL,
-  `PARSER_ID` varchar(255) NOT NULL,
-  `OUTPUT_TYPE` varchar(255) NOT NULL,
-  PRIMARY KEY (`PARSER_OUTPUT_ID`),
-  KEY `PARSER_ID` (`PARSER_ID`),
-  CONSTRAINT `parser_output_ibfk_1` FOREIGN KEY (`PARSER_ID`) REFERENCES `PARSER` (`PARSER_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `PARSER_OUTPUT`
---
-
-LOCK TABLES `PARSER_OUTPUT` WRITE;
-/*!40000 ALTER TABLE `PARSER_OUTPUT` DISABLE KEYS */;
-/*!40000 ALTER TABLE `PARSER_OUTPUT` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `PARSING_TEMPLATE`
---
-
-DROP TABLE IF EXISTS `PARSING_TEMPLATE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `PARSING_TEMPLATE`
---
-
-LOCK TABLES `PARSING_TEMPLATE` WRITE;
-/*!40000 ALTER TABLE `PARSING_TEMPLATE` DISABLE KEYS */;
-/*!40000 ALTER TABLE `PARSING_TEMPLATE` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `PARSING_TEMPLATE_INPUT`
---
-
-DROP TABLE IF EXISTS `PARSING_TEMPLATE_INPUT`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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) DEFAULT NULL,
-  `VALUE` varchar(255) DEFAULT NULL,
-  `PARSING_TEMPLATE_ID` varchar(255) NOT NULL,
-  PRIMARY KEY (`PARSING_TEMPLATE_INPUT_ID`),
-  KEY `TARGET_PARSER_INPUT_ID` (`TARGET_PARSER_INPUT_ID`),
-  KEY `PARSING_TEMPLATE_ID` (`PARSING_TEMPLATE_ID`),
-  CONSTRAINT `parsing_template_input_ibfk_1` FOREIGN KEY (`TARGET_PARSER_INPUT_ID`) REFERENCES `PARSER_INPUT` (`PARSER_INPUT_ID`) ON DELETE CASCADE,
-  CONSTRAINT `parsing_template_input_ibfk_2` FOREIGN KEY (`PARSING_TEMPLATE_ID`) REFERENCES `PARSING_TEMPLATE` (`PARSING_TEMPLATE_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `PARSING_TEMPLATE_INPUT`
---
-
-LOCK TABLES `PARSING_TEMPLATE_INPUT` WRITE;
-/*!40000 ALTER TABLE `PARSING_TEMPLATE_INPUT` DISABLE KEYS */;
-/*!40000 ALTER TABLE `PARSING_TEMPLATE_INPUT` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `POSTJOB_COMMAND`
---
-
-DROP TABLE IF EXISTS `POSTJOB_COMMAND`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `POSTJOB_COMMAND` (
-  `APPDEPLOYMENT_ID` varchar(255) NOT NULL,
-  `COMMAND` varchar(255) NOT NULL,
-  `COMMAND_ORDER` int(11) DEFAULT NULL,
-  PRIMARY KEY (`APPDEPLOYMENT_ID`,`COMMAND`),
-  CONSTRAINT `postjob_command_ibfk_1` FOREIGN KEY (`APPDEPLOYMENT_ID`) REFERENCES `APPLICATION_DEPLOYMENT` (`DEPLOYMENT_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `POSTJOB_COMMAND`
---
-
-LOCK TABLES `POSTJOB_COMMAND` WRITE;
-/*!40000 ALTER TABLE `POSTJOB_COMMAND` DISABLE KEYS */;
-/*!40000 ALTER TABLE `POSTJOB_COMMAND` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `PREJOB_COMMAND`
---
-
-DROP TABLE IF EXISTS `PREJOB_COMMAND`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `PREJOB_COMMAND` (
-  `APPDEPLOYMENT_ID` varchar(255) NOT NULL,
-  `COMMAND` varchar(255) NOT NULL,
-  `COMMAND_ORDER` int(11) DEFAULT NULL,
-  PRIMARY KEY (`APPDEPLOYMENT_ID`,`COMMAND`),
-  CONSTRAINT `prejob_command_ibfk_1` FOREIGN KEY (`APPDEPLOYMENT_ID`) REFERENCES `APPLICATION_DEPLOYMENT` (`DEPLOYMENT_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `PREJOB_COMMAND`
---
-
-LOCK TABLES `PREJOB_COMMAND` WRITE;
-/*!40000 ALTER TABLE `PREJOB_COMMAND` DISABLE KEYS */;
-/*!40000 ALTER TABLE `PREJOB_COMMAND` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `RESOURCE_JOB_MANAGER`
---
-
-DROP TABLE IF EXISTS `RESOURCE_JOB_MANAGER`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `RESOURCE_JOB_MANAGER` (
-  `RESOURCE_JOB_MANAGER_ID` varchar(255) NOT NULL,
-  `PUSH_MONITORING_ENDPOINT` varchar(255) DEFAULT NULL,
-  `JOB_MANAGER_BIN_PATH` varchar(255) DEFAULT NULL,
-  `RESOURCE_JOB_MANAGER_TYPE` varchar(255) NOT NULL,
-  `CREATION_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `UPDATE_TIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  PRIMARY KEY (`RESOURCE_JOB_MANAGER_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `RESOURCE_JOB_MANAGER`
---
-
-LOCK TABLES `RESOURCE_JOB_MANAGER` WRITE;
-/*!40000 ALTER TABLE `RESOURCE_JOB_MANAGER` DISABLE KEYS */;
-INSERT INTO `RESOURCE_JOB_MANAGER` VALUES ('RJM_11132688-7ff1-48fb-802a-0203f8d8b14b','','/bin','SLURM','2019-02-25 23:52:55','2019-02-25 23:52:55');
-/*!40000 ALTER TABLE `RESOURCE_JOB_MANAGER` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `SCP_DATA_MOVEMENT`
---
-
-DROP TABLE IF EXISTS `SCP_DATA_MOVEMENT`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `SCP_DATA_MOVEMENT` (
-  `QUEUE_DESCRIPTION` varchar(255) DEFAULT NULL,
-  `DATA_MOVEMENT_INTERFACE_ID` varchar(255) NOT NULL,
-  `SECURITY_PROTOCOL` varchar(255) NOT NULL,
-  `ALTERNATIVE_SCP_HOSTNAME` varchar(255) DEFAULT NULL,
-  `SSH_PORT` int(11) DEFAULT NULL,
-  `CREATION_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `UPDATE_TIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  PRIMARY KEY (`DATA_MOVEMENT_INTERFACE_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `SCP_DATA_MOVEMENT`
---
-
-LOCK TABLES `SCP_DATA_MOVEMENT` WRITE;
-/*!40000 ALTER TABLE `SCP_DATA_MOVEMENT` DISABLE KEYS */;
-INSERT INTO `SCP_DATA_MOVEMENT` VALUES (NULL,'DO_NOT_SET_AT_CLIENTS','SSH_KEYS','',22222,'2019-02-26 15:12:00','2019-02-26 10:12:01'),(NULL,'SCP_1e775974-c405-4793-9e6c-a88d98013a28','SSH_KEYS','',0,'2019-02-25 23:53:15','2019-02-25 23:53:15'),(NULL,'SCP_e6fa0ccf-6dcd-4361-be09-1fd7df7f7a3c','SSH_KEYS','',22222,'2019-02-26 00:27:42','2019-02-26 00:27:42');
-/*!40000 ALTER TABLE `SCP_DATA_MOVEMENT` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `SSH_ACCOUNT_PROVISIONER_CONFIG`
---
-
-DROP TABLE IF EXISTS `SSH_ACCOUNT_PROVISIONER_CONFIG`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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) DEFAULT NULL,
-  PRIMARY KEY (`GATEWAY_ID`,`RESOURCE_ID`,`CONFIG_NAME`),
-  CONSTRAINT `ssh_account_provisioner_config_ibfk_1` FOREIGN KEY (`GATEWAY_ID`, `RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE_PREFERENCE` (`GATEWAY_ID`, `RESOURCE_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `SSH_ACCOUNT_PROVISIONER_CONFIG`
---
-
-LOCK TABLES `SSH_ACCOUNT_PROVISIONER_CONFIG` WRITE;
-/*!40000 ALTER TABLE `SSH_ACCOUNT_PROVISIONER_CONFIG` DISABLE KEYS */;
-/*!40000 ALTER TABLE `SSH_ACCOUNT_PROVISIONER_CONFIG` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `SSH_JOB_SUBMISSION`
---
-
-DROP TABLE IF EXISTS `SSH_JOB_SUBMISSION`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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) DEFAULT NULL,
-  `SECURITY_PROTOCOL` varchar(255) NOT NULL,
-  `SSH_PORT` int(11) DEFAULT NULL,
-  `MONITOR_MODE` varchar(255) DEFAULT NULL,
-  `CREATION_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `UPDATE_TIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  PRIMARY KEY (`JOB_SUBMISSION_INTERFACE_ID`),
-  KEY `RESOURCE_JOB_MANAGER_ID` (`RESOURCE_JOB_MANAGER_ID`),
-  CONSTRAINT `ssh_job_submission_ibfk_1` FOREIGN KEY (`RESOURCE_JOB_MANAGER_ID`) REFERENCES `RESOURCE_JOB_MANAGER` (`RESOURCE_JOB_MANAGER_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `SSH_JOB_SUBMISSION`
---
-
-LOCK TABLES `SSH_JOB_SUBMISSION` WRITE;
-/*!40000 ALTER TABLE `SSH_JOB_SUBMISSION` DISABLE KEYS */;
-INSERT INTO `SSH_JOB_SUBMISSION` VALUES ('RJM_11132688-7ff1-48fb-802a-0203f8d8b14b','SSH_8cdb13a9-130b-4527-96fe-dcd0c5ffd185','','SSH_KEYS',0,'JOB_EMAIL_NOTIFICATION_MONITOR','2019-02-25 23:52:55','2019-02-25 23:52:55');
-/*!40000 ALTER TABLE `SSH_JOB_SUBMISSION` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `STORAGE_INTERFACE`
---
-
-DROP TABLE IF EXISTS `STORAGE_INTERFACE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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` int(11) DEFAULT NULL,
-  `CREATION_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `UPDATE_TIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  PRIMARY KEY (`STORAGE_RESOURCE_ID`,`DATA_MOVEMENT_INTERFACE_ID`),
-  CONSTRAINT `storage_interface_ibfk_1` FOREIGN KEY (`STORAGE_RESOURCE_ID`) REFERENCES `STORAGE_RESOURCE` (`STORAGE_RESOURCE_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `STORAGE_INTERFACE`
---
-
-LOCK TABLES `STORAGE_INTERFACE` WRITE;
-/*!40000 ALTER TABLE `STORAGE_INTERFACE` DISABLE KEYS */;
-INSERT INTO `STORAGE_INTERFACE` VALUES ('airavata.host_77116e91-f042-4d3a-ab9c-3e7b4ebcd5bd','SCP_e6fa0ccf-6dcd-4361-be09-1fd7df7f7a3c','SCP',0,'2019-02-26 00:27:42','2019-02-26 00:27:42');
-/*!40000 ALTER TABLE `STORAGE_INTERFACE` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `STORAGE_PREFERENCE`
---
-
-DROP TABLE IF EXISTS `STORAGE_PREFERENCE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `STORAGE_PREFERENCE` (
-  `GATEWAY_ID` varchar(255) NOT NULL,
-  `STORAGE_RESOURCE_ID` varchar(255) NOT NULL,
-  `LOGIN_USERNAME` varchar(255) DEFAULT NULL,
-  `FS_ROOT_LOCATION` varchar(255) DEFAULT NULL,
-  `RESOURCE_CS_TOKEN` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`GATEWAY_ID`,`STORAGE_RESOURCE_ID`),
-  CONSTRAINT `storage_preference_ibfk_1` FOREIGN KEY (`GATEWAY_ID`) REFERENCES `GATEWAY_PROFILE` (`GATEWAY_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `STORAGE_PREFERENCE`
---
-
-LOCK TABLES `STORAGE_PREFERENCE` WRITE;
-/*!40000 ALTER TABLE `STORAGE_PREFERENCE` DISABLE KEYS */;
-INSERT INTO `STORAGE_PREFERENCE` VALUES ('default','airavata.host_77116e91-f042-4d3a-ab9c-3e7b4ebcd5bd','root','/var/www/portals/gateway-user-data','46a99a5a-8b55-4982-bfd7-90fe72b00d46');
-/*!40000 ALTER TABLE `STORAGE_PREFERENCE` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `STORAGE_RESOURCE`
---
-
-DROP TABLE IF EXISTS `STORAGE_RESOURCE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `STORAGE_RESOURCE` (
-  `STORAGE_RESOURCE_ID` varchar(255) NOT NULL,
-  `HOST_NAME` varchar(255) NOT NULL,
-  `DESCRIPTION` varchar(255) DEFAULT NULL,
-  `ENABLED` smallint(6) DEFAULT NULL,
-  `CREATION_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `UPDATE_TIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  PRIMARY KEY (`STORAGE_RESOURCE_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `STORAGE_RESOURCE`
---
-
-LOCK TABLES `STORAGE_RESOURCE` WRITE;
-/*!40000 ALTER TABLE `STORAGE_RESOURCE` DISABLE KEYS */;
-INSERT INTO `STORAGE_RESOURCE` VALUES ('airavata.host_77116e91-f042-4d3a-ab9c-3e7b4ebcd5bd','airavata.host','',1,'2019-02-25 19:27:15','2019-02-26 10:11:53');
-/*!40000 ALTER TABLE `STORAGE_RESOURCE` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `UNICORE_DATAMOVEMENT`
---
-
-DROP TABLE IF EXISTS `UNICORE_DATAMOVEMENT`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `UNICORE_DATAMOVEMENT` (
-  `DATAMOVEMENT_ID` varchar(255) NOT NULL,
-  `SECURITY_PROTOCAL` varchar(255) DEFAULT NULL,
-  `UNICORE_ENDPOINT_URL` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`DATAMOVEMENT_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `UNICORE_DATAMOVEMENT`
---
-
-LOCK TABLES `UNICORE_DATAMOVEMENT` WRITE;
-/*!40000 ALTER TABLE `UNICORE_DATAMOVEMENT` DISABLE KEYS */;
-/*!40000 ALTER TABLE `UNICORE_DATAMOVEMENT` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `UNICORE_SUBMISSION`
---
-
-DROP TABLE IF EXISTS `UNICORE_SUBMISSION`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `UNICORE_SUBMISSION` (
-  `SUBMISSION_ID` varchar(255) NOT NULL,
-  `SECURITY_PROTOCAL` varchar(255) DEFAULT NULL,
-  `UNICORE_ENDPOINT_URL` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`SUBMISSION_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `UNICORE_SUBMISSION`
---
-
-LOCK TABLES `UNICORE_SUBMISSION` WRITE;
-/*!40000 ALTER TABLE `UNICORE_SUBMISSION` DISABLE KEYS */;
-/*!40000 ALTER TABLE `UNICORE_SUBMISSION` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `USER_COMPUTE_RESOURCE_PREFERENCE`
---
-
-DROP TABLE IF EXISTS `USER_COMPUTE_RESOURCE_PREFERENCE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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) NOT 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` datetime DEFAULT NULL,
-  `RESERVATION_START_TIME` datetime DEFAULT NULL,
-  `SCRATCH_LOCATION` varchar(255) DEFAULT NULL,
-  `VALIDATED` tinyint(1) DEFAULT '0',
-  PRIMARY KEY (`RESOURCE_ID`,`USER_ID`,`GATEWAY_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `USER_COMPUTE_RESOURCE_PREFERENCE`
---
-
-LOCK TABLES `USER_COMPUTE_RESOURCE_PREFERENCE` WRITE;
-/*!40000 ALTER TABLE `USER_COMPUTE_RESOURCE_PREFERENCE` DISABLE KEYS */;
-/*!40000 ALTER TABLE `USER_COMPUTE_RESOURCE_PREFERENCE` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `USER_RESOURCE_PROFILE`
---
-
-DROP TABLE IF EXISTS `USER_RESOURCE_PROFILE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `USER_RESOURCE_PROFILE` (
-  `USER_ID` varchar(255) NOT NULL,
-  `CREATION_TIME` datetime DEFAULT NULL,
-  `CS_TOKEN` varchar(255) DEFAULT NULL,
-  `GATEWAY_ID` varchar(255) NOT NULL,
-  `IDENTITY_SERVER_PWD_CRED_TOKEN` varchar(255) DEFAULT NULL,
-  `IDENTITY_SERVER_TENANT` varchar(255) DEFAULT NULL,
-  `UPDATE_TIME` datetime DEFAULT NULL,
-  PRIMARY KEY (`USER_ID`,`GATEWAY_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `USER_RESOURCE_PROFILE`
---
-
-LOCK TABLES `USER_RESOURCE_PROFILE` WRITE;
-/*!40000 ALTER TABLE `USER_RESOURCE_PROFILE` DISABLE KEYS */;
-INSERT INTO `USER_RESOURCE_PROFILE` VALUES ('default-admin',NULL,NULL,'default',NULL,NULL,'2019-03-11 14:16:13');
-/*!40000 ALTER TABLE `USER_RESOURCE_PROFILE` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `USER_STORAGE_PREFERENCE`
---
-
-DROP TABLE IF EXISTS `USER_STORAGE_PREFERENCE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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) NOT NULL,
-  `LOGIN_USERNAME` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`STORAGE_RESOURCE_ID`,`USER_ID`,`GATEWAY_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `USER_STORAGE_PREFERENCE`
---
-
-LOCK TABLES `USER_STORAGE_PREFERENCE` WRITE;
-/*!40000 ALTER TABLE `USER_STORAGE_PREFERENCE` DISABLE KEYS */;
-/*!40000 ALTER TABLE `USER_STORAGE_PREFERENCE` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Current Database: `credential_store`
---
-
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `credential_store` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci */;
-
-USE `credential_store`;
-
---
--- Table structure for table `COMMUNITY_USER`
---
-
-DROP TABLE IF EXISTS `COMMUNITY_USER`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `COMMUNITY_USER` (
-  `GATEWAY_ID` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `COMMUNITY_USER_NAME` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `TOKEN_ID` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `COMMUNITY_USER_EMAIL` varchar(256) COLLATE utf8mb4_unicode_ci NOT NULL,
-  PRIMARY KEY (`GATEWAY_ID`,`COMMUNITY_USER_NAME`,`TOKEN_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `COMMUNITY_USER`
---
-
-LOCK TABLES `COMMUNITY_USER` WRITE;
-/*!40000 ALTER TABLE `COMMUNITY_USER` DISABLE KEYS */;
-/*!40000 ALTER TABLE `COMMUNITY_USER` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `CONFIGURATION`
---
-
-DROP TABLE IF EXISTS `CONFIGURATION`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `CONFIGURATION` (
-  `CONFIG_KEY` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `CONFIG_VAL` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
-  PRIMARY KEY (`CONFIG_KEY`,`CONFIG_VAL`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `CONFIGURATION`
---
-
-LOCK TABLES `CONFIGURATION` WRITE;
-/*!40000 ALTER TABLE `CONFIGURATION` DISABLE KEYS */;
-INSERT INTO `CONFIGURATION` VALUES ('credential_store_version','0.16');
-/*!40000 ALTER TABLE `CONFIGURATION` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `CREDENTIALS`
---
-
-DROP TABLE IF EXISTS `CREDENTIALS`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `CREDENTIALS` (
-  `GATEWAY_ID` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `TOKEN_ID` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `CREDENTIAL` blob NOT NULL,
-  `PORTAL_USER_ID` varchar(256) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `TIME_PERSISTED` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `DESCRIPTION` varchar(500) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `CREDENTIAL_OWNER_TYPE` varchar(10) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'GATEWAY',
-  PRIMARY KEY (`GATEWAY_ID`,`TOKEN_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `CREDENTIALS`
---
-
-LOCK TABLES `CREDENTIALS` WRITE;
-/*!40000 ALTER TABLE `CREDENTIALS` DISABLE KEYS */;
-INSERT INTO `CREDENTIALS` VALUES ('default','46a99a5a-8b55-4982-bfd7-90fe72b00d46',0x149D247A85EEF670D6919C6F2367E979799D210452590F82AE36956A6C3E303D4BAF4BCC5D3CAE6FC169132BDAF79C5B2D96C37105B1F2565A65B44494051300D51F1A6EE17BDA9E1097D3D95631D60ED2223ECE5C6F6FB518F578F6FE2C6A81BF1E971F58A2CA37933A857133B6BCEE12BE13D9D3A74334C2D5101C69E5279EE6C70623FFB80AC49611E37BC02A6ABC8287814E24D872BC2198D257730526415B65FE1097BC805145242B6113AF55EDD71F855F8D915E40C6FEC204E289BEAF2E24C95DD7E6B79AA90B3871AA9E80EDEA5F1E45BF899F94FFB14B404A300ECB7859D3A595FB7E0DE91645C6602CBDE8F5038A198B5F54ECC1592BBF50D1FEB4AE8AE220601FD22C5138F50DCCEBFD3FFEE64F4FCD2D85BFE055A35449E1926563BB6E2B8FC21E5137DF7F5E312BA7AE15CA4C8F58C3B782B7F4D65BDBDD6A2A4753FB5DEB02AF9C4EDC01A505FCA7F2DA38043024F0430FBBDD51CABE67F062969B419A5522FA9A36AB3D9E9A7B95C2A2BE44113044E574B01A00BF71D2E0C52D26C47AB6ED68A05686BECA2543615F267A74BD85DD240EB554DF4DEED2AA5B1CDCB264EE2F7810177576D47218FF721227C199CCE853F089BAF1AD908E6079A45A27AF53BD8AE4AFC45B6D97174E6985F6BCB1ECB324E5A09A3DB8A60EE401244B023ABAE3DA2DF553C7A286D01B7A9A632A4D11DDB27B9A506C8A1F3C65D5BDCBF270D8797401B34766A93A38B332DC91FA589D48098848E0A337374F6891470F1CBF50C34F53C2A984E908D7510353157DB914AA61246824C61223AF5DEDC4768DF5B110609D0D968F5C632952F854B95CF353F1F64214F6DE68FD08BA1A3C155C2A6DF09FCF2AED839B199F281BB117769ED57D4E34D304FAD2D779F4E98C573FA8850A28CF173709C694B38AEFC1165B3DB2F9DBECD7C97AFA302E5FCA30D74F6EB69ADA6C064D534D1C7F2A83AE1B6827AB6FE52848E70C057854FAC6B0651B1B57296505C4F43C1DCB9EC17F34EB36563829D9D74B720072F2258F65C67D5101521E8D150F9E2AC3FD731376830241B5FC637D326A4D2B5EBA218FCA40329A88717CBF7E9835FB13D2E710D8D4A69012541256C61CB61988368251D22EA443386010EFA40D77908EDE66970FC8D2EBF45111316AE6FB60C40619CAFD310F9D32B2A99FB62299D5A27F8E9919EE3A0A804940AA8D6D637BA857BE9CD56E7C07472317133A68B1E9E88D32C519547E60D5966D496D6D73CD2BDD8AD2F216A6D0817B86D8A2D45F56A51B6B0C05DA557BD186990F16E5F6863AA748195089665BB203F426C24A002B36B34659CB0AD044F51F778EFFECFDF01098C0CE99C4BC54942C962A6C1F3D1E2B5A5BCCB5A143CFEDD01D3C32E0AF08D99BB03485BDFB49465BE93D8A0507E21E52739863C958E752F7C892009BF4811532180630968718E1577B5BA4055B5CEB9FC55FE0F9DCF1598A8F7C6ACD13F8D3BDC13355B4D91F5C7CCA4C5EEC10EE974AEB0AC5E953763C64167AFC7A959B29F64BA1FAFF4FD119B5A526293A54F39C43772E7630FA3AD15D2C8A79ACF2BEE33A99F5EB5D3ACB3A9D7E8B0E013F3002D461356837C1BB2EE7C58E65EAD76A4D40CBFBA50D82CAD529AE5ACBE7256C32D565D4279299B6C0A12D81E584A8ED241163E35D8E5367920878BE6F86EDD469E54BA20AE4E09B5671396837E9CE58BC269A67AD7EFD85500421E21C5E6C7F60FE055CA6354CC3DCFC48A97183925BB994FA7307A037FC145FAE39F50C01714B2EBD5A996E88B8C92016AC1C84A8287AE55C792B377C2ABA76D1234FFA98AA1505E3C9B263C21C39E6F9A72E7CC41A74DD33CA7BBB83348665304E8022AA9A8365FE1315B314AB5500AF918629B05338FF5743BD2B2264AF5EF54BDF565209619A795D17B9AEE6F3D59B593E979013D122BECD00A97E440DFBD0F745CA2BFDE130E1A47DEC322518BE14AC38326898E418684086397B603279EF85D95142DEBCECF5E2EF51E2564E1B8C80ACBC825D7085354E6087A1F8A1559B1BAAAC720782F4B7E95604435E48C059D3822ED0AB522AEF0380DBB4552C83571D3D8FC015C4321AB7189FC37BB2D3551D4CF143EB0B92BE96FF8D9A47385A4F6DD095260F7C4DD697D42D19F51537ACBA6DE73836FA984B3764DD0F8DB3607BB4171CD2E9FC36D2307858A1735C6EE5E957EF92CC381F103C27A41F40CA6ACCC16D4D65308B91EF27C733B0A35DA553F1CE20E458A4328A3B1420D1B22A0E51907F2AD2569821B8AC196019AB3712779039051C1C8AC103894E69616C9535DC9BEE08B0A624A8F2A2CF5637A2609D67339458F34BBA9990092480025C75DE074FBBA485FB05B49DD17A64E8AA595DBFA47DEB0F6674A870656A90339B9DAD269CAC63CDAF4FFB4C5FB8387494CF1EE4A50821260538227E475D00E92DB62A5A70148692D2075B8F159999D7C6FDE20E8384FF82D09CD9485B39C1320093B4DA49123A0673D27AAD7FB64731B0E3F64E1149268F731F13EF57A1567161C4978285244E8DB4B063A95A34685DF843514B1B75F577606CE48F6D23352CA966C6545F7F78DD51124FA8B11C0A21BF97E7DF904752C8D251408A1E924A593447FE6CA96D95E2436068C36836B2A2AFDFF5C4826BDBE95661031DDAA5A19BD50B4CFAD6095D07E960C74EB86420B4F66F274DD1E11053B0D44ABA2AADC7018A0B3603CFDCC43AAAC42E35FA344D4CC6A233470775B944B62EEF5570DBC141BBB5B4D2C0FB70C9BC4FFD951338FA7D9C43735734BBB06B3A1C7D305EF2012D2718AE6AF9961015D27FD4FCFFD16845ABEC781A8D96A85588E5C1AA60EA6F3A241D39376E85D9B6A42E0F1E701E246A8EDEDB504500E00880992CCC88B158624C50BD1FCE1ED91EF2AE073EDA118135D9FABC26FC9581BE3F29E251579A40935BA5C40E424F737163AA2125D70DE593C8570E9D22BDFD9F7265A0CDD6A60A252F7FCD6F4685380ECC1715092A49FBC783FDC2DDA5A87195FC47CC3B24633DCDDC0D0E1E0304F8124A6D1C402E4DDE5307B405D040E00AC25DA7C85C2044DB2FE5A6F5E76709AD9824AFD4FA2A73D45E640FB263A21C16A4FCB9547071A48AE17C59C44ADDCFF7E3CF71CF1C6EDA6A3C51A89A4F33017834615969F469697DABB82B71D30F6FC1915BD4F9323BBEC3C21C68B5196CB4F79AF3FB4E03A10B4E03D47B9EFF02895707C5849ED13721AD99E723A7C57CDF20D046A7D693353A4EEBDC827C8464E9CADF664B8AED89E358F007CB16210653D60AB59A099FFA4AD76C08A10A771326F0E9D0C6E222A28527C3A2820477410BEB192EAC1BC34E5B443C476B1E6A717D57050B1E65D1CF5DABC8A811BF3D6EC73B67898F68795734FFC53D7B31DA2766BB369546E4DAACAE56CA70452132BE57BF7579B3911B7036F74E0930583D24CA805ADD23E02544300441F28784DE57C059290625F8265446F61F5C6D1458C260016895535B237C3EED76D6D613DD21D34B0561087061859F2C354BBFCB3E541F38946974D9243BDFF5524E5FE0EE9B86DC2F53249B5E157E9AC1190B296A860CDF9EC3832FAA6C48F5C00EFE338B432A5BCD5AF05AD35FDFA68B24352171D8C8368F6B0BA736308ED1C5417C3C81E501B67145E5EF0B7D40C31DFFB03822835E4E9226C5A508ABF7ACC27AB4CC8CBFC2334CFA742D320067706409D706520A04CF895FB582DF8053B0791D45F27D61C610AC99DC2CB08A1583976AF56C0E54E356B7EA7D0042DEB45285E72744C80AFBC08555AF1EF611EA7D6F1FE4BA5212EB7280E024CD677E52B60D2DE616D16E6616F0390A6C119AD4CE9298903D46C01E9E647B926072E2FFAD0801ED736DB4C54381E5642FC900F6F0A11EDCA22127E1F998C7A982296008B70A18E0F8327EFD1C8DA2CB7644408A91BE73608C08E6063B3588A36DEDCB6BD69AC3FD3DAE836B0AF192CB4E929607F4E1D349EAC6DA18FE943E5B76965E7634577877461B5D6A346FEE3E7CFF76DB,'default-admin','2019-02-25 19:06:48','Default','GATEWAY'),('default','daf89639-bf92-4161-9c54-34571372d092',0xFB5ECB6FB5AD8335BBB104326FC122571FA73D2CFFC26DD33D56952581215ED1A5DA2623FB4481BE5A1323E3DEAA58CF88F5B63C24D2FEE338A008E8DAB3A5F8ED478901C3517571E259B379E3B2DC5470F66819EBF7A71B652E8BDA2B75E17B225C5263EB0E53CA7057B8CD3BE3B33CCA0ACCCF3DAF4043E546BFFF8D61CEC3069DA041A5B0F2076581F7E98EDD81C4787D7B3F6F4AAB16AB36BBA8FC012B0F68E08FD41DBB724282883AE20616BF9209589ADAA9693DC5737654BC3D77C86AF4A6C66AF7DA4577F71D3F93BAF3B16BC57F559A1CE90585D35D2DC213EB07B16482F612EE1C63A070133C0B83FC7FF090358D9671585F627EC31C64C989C05328AA5867ED9C7D58531EC4244456353C4E616690D5639C9C4856896C817058C1DEEF08BF98ABF44D65D3791F616EE535C57F5DBE06E43BAEA45A470E13FE98F5DA2A98D0C14A07496696ABE51816CA1843B004B6D550D24CAE0E5E3A69ADBA8A93DB05951E9B9617CC8DB1D21043BAFCD3A4AA81DD7002456E6EFC83DFA3811EB894CA7D0D28BE5DDD8C62BA7FDC876BBE81BFE3D2A5E4D7D26C0F1598523EF6D00100C9551BF226471762FBDD39C76200BB8541A14518BB4F3C5C82DD570189646E140D469D3BA24180640E8F88A27EC7FCB1DF951A2486E9990448E18932EF75C95817797B7D4D93FA94E04E25EE0A0DBAADA3600A36A3A523B0DFC64B879BE386D0F1F0113DE64A1F6777CF1651269FDA5EB48E9095254672D1FC7F288CCE757CF7FA5BBAD39FF4E967866F3E1CCE6D51E0476F516605F8057F5482D12ED0AD9E280B1CF4EC2B66ED7F36ED4B2651F44C5F4101184F73FC6FAC2A24FA975D1E15FC92B2FEA2FA668A09F3D1865EA13C0A6DF37725A3F1D823B5AC0863EEE936D9EF593CA0EF48DA33DB12B0B8515B8619C1DA7900ABC9D8015A77C6D54F6629B233443182335C1B9BB6565CDCFBD986FA30569C6B183BB17E45221A2112AC6E399DF072A51A6C6F850ADD62EB22B954D1F5EDC213334D06E7C4DEA20384B2D001DFFBB1DBCF25452BAEE4962750F511380F7458BC5E825EC0CF483ACC6216067B5A7037C948D0F5DE35A5AD3A1C5CB3D0B1354D6FE9B7AEE6F54F265485470280E185A554D5CFE382BD88D3A9C9ED6CF0E2038C9402457111CB0E943BF39E1019FB7A20AB6042541D71714AAC5E10,'default-admin','2019-02-25 18:40:12','Credentials for default gateway','GATEWAY');
-/*!40000 ALTER TABLE `CREDENTIALS` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Current Database: `experiment_catalog`
---
-
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `experiment_catalog` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci */;
-
-USE `experiment_catalog`;
-
---
--- Table structure for table `CONFIGURATION`
---
-
-DROP TABLE IF EXISTS `CONFIGURATION`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `CONFIGURATION` (
-  `CONFIG_KEY` varchar(255) NOT NULL,
-  `CONFIG_VAL` varchar(255) NOT NULL,
-  `EXPIRE_DATE` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `CATEGORY_ID` varchar(255) NOT NULL,
-  PRIMARY KEY (`CONFIG_KEY`,`CONFIG_VAL`,`CATEGORY_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `CONFIGURATION`
---
-
-LOCK TABLES `CONFIGURATION` WRITE;
-/*!40000 ALTER TABLE `CONFIGURATION` DISABLE KEYS */;
-INSERT INTO `CONFIGURATION` VALUES ('registry.version','0.16','2019-02-25 23:40:05','SYSTEM');
-/*!40000 ALTER TABLE `CONFIGURATION` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `EXPERIMENT`
---
-
-DROP TABLE IF EXISTS `EXPERIMENT`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `EXPERIMENT` (
-  `EXPERIMENT_ID` varchar(255) NOT NULL,
-  `PROJECT_ID` varchar(255) NOT NULL,
-  `GATEWAY_ID` varchar(255) DEFAULT NULL,
-  `EXPERIMENT_TYPE` varchar(255) DEFAULT NULL,
-  `USER_NAME` varchar(255) DEFAULT NULL,
-  `EXPERIMENT_NAME` varchar(255) DEFAULT NULL,
-  `CREATION_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `DESCRIPTION` varchar(255) DEFAULT NULL,
-  `EXECUTION_ID` varchar(255) DEFAULT NULL,
-  `GATEWAY_EXECUTION_ID` varchar(255) DEFAULT NULL,
-  `GATEWAY_INSTANCE_ID` varchar(255) DEFAULT NULL,
-  `ENABLE_EMAIL_NOTIFICATION` tinyint(1) DEFAULT NULL,
-  `EMAIL_ADDRESSES` text,
-  PRIMARY KEY (`EXPERIMENT_ID`),
-  KEY `PROJECT_ID` (`PROJECT_ID`),
-  CONSTRAINT `experiment_ibfk_1` FOREIGN KEY (`PROJECT_ID`) REFERENCES `PROJECT` (`PROJECT_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `EXPERIMENT`
---
-
-LOCK TABLES `EXPERIMENT` WRITE;
-/*!40000 ALTER TABLE `EXPERIMENT` DISABLE KEYS */;
-/*!40000 ALTER TABLE `EXPERIMENT` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `EXPERIMENT_ERROR`
---
-
-DROP TABLE IF EXISTS `EXPERIMENT_ERROR`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `EXPERIMENT_ERROR` (
-  `ERROR_ID` varchar(255) NOT NULL,
-  `EXPERIMENT_ID` varchar(255) NOT NULL,
-  `CREATION_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `ACTUAL_ERROR_MESSAGE` text,
-  `USER_FRIENDLY_MESSAGE` text,
-  `TRANSIENT_OR_PERSISTENT` tinyint(1) DEFAULT NULL,
-  `ROOT_CAUSE_ERROR_ID_LIST` text,
-  PRIMARY KEY (`ERROR_ID`,`EXPERIMENT_ID`),
-  KEY `EXPERIMENT_ID` (`EXPERIMENT_ID`),
-  CONSTRAINT `experiment_error_ibfk_1` FOREIGN KEY (`EXPERIMENT_ID`) REFERENCES `EXPERIMENT` (`EXPERIMENT_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `EXPERIMENT_ERROR`
---
-
-LOCK TABLES `EXPERIMENT_ERROR` WRITE;
-/*!40000 ALTER TABLE `EXPERIMENT_ERROR` DISABLE KEYS */;
-/*!40000 ALTER TABLE `EXPERIMENT_ERROR` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `EXPERIMENT_INPUT`
---
-
-DROP TABLE IF EXISTS `EXPERIMENT_INPUT`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `EXPERIMENT_INPUT` (
-  `EXPERIMENT_ID` varchar(255) NOT NULL,
-  `INPUT_NAME` varchar(255) NOT NULL,
-  `INPUT_VALUE` text,
-  `DATA_TYPE` varchar(255) DEFAULT NULL,
-  `APPLICATION_ARGUMENT` varchar(255) DEFAULT NULL,
-  `STANDARD_INPUT` tinyint(1) DEFAULT NULL,
-  `USER_FRIENDLY_DESCRIPTION` varchar(255) DEFAULT NULL,
-  `METADATA` varchar(4096) DEFAULT NULL,
-  `INPUT_ORDER` int(11) DEFAULT NULL,
-  `IS_REQUIRED` tinyint(1) DEFAULT NULL,
-  `REQUIRED_TO_ADDED_TO_CMD` tinyint(1) DEFAULT NULL,
-  `DATA_STAGED` tinyint(1) DEFAULT NULL,
-  `STORAGE_RESOURCE_ID` varchar(255) DEFAULT NULL,
-  `IS_READ_ONLY` tinyint(1) DEFAULT NULL,
-  PRIMARY KEY (`EXPERIMENT_ID`,`INPUT_NAME`),
-  CONSTRAINT `experiment_input_ibfk_1` FOREIGN KEY (`EXPERIMENT_ID`) REFERENCES `EXPERIMENT` (`EXPERIMENT_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `EXPERIMENT_INPUT`
---
-
-LOCK TABLES `EXPERIMENT_INPUT` WRITE;
-/*!40000 ALTER TABLE `EXPERIMENT_INPUT` DISABLE KEYS */;
-/*!40000 ALTER TABLE `EXPERIMENT_INPUT` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `EXPERIMENT_OUTPUT`
---
-
-DROP TABLE IF EXISTS `EXPERIMENT_OUTPUT`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `EXPERIMENT_OUTPUT` (
-  `EXPERIMENT_ID` varchar(255) NOT NULL,
-  `OUTPUT_NAME` varchar(255) NOT NULL,
-  `OUTPUT_VALUE` text,
-  `DATA_TYPE` varchar(255) DEFAULT NULL,
-  `APPLICATION_ARGUMENT` varchar(255) DEFAULT NULL,
-  `IS_REQUIRED` tinyint(1) DEFAULT NULL,
-  `REQUIRED_TO_ADDED_TO_CMD` tinyint(1) DEFAULT NULL,
-  `DATA_MOVEMENT` tinyint(1) DEFAULT NULL,
-  `LOCATION` varchar(255) DEFAULT NULL,
-  `SEARCH_QUERY` varchar(255) DEFAULT NULL,
-  `OUTPUT_STREAMING` smallint(6) DEFAULT NULL,
-  `STORAGE_RESOURCE_ID` varchar(255) DEFAULT NULL,
-  `METADATA` varchar(4096) DEFAULT NULL,
-  PRIMARY KEY (`EXPERIMENT_ID`,`OUTPUT_NAME`),
-  CONSTRAINT `experiment_output_ibfk_1` FOREIGN KEY (`EXPERIMENT_ID`) REFERENCES `EXPERIMENT` (`EXPERIMENT_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `EXPERIMENT_OUTPUT`
---
-
-LOCK TABLES `EXPERIMENT_OUTPUT` WRITE;
-/*!40000 ALTER TABLE `EXPERIMENT_OUTPUT` DISABLE KEYS */;
-/*!40000 ALTER TABLE `EXPERIMENT_OUTPUT` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `EXPERIMENT_STATUS`
---
-
-DROP TABLE IF EXISTS `EXPERIMENT_STATUS`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `EXPERIMENT_STATUS` (
-  `STATUS_ID` varchar(255) NOT NULL,
-  `EXPERIMENT_ID` varchar(255) NOT NULL,
-  `STATE` varchar(255) DEFAULT NULL,
-  `TIME_OF_STATE_CHANGE` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6),
-  `REASON` longtext,
-  PRIMARY KEY (`STATUS_ID`,`EXPERIMENT_ID`),
-  KEY `EXPERIMENT_ID` (`EXPERIMENT_ID`),
-  CONSTRAINT `experiment_status_ibfk_1` FOREIGN KEY (`EXPERIMENT_ID`) REFERENCES `EXPERIMENT` (`EXPERIMENT_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `EXPERIMENT_STATUS`
---
-
-LOCK TABLES `EXPERIMENT_STATUS` WRITE;
-/*!40000 ALTER TABLE `EXPERIMENT_STATUS` DISABLE KEYS */;
-/*!40000 ALTER TABLE `EXPERIMENT_STATUS` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `GATEWAY`
---
-
-DROP TABLE IF EXISTS `GATEWAY`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `GATEWAY` (
-  `GATEWAY_ID` varchar(255) NOT NULL,
-  `GATEWAY_NAME` varchar(255) DEFAULT NULL,
-  `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_APPROVAL_STATUS` varchar(255) DEFAULT NULL,
-  `GATEWAY_PUBLIC_ABSTRACT` varchar(255) DEFAULT NULL,
-  `GATEWAY_URL` varchar(255) DEFAULT NULL,
-  `GATEWAY_ADMIN_LAST_NAME` varchar(255) DEFAULT NULL,
-  `IDENTITY_SERVER_PASSWORD_TOKEN` varchar(255) DEFAULT NULL,
-  `IDENTITY_SERVER_USERNAME` varchar(255) DEFAULT NULL,
-  `GATEWAY_REVIEW_PROPOSAL_DESCRIPTION` varchar(255) DEFAULT NULL,
-  `DECLINED_REASON` varchar(255) DEFAULT NULL,
-  `OAUTH_CLIENT_SECRET` varchar(255) DEFAULT NULL,
-  `OAUTH_CLIENT_ID` varchar(255) DEFAULT NULL,
-  `REQUEST_CREATION_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `REQUESTER_USERNAME` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`GATEWAY_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `GATEWAY`
---
-
-LOCK TABLES `GATEWAY` WRITE;
-/*!40000 ALTER TABLE `GATEWAY` DISABLE KEYS */;
-INSERT INTO `GATEWAY` VALUES ('default',NULL,NULL,NULL,NULL,NULL,NULL,'APPROVED',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'9790c8c4-7d9b-4ccc-a820-ca5aac38d2ad','pga','2019-02-25 18:40:06',NULL);
-/*!40000 ALTER TABLE `GATEWAY` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `GATEWAY_WORKER`
---
-
-DROP TABLE IF EXISTS `GATEWAY_WORKER`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `GATEWAY_WORKER` (
-  `GATEWAY_ID` varchar(255) NOT NULL,
-  `USER_NAME` varchar(255) NOT NULL,
-  PRIMARY KEY (`GATEWAY_ID`,`USER_NAME`),
-  CONSTRAINT `gateway_worker_ibfk_1` FOREIGN KEY (`GATEWAY_ID`) REFERENCES `GATEWAY` (`GATEWAY_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `GATEWAY_WORKER`
---
-
-LOCK TABLES `GATEWAY_WORKER` WRITE;
-/*!40000 ALTER TABLE `GATEWAY_WORKER` DISABLE KEYS */;
-/*!40000 ALTER TABLE `GATEWAY_WORKER` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `JOB`
---
-
-DROP TABLE IF EXISTS `JOB`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `JOB` (
-  `JOB_ID` varchar(255) NOT NULL,
-  `TASK_ID` varchar(255) NOT NULL,
-  `PROCESS_ID` varchar(255) DEFAULT NULL,
-  `JOB_DESCRIPTION` longtext NOT NULL,
-  `CREATION_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `COMPUTE_RESOURCE_CONSUMED` varchar(255) DEFAULT NULL,
-  `JOB_NAME` varchar(255) DEFAULT NULL,
-  `WORKING_DIR` varchar(255) DEFAULT NULL,
-  `STD_OUT` longtext,
-  `STD_ERR` longtext,
-  `EXIT_CODE` int(11) DEFAULT NULL,
-  PRIMARY KEY (`JOB_ID`,`TASK_ID`),
-  KEY `TASK_ID` (`TASK_ID`),
-  CONSTRAINT `job_ibfk_1` FOREIGN KEY (`TASK_ID`) REFERENCES `TASK` (`TASK_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `JOB`
---
-
-LOCK TABLES `JOB` WRITE;
-/*!40000 ALTER TABLE `JOB` DISABLE KEYS */;
-/*!40000 ALTER TABLE `JOB` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `JOB_STATUS`
---
-
-DROP TABLE IF EXISTS `JOB_STATUS`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `JOB_STATUS` (
-  `STATUS_ID` varchar(255) NOT NULL,
-  `JOB_ID` varchar(255) NOT NULL,
-  `TASK_ID` varchar(255) NOT NULL,
-  `STATE` varchar(255) DEFAULT NULL,
-  `TIME_OF_STATE_CHANGE` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6),
-  `REASON` longtext,
-  PRIMARY KEY (`STATUS_ID`,`JOB_ID`,`TASK_ID`),
-  KEY `JOB_ID` (`JOB_ID`,`TASK_ID`),
-  CONSTRAINT `job_status_ibfk_1` FOREIGN KEY (`JOB_ID`, `TASK_ID`) REFERENCES `JOB` (`JOB_ID`, `TASK_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `JOB_STATUS`
---
-
-LOCK TABLES `JOB_STATUS` WRITE;
-/*!40000 ALTER TABLE `JOB_STATUS` DISABLE KEYS */;
-/*!40000 ALTER TABLE `JOB_STATUS` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `NOTIFICATION`
---
-
-DROP TABLE IF EXISTS `NOTIFICATION`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `NOTIFICATION` (
-  `NOTIFICATION_ID` varchar(255) NOT NULL,
-  `GATEWAY_ID` varchar(255) DEFAULT NULL,
-  `TITLE` varchar(255) DEFAULT NULL,
-  `PRIORITY` varchar(255) DEFAULT NULL,
-  `NOTIFICATION_MESSAGE` varchar(4096) NOT NULL,
-  `PUBLISHED_DATE` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `EXPIRATION_DATE` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `CREATION_DATE` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  PRIMARY KEY (`NOTIFICATION_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `NOTIFICATION`
---
-
-LOCK TABLES `NOTIFICATION` WRITE;
-/*!40000 ALTER TABLE `NOTIFICATION` DISABLE KEYS */;
-/*!40000 ALTER TABLE `NOTIFICATION` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `PROCESS`
---
-
-DROP TABLE IF EXISTS `PROCESS`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `PROCESS` (
-  `PROCESS_ID` varchar(255) NOT NULL,
-  `EXPERIMENT_ID` varchar(255) NOT NULL,
-  `CREATION_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `LAST_UPDATE_TIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `PROCESS_DETAIL` text,
-  `APPLICATION_INTERFACE_ID` varchar(255) DEFAULT NULL,
-  `TASK_DAG` text,
-  `APPLICATION_DEPLOYMENT_ID` varchar(255) DEFAULT NULL,
-  `COMPUTE_RESOURCE_ID` varchar(255) DEFAULT NULL,
-  `GATEWAY_EXECUTION_ID` varchar(255) DEFAULT NULL,
-  `ENABLE_EMAIL_NOTIFICATION` tinyint(1) DEFAULT NULL,
-  `EMAIL_ADDRESSES` text,
-  `STORAGE_RESOURCE_ID` varchar(255) DEFAULT NULL,
-  `USER_DN` varchar(255) DEFAULT NULL,
-  `GENERATE_CERT` smallint(6) DEFAULT NULL,
-  `EXPERIMENT_DATA_DIR` varchar(512) DEFAULT NULL,
-  `USERNAME` varchar(255) DEFAULT NULL,
-  `GROUP_RESOURCE_PROFILE_ID` varchar(255) DEFAULT NULL,
-  `USE_USER_CR_PREF` tinyint(1) DEFAULT NULL,
-  PRIMARY KEY (`PROCESS_ID`),
-  KEY `EXPERIMENT_ID` (`EXPERIMENT_ID`),
-  CONSTRAINT `process_ibfk_1` FOREIGN KEY (`EXPERIMENT_ID`) REFERENCES `EXPERIMENT` (`EXPERIMENT_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `PROCESS`
---
-
-LOCK TABLES `PROCESS` WRITE;
-/*!40000 ALTER TABLE `PROCESS` DISABLE KEYS */;
-/*!40000 ALTER TABLE `PROCESS` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `PROCESS_ERROR`
---
-
-DROP TABLE IF EXISTS `PROCESS_ERROR`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `PROCESS_ERROR` (
-  `ERROR_ID` varchar(255) NOT NULL,
-  `PROCESS_ID` varchar(255) NOT NULL,
-  `CREATION_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `ACTUAL_ERROR_MESSAGE` text,
-  `USER_FRIENDLY_MESSAGE` text,
-  `TRANSIENT_OR_PERSISTENT` tinyint(1) DEFAULT NULL,
-  `ROOT_CAUSE_ERROR_ID_LIST` text,
-  PRIMARY KEY (`ERROR_ID`,`PROCESS_ID`),
-  KEY `PROCESS_ID` (`PROCESS_ID`),
-  CONSTRAINT `process_error_ibfk_1` FOREIGN KEY (`PROCESS_ID`) REFERENCES `PROCESS` (`PROCESS_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `PROCESS_ERROR`
---
-
-LOCK TABLES `PROCESS_ERROR` WRITE;
-/*!40000 ALTER TABLE `PROCESS_ERROR` DISABLE KEYS */;
-/*!40000 ALTER TABLE `PROCESS_ERROR` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `PROCESS_INPUT`
---
-
-DROP TABLE IF EXISTS `PROCESS_INPUT`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `PROCESS_INPUT` (
-  `PROCESS_ID` varchar(255) NOT NULL,
-  `INPUT_NAME` varchar(255) NOT NULL,
-  `INPUT_VALUE` text,
-  `DATA_TYPE` varchar(255) DEFAULT NULL,
-  `APPLICATION_ARGUMENT` varchar(255) DEFAULT NULL,
-  `STANDARD_INPUT` tinyint(1) DEFAULT NULL,
-  `USER_FRIENDLY_DESCRIPTION` varchar(255) DEFAULT NULL,
-  `METADATA` varchar(4096) DEFAULT NULL,
-  `INPUT_ORDER` int(11) DEFAULT NULL,
-  `IS_REQUIRED` tinyint(1) DEFAULT NULL,
-  `REQUIRED_TO_ADDED_TO_CMD` tinyint(1) DEFAULT NULL,
-  `DATA_STAGED` tinyint(1) DEFAULT NULL,
-  `STORAGE_RESOURCE_ID` varchar(255) DEFAULT NULL,
-  `IS_READ_ONLY` tinyint(1) DEFAULT NULL,
-  PRIMARY KEY (`PROCESS_ID`,`INPUT_NAME`),
-  CONSTRAINT `process_input_ibfk_1` FOREIGN KEY (`PROCESS_ID`) REFERENCES `PROCESS` (`PROCESS_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `PROCESS_INPUT`
---
-
-LOCK TABLES `PROCESS_INPUT` WRITE;
-/*!40000 ALTER TABLE `PROCESS_INPUT` DISABLE KEYS */;
-/*!40000 ALTER TABLE `PROCESS_INPUT` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `PROCESS_OUTPUT`
---
-
-DROP TABLE IF EXISTS `PROCESS_OUTPUT`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `PROCESS_OUTPUT` (
-  `PROCESS_ID` varchar(255) NOT NULL,
-  `OUTPUT_NAME` varchar(255) NOT NULL,
-  `OUTPUT_VALUE` longtext,
-  `DATA_TYPE` varchar(255) DEFAULT NULL,
-  `APPLICATION_ARGUMENT` varchar(255) DEFAULT NULL,
-  `IS_REQUIRED` tinyint(1) DEFAULT NULL,
-  `REQUIRED_TO_ADDED_TO_CMD` tinyint(1) DEFAULT NULL,
-  `DATA_MOVEMENT` tinyint(1) DEFAULT NULL,
-  `LOCATION` varchar(255) DEFAULT NULL,
-  `SEARCH_QUERY` varchar(255) DEFAULT NULL,
-  `OUTPUT_STREAMING` smallint(6) DEFAULT NULL,
-  `STORAGE_RESOURCE_ID` varchar(255) DEFAULT NULL,
-  `METADATA` varchar(4096) DEFAULT NULL,
-  PRIMARY KEY (`PROCESS_ID`,`OUTPUT_NAME`),
-  CONSTRAINT `process_output_ibfk_1` FOREIGN KEY (`PROCESS_ID`) REFERENCES `PROCESS` (`PROCESS_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `PROCESS_OUTPUT`
---
-
-LOCK TABLES `PROCESS_OUTPUT` WRITE;
-/*!40000 ALTER TABLE `PROCESS_OUTPUT` DISABLE KEYS */;
-/*!40000 ALTER TABLE `PROCESS_OUTPUT` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `PROCESS_RESOURCE_SCHEDULE`
---
-
-DROP TABLE IF EXISTS `PROCESS_RESOURCE_SCHEDULE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `PROCESS_RESOURCE_SCHEDULE` (
-  `PROCESS_ID` varchar(255) NOT NULL,
-  `RESOURCE_HOST_ID` varchar(255) DEFAULT NULL,
-  `TOTAL_CPU_COUNT` int(11) DEFAULT NULL,
-  `NODE_COUNT` int(11) DEFAULT NULL,
-  `NUMBER_OF_THREADS` int(11) DEFAULT NULL,
-  `QUEUE_NAME` varchar(255) DEFAULT NULL,
-  `WALL_TIME_LIMIT` int(11) DEFAULT NULL,
-  `TOTAL_PHYSICAL_MEMORY` int(11) DEFAULT NULL,
-  `STATIC_WORKING_DIR` varchar(255) DEFAULT NULL,
-  `OVERRIDE_ALLOCATION_PROJECT_NUMBER` varchar(255) DEFAULT NULL,
-  `OVERRIDE_LOGIN_USER_NAME` varchar(255) DEFAULT NULL,
-  `OVERRIDE_SCRATCH_LOCATION` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`PROCESS_ID`),
-  CONSTRAINT `process_resource_schedule_ibfk_1` FOREIGN KEY (`PROCESS_ID`) REFERENCES `PROCESS` (`PROCESS_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `PROCESS_RESOURCE_SCHEDULE`
---
-
-LOCK TABLES `PROCESS_RESOURCE_SCHEDULE` WRITE;
-/*!40000 ALTER TABLE `PROCESS_RESOURCE_SCHEDULE` DISABLE KEYS */;
-/*!40000 ALTER TABLE `PROCESS_RESOURCE_SCHEDULE` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `PROCESS_STATUS`
---
-
-DROP TABLE IF EXISTS `PROCESS_STATUS`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `PROCESS_STATUS` (
-  `STATUS_ID` varchar(255) NOT NULL,
-  `PROCESS_ID` varchar(255) NOT NULL,
-  `STATE` varchar(255) DEFAULT NULL,
-  `TIME_OF_STATE_CHANGE` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6),
-  `REASON` longtext,
-  PRIMARY KEY (`STATUS_ID`,`PROCESS_ID`),
-  KEY `PROCESS_ID` (`PROCESS_ID`),
-  CONSTRAINT `process_status_ibfk_1` FOREIGN KEY (`PROCESS_ID`) REFERENCES `PROCESS` (`PROCESS_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `PROCESS_STATUS`
---
-
-LOCK TABLES `PROCESS_STATUS` WRITE;
-/*!40000 ALTER TABLE `PROCESS_STATUS` DISABLE KEYS */;
-/*!40000 ALTER TABLE `PROCESS_STATUS` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `PROJECT`
---
-
-DROP TABLE IF EXISTS `PROJECT`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `PROJECT` (
-  `GATEWAY_ID` varchar(255) NOT NULL,
-  `USER_NAME` varchar(255) DEFAULT NULL,
-  `PROJECT_NAME` varchar(255) DEFAULT NULL,
-  `PROJECT_ID` varchar(255) NOT NULL,
-  `DESCRIPTION` varchar(255) DEFAULT NULL,
-  `CREATION_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`PROJECT_ID`),
-  KEY `GATEWAY_ID` (`GATEWAY_ID`),
-  CONSTRAINT `project_ibfk_1` FOREIGN KEY (`GATEWAY_ID`) REFERENCES `GATEWAY` (`GATEWAY_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `PROJECT`
---
-
-LOCK TABLES `PROJECT` WRITE;
-/*!40000 ALTER TABLE `PROJECT` DISABLE KEYS */;
-INSERT INTO `PROJECT` VALUES ('default','default-admin','Default Project','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc','This is the default project for user default-admin','2019-02-25 18:46:45');
-/*!40000 ALTER TABLE `PROJECT` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `PROJECT_USER`
---
-
-DROP TABLE IF EXISTS `PROJECT_USER`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `PROJECT_USER` (
-  `PROJECT_ID` varchar(255) NOT NULL,
-  `USER_NAME` varchar(255) NOT NULL,
-  PRIMARY KEY (`PROJECT_ID`,`USER_NAME`),
-  CONSTRAINT `project_user_ibfk_1` FOREIGN KEY (`PROJECT_ID`) REFERENCES `PROJECT` (`PROJECT_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `PROJECT_USER`
---
-
-LOCK TABLES `PROJECT_USER` WRITE;
-/*!40000 ALTER TABLE `PROJECT_USER` DISABLE KEYS */;
-/*!40000 ALTER TABLE `PROJECT_USER` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `QUEUE_STATUS`
---
-
-DROP TABLE IF EXISTS `QUEUE_STATUS`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `QUEUE_STATUS` (
-  `HOST_NAME` varchar(255) NOT NULL,
-  `QUEUE_NAME` varchar(255) NOT NULL,
-  `CREATED_TIME` bigint(20) NOT NULL,
-  `QUEUE_UP` tinyint(1) DEFAULT NULL,
-  `RUNNING_JOBS` int(11) DEFAULT NULL,
-  `QUEUED_JOBS` int(11) DEFAULT NULL,
-  PRIMARY KEY (`HOST_NAME`,`QUEUE_NAME`,`CREATED_TIME`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `QUEUE_STATUS`
---
-
-LOCK TABLES `QUEUE_STATUS` WRITE;
-/*!40000 ALTER TABLE `QUEUE_STATUS` DISABLE KEYS */;
-/*!40000 ALTER TABLE `QUEUE_STATUS` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `TASK`
---
-
-DROP TABLE IF EXISTS `TASK`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `TASK` (
-  `TASK_ID` varchar(255) NOT NULL,
-  `TASK_TYPE` varchar(255) DEFAULT NULL,
-  `PARENT_PROCESS_ID` varchar(255) NOT NULL,
-  `CREATION_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `LAST_UPDATE_TIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `TASK_DETAIL` text,
-  `SUB_TASK_MODEL` blob,
-  PRIMARY KEY (`TASK_ID`),
-  KEY `PARENT_PROCESS_ID` (`PARENT_PROCESS_ID`),
-  CONSTRAINT `task_ibfk_1` FOREIGN KEY (`PARENT_PROCESS_ID`) REFERENCES `PROCESS` (`PROCESS_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `TASK`
---
-
-LOCK TABLES `TASK` WRITE;
-/*!40000 ALTER TABLE `TASK` DISABLE KEYS */;
-/*!40000 ALTER TABLE `TASK` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `TASK_ERROR`
---
-
-DROP TABLE IF EXISTS `TASK_ERROR`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `TASK_ERROR` (
-  `ERROR_ID` varchar(255) NOT NULL,
-  `TASK_ID` varchar(255) NOT NULL,
-  `CREATION_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `ACTUAL_ERROR_MESSAGE` text,
-  `USER_FRIENDLY_MESSAGE` text,
-  `TRANSIENT_OR_PERSISTENT` tinyint(1) DEFAULT NULL,
-  `ROOT_CAUSE_ERROR_ID_LIST` text,
-  PRIMARY KEY (`ERROR_ID`,`TASK_ID`),
-  KEY `TASK_ID` (`TASK_ID`),
-  CONSTRAINT `task_error_ibfk_1` FOREIGN KEY (`TASK_ID`) REFERENCES `TASK` (`TASK_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `TASK_ERROR`
---
-
-LOCK TABLES `TASK_ERROR` WRITE;
-/*!40000 ALTER TABLE `TASK_ERROR` DISABLE KEYS */;
-/*!40000 ALTER TABLE `TASK_ERROR` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `TASK_STATUS`
---
-
-DROP TABLE IF EXISTS `TASK_STATUS`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `TASK_STATUS` (
-  `STATUS_ID` varchar(255) NOT NULL,
-  `TASK_ID` varchar(255) NOT NULL,
-  `STATE` varchar(255) DEFAULT NULL,
-  `TIME_OF_STATE_CHANGE` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6),
-  `REASON` longtext,
-  PRIMARY KEY (`STATUS_ID`,`TASK_ID`),
-  KEY `TASK_ID` (`TASK_ID`),
-  CONSTRAINT `task_status_ibfk_1` FOREIGN KEY (`TASK_ID`) REFERENCES `TASK` (`TASK_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `TASK_STATUS`
---
-
-LOCK TABLES `TASK_STATUS` WRITE;
-/*!40000 ALTER TABLE `TASK_STATUS` DISABLE KEYS */;
-/*!40000 ALTER TABLE `TASK_STATUS` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `USERS`
---
-
-DROP TABLE IF EXISTS `USERS`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `USERS` (
-  `AIRAVATA_INTERNAL_USER_ID` varchar(255) NOT NULL,
-  `USER_NAME` varchar(255) NOT NULL,
-  `PASSWORD` varchar(255) DEFAULT NULL,
-  `GATEWAY_ID` varchar(255) NOT NULL,
-  PRIMARY KEY (`GATEWAY_ID`,`USER_NAME`),
-  UNIQUE KEY `AIRAVATA_INTERNAL_USER_ID` (`AIRAVATA_INTERNAL_USER_ID`),
-  CONSTRAINT `users_ibfk_1` FOREIGN KEY (`GATEWAY_ID`) REFERENCES `GATEWAY` (`GATEWAY_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `USERS`
---
-
-LOCK TABLES `USERS` WRITE;
-/*!40000 ALTER TABLE `USERS` DISABLE KEYS */;
-INSERT INTO `USERS` VALUES ('DO_NOT_SET_AT_CLIENTS','default-admin',NULL,'default');
-/*!40000 ALTER TABLE `USERS` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `USER_CONFIGURATION_DATA`
---
-
-DROP TABLE IF EXISTS `USER_CONFIGURATION_DATA`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `USER_CONFIGURATION_DATA` (
-  `EXPERIMENT_ID` varchar(255) NOT NULL,
-  `AIRAVATA_AUTO_SCHEDULE` tinyint(1) DEFAULT NULL,
-  `OVERRIDE_MANUAL_SCHEDULED_PARAMS` tinyint(1) DEFAULT NULL,
-  `SHARE_EXPERIMENT_PUBLICALLY` tinyint(1) DEFAULT NULL,
-  `THROTTLE_RESOURCES` tinyint(1) DEFAULT NULL,
-  `USER_DN` varchar(255) DEFAULT NULL,
-  `GENERATE_CERT` tinyint(1) DEFAULT NULL,
-  `RESOURCE_HOST_ID` varchar(255) DEFAULT NULL,
-  `TOTAL_CPU_COUNT` int(11) DEFAULT NULL,
-  `NODE_COUNT` int(11) DEFAULT NULL,
-  `NUMBER_OF_THREADS` int(11) DEFAULT NULL,
-  `QUEUE_NAME` varchar(255) DEFAULT NULL,
-  `WALL_TIME_LIMIT` int(11) DEFAULT NULL,
-  `TOTAL_PHYSICAL_MEMORY` int(11) DEFAULT NULL,
-  `STATIC_WORKING_DIR` varchar(255) DEFAULT NULL,
-  `OVERRIDE_LOGIN_USER_NAME` varchar(255) DEFAULT NULL,
-  `OVERRIDE_SCRATCH_LOCATION` varchar(255) DEFAULT NULL,
-  `OVERRIDE_ALLOCATION_PROJECT_NUMBER` varchar(255) DEFAULT NULL,
-  `STORAGE_RESOURCE_ID` varchar(255) DEFAULT NULL,
-  `EXPERIMENT_DATA_DIR` varchar(512) DEFAULT NULL,
-  `GROUP_RESOURCE_PROFILE_ID` varchar(255) DEFAULT NULL,
-  `IS_USE_USER_CR_PREF` tinyint(1) DEFAULT NULL,
-  PRIMARY KEY (`EXPERIMENT_ID`),
-  CONSTRAINT `user_configuration_data_ibfk_1` FOREIGN KEY (`EXPERIMENT_ID`) REFERENCES `EXPERIMENT` (`EXPERIMENT_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `USER_CONFIGURATION_DATA`
---
-
-LOCK TABLES `USER_CONFIGURATION_DATA` WRITE;
-/*!40000 ALTER TABLE `USER_CONFIGURATION_DATA` DISABLE KEYS */;
-/*!40000 ALTER TABLE `USER_CONFIGURATION_DATA` ENABLE KEYS */;
-UNLOCK TABLES;
-
-DROP TABLE IF EXISTS `PROCESS_WORKFLOW`;
-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 NOW(),
-  PRIMARY KEY (`PROCESS_ID`, `WORKFLOW_ID`),
-  FOREIGN KEY (`PROCESS_ID`) REFERENCES PROCESS(`PROCESS_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-
-LOCK TABLES `PROCESS_WORKFLOW` WRITE;
-/*!40000 ALTER TABLE `PROCESS_WORKFLOW` DISABLE KEYS */;
-/*!40000 ALTER TABLE `PROCESS_WORKFLOW` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Temporary table structure for view `experiment_summary`
---
-
-DROP TABLE IF EXISTS `experiment_summary`;
-/*!50001 DROP VIEW IF EXISTS `experiment_summary`*/;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-/*!50001 CREATE VIEW `experiment_summary` AS SELECT
- 1 AS `EXPERIMENT_ID`,
- 1 AS `PROJECT_ID`,
- 1 AS `GATEWAY_ID`,
- 1 AS `USER_NAME`,
- 1 AS `EXECUTION_ID`,
- 1 AS `EXPERIMENT_NAME`,
- 1 AS `CREATION_TIME`,
- 1 AS `DESCRIPTION`,
- 1 AS `STATE`,
- 1 AS `RESOURCE_HOST_ID`,
- 1 AS `TIME_OF_STATE_CHANGE`*/;
-SET character_set_client = @saved_cs_client;
-
---
--- Temporary table structure for view `latest_experiment_status`
---
-
-DROP TABLE IF EXISTS `latest_experiment_status`;
-/*!50001 DROP VIEW IF EXISTS `latest_experiment_status`*/;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-/*!50001 CREATE VIEW `latest_experiment_status` AS SELECT
- 1 AS `EXPERIMENT_ID`,
- 1 AS `STATE`,
- 1 AS `TIME_OF_STATE_CHANGE`*/;
-SET character_set_client = @saved_cs_client;
-
---
--- Current Database: `profile_service`
---
-
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `profile_service` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci */;
-
-USE `profile_service`;
-
---
--- Table structure for table `CONFIGURATION`
---
-
-DROP TABLE IF EXISTS `CONFIGURATION`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `CONFIGURATION` (
-  `CONFIG_KEY` varchar(255) NOT NULL,
-  `CONFIG_VAL` varchar(255) NOT NULL,
-  PRIMARY KEY (`CONFIG_KEY`,`CONFIG_VAL`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `CONFIGURATION`
---
-
-LOCK TABLES `CONFIGURATION` WRITE;
-/*!40000 ALTER TABLE `CONFIGURATION` DISABLE KEYS */;
-INSERT INTO `CONFIGURATION` VALUES ('user_profile_catalog_version','0.17');
-/*!40000 ALTER TABLE `CONFIGURATION` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `CUSTOMIZED_DASHBOARD`
---
-
-DROP TABLE IF EXISTS `CUSTOMIZED_DASHBOARD`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `CUSTOMIZED_DASHBOARD` (
-  `AIRAVATA_INTERNAL_USER_ID` varchar(255) NOT NULL,
-  `ENABLED_EXPERIMENT_ID` varchar(255) DEFAULT NULL,
-  `ENABLED_NAME` varchar(255) DEFAULT NULL,
-  `ENABLED_DESCRIPTION` varchar(255) DEFAULT NULL,
-  `ENABLED_PROJECT` varchar(255) DEFAULT NULL,
-  `ENABLED_OWNER` varchar(255) DEFAULT NULL,
-  `ENABLED_APPLICATION` varchar(255) DEFAULT NULL,
-  `ENABLED_COMPUTE_RESOURCE` varchar(255) DEFAULT NULL,
-  `ENABLED_JOB_NAME` varchar(255) DEFAULT NULL,
-  `ENABLED_JOB_ID` varchar(255) DEFAULT NULL,
-  `ENABLED_JOB_STATUS` varchar(255) DEFAULT NULL,
-  `ENABLED_JOB_CREATION_TIME` varchar(255) DEFAULT NULL,
-  `ENABLED_NOTIFICATIONS_TO` varchar(255) DEFAULT NULL,
-  `ENABLED_WORKING_DIR` varchar(255) DEFAULT NULL,
-  `ENABLED_JOB_DESCRIPTION` varchar(255) DEFAULT NULL,
-  `ENABLED_CREATION_TIME` varchar(255) DEFAULT NULL,
-  `ENABLED_LAST_MODIFIED_TIME` varchar(255) DEFAULT NULL,
-  `ENABLED_WALL_TIME` varchar(255) DEFAULT NULL,
-  `ENABLED_CPU_COUNT` varchar(255) DEFAULT NULL,
-  `ENABLED_NODE_COUNT` varchar(255) DEFAULT NULL,
-  `ENABLED_QUEUE` varchar(255) DEFAULT NULL,
-  `ENABLED_INPUTS` varchar(255) DEFAULT NULL,
-  `ENABLED_OUTPUTS` varchar(255) DEFAULT NULL,
-  `ENABLED_STORAGE_DIR` varchar(255) DEFAULT NULL,
-  `ENABLED_ERRORS` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`AIRAVATA_INTERNAL_USER_ID`),
-  CONSTRAINT `customized_dashboard_ibfk_1` FOREIGN KEY (`AIRAVATA_INTERNAL_USER_ID`) REFERENCES `USER_PROFILE` (`AIRAVATA_INTERNAL_USER_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `CUSTOMIZED_DASHBOARD`
---
-
-LOCK TABLES `CUSTOMIZED_DASHBOARD` WRITE;
-/*!40000 ALTER TABLE `CUSTOMIZED_DASHBOARD` DISABLE KEYS */;
-/*!40000 ALTER TABLE `CUSTOMIZED_DASHBOARD` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `GATEWAY`
---
-
-DROP TABLE IF EXISTS `GATEWAY`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `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`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `GATEWAY`
---
-
-LOCK TABLES `GATEWAY` WRITE;
-/*!40000 ALTER TABLE `GATEWAY` DISABLE KEYS */;
-/*!40000 ALTER TABLE `GATEWAY` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `NSF_DEMOGRAPHIC`
---
-
-DROP TABLE IF EXISTS `NSF_DEMOGRAPHIC`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `NSF_DEMOGRAPHIC` (
-  `AIRAVATA_INTERNAL_USER_ID` varchar(255) NOT NULL,
-  `GENDER` varchar(255) NOT NULL,
-  PRIMARY KEY (`AIRAVATA_INTERNAL_USER_ID`),
-  CONSTRAINT `nsf_demographic_ibfk_1` FOREIGN KEY (`AIRAVATA_INTERNAL_USER_ID`) REFERENCES `USER_PROFILE` (`AIRAVATA_INTERNAL_USER_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `NSF_DEMOGRAPHIC`
---
-
-LOCK TABLES `NSF_DEMOGRAPHIC` WRITE;
-/*!40000 ALTER TABLE `NSF_DEMOGRAPHIC` DISABLE KEYS */;
-/*!40000 ALTER TABLE `NSF_DEMOGRAPHIC` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `NSF_DEMOGRAPHIC_DISABILITY`
---
-
-DROP TABLE IF EXISTS `NSF_DEMOGRAPHIC_DISABILITY`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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`),
-  CONSTRAINT `nsf_demographic_disability_ibfk_1` FOREIGN KEY (`AIRAVATA_INTERNAL_USER_ID`) REFERENCES `NSF_DEMOGRAPHIC` (`AIRAVATA_INTERNAL_USER_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `NSF_DEMOGRAPHIC_DISABILITY`
---
-
-LOCK TABLES `NSF_DEMOGRAPHIC_DISABILITY` WRITE;
-/*!40000 ALTER TABLE `NSF_DEMOGRAPHIC_DISABILITY` DISABLE KEYS */;
-/*!40000 ALTER TABLE `NSF_DEMOGRAPHIC_DISABILITY` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `NSF_DEMOGRAPHIC_ETHNICITY`
---
-
-DROP TABLE IF EXISTS `NSF_DEMOGRAPHIC_ETHNICITY`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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`),
-  CONSTRAINT `nsf_demographic_ethnicity_ibfk_1` FOREIGN KEY (`AIRAVATA_INTERNAL_USER_ID`) REFERENCES `NSF_DEMOGRAPHIC` (`AIRAVATA_INTERNAL_USER_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `NSF_DEMOGRAPHIC_ETHNICITY`
---
-
-LOCK TABLES `NSF_DEMOGRAPHIC_ETHNICITY` WRITE;
-/*!40000 ALTER TABLE `NSF_DEMOGRAPHIC_ETHNICITY` DISABLE KEYS */;
-/*!40000 ALTER TABLE `NSF_DEMOGRAPHIC_ETHNICITY` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `NSF_DEMOGRAPHIC_RACE`
---
-
-DROP TABLE IF EXISTS `NSF_DEMOGRAPHIC_RACE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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`),
-  CONSTRAINT `nsf_demographic_race_ibfk_1` FOREIGN KEY (`AIRAVATA_INTERNAL_USER_ID`) REFERENCES `NSF_DEMOGRAPHIC` (`AIRAVATA_INTERNAL_USER_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `NSF_DEMOGRAPHIC_RACE`
---
-
-LOCK TABLES `NSF_DEMOGRAPHIC_RACE` WRITE;
-/*!40000 ALTER TABLE `NSF_DEMOGRAPHIC_RACE` DISABLE KEYS */;
-/*!40000 ALTER TABLE `NSF_DEMOGRAPHIC_RACE` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `USER_PROFILE`
---
-
-DROP TABLE IF EXISTS `USER_PROFILE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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) DEFAULT NULL,
-  `FIRST_NAME` varchar(255) DEFAULT NULL,
-  `LAST_NAME` varchar(255) DEFAULT NULL,
-  `MIDDLE_NAME` varchar(255) DEFAULT NULL,
-  `NAME_PREFIX` varchar(255) DEFAULT NULL,
-  `NAME_SUFFIX` varchar(255) DEFAULT NULL,
-  `ORCID_ID` varchar(255) DEFAULT NULL,
-  `COUNTRY` varchar(255) DEFAULT NULL,
-  `HOME_ORGANIZATION` varchar(255) DEFAULT NULL,
-  `ORIGINATION_AFFILIATION` varchar(255) DEFAULT NULL,
-  `CREATION_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `LAST_ACCESS_TIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `VALID_UNTIL` datetime DEFAULT NULL,
-  `STATE` varchar(255) DEFAULT NULL,
-  `COMMENTS` text,
-  `GPG_KEY` text,
-  `TIME_ZONE` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`AIRAVATA_INTERNAL_USER_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `USER_PROFILE`
---
-
-LOCK TABLES `USER_PROFILE` WRITE;
-/*!40000 ALTER TABLE `USER_PROFILE` DISABLE KEYS */;
-INSERT INTO `USER_PROFILE` VALUES ('default-admin@default','default-admin','default','1.0','dim','Upe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2019-02-25 18:46:43','2019-02-25 18:46:43','1969-12-31 19:00:00','ACTIVE',NULL,NULL,NULL);
-/*!40000 ALTER TABLE `USER_PROFILE` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `USER_PROFILE_EMAIL`
---
-
-DROP TABLE IF EXISTS `USER_PROFILE_EMAIL`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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`),
-  CONSTRAINT `user_profile_email_ibfk_1` FOREIGN KEY (`AIRAVATA_INTERNAL_USER_ID`) REFERENCES `USER_PROFILE` (`AIRAVATA_INTERNAL_USER_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `USER_PROFILE_EMAIL`
---
-
-LOCK TABLES `USER_PROFILE_EMAIL` WRITE;
-/*!40000 ALTER TABLE `USER_PROFILE_EMAIL` DISABLE KEYS */;
-INSERT INTO `USER_PROFILE_EMAIL` VALUES ('default-admin@default','dimuthu.upeksha2@gmail.com');
-/*!40000 ALTER TABLE `USER_PROFILE_EMAIL` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `USER_PROFILE_LABELED_URI`
---
-
-DROP TABLE IF EXISTS `USER_PROFILE_LABELED_URI`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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`),
-  CONSTRAINT `user_profile_labeled_uri_ibfk_1` FOREIGN KEY (`AIRAVATA_INTERNAL_USER_ID`) REFERENCES `USER_PROFILE` (`AIRAVATA_INTERNAL_USER_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `USER_PROFILE_LABELED_URI`
---
-
-LOCK TABLES `USER_PROFILE_LABELED_URI` WRITE;
-/*!40000 ALTER TABLE `USER_PROFILE_LABELED_URI` DISABLE KEYS */;
-/*!40000 ALTER TABLE `USER_PROFILE_LABELED_URI` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `USER_PROFILE_NATIONALITY`
---
-
-DROP TABLE IF EXISTS `USER_PROFILE_NATIONALITY`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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`),
-  CONSTRAINT `user_profile_nationality_ibfk_1` FOREIGN KEY (`AIRAVATA_INTERNAL_USER_ID`) REFERENCES `USER_PROFILE` (`AIRAVATA_INTERNAL_USER_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `USER_PROFILE_NATIONALITY`
---
-
-LOCK TABLES `USER_PROFILE_NATIONALITY` WRITE;
-/*!40000 ALTER TABLE `USER_PROFILE_NATIONALITY` DISABLE KEYS */;
-/*!40000 ALTER TABLE `USER_PROFILE_NATIONALITY` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `USER_PROFILE_PHONE`
---
-
-DROP TABLE IF EXISTS `USER_PROFILE_PHONE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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`),
-  CONSTRAINT `user_profile_phone_ibfk_1` FOREIGN KEY (`AIRAVATA_INTERNAL_USER_ID`) REFERENCES `USER_PROFILE` (`AIRAVATA_INTERNAL_USER_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `USER_PROFILE_PHONE`
---
-
-LOCK TABLES `USER_PROFILE_PHONE` WRITE;
-/*!40000 ALTER TABLE `USER_PROFILE_PHONE` DISABLE KEYS */;
-/*!40000 ALTER TABLE `USER_PROFILE_PHONE` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Current Database: `replica_catalog`
---
-
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `replica_catalog` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci */;
-
-USE `replica_catalog`;
-
---
--- Table structure for table `CONFIGURATION`
---
-
-DROP TABLE IF EXISTS `CONFIGURATION`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `CONFIGURATION` (
-  `CONFIG_KEY` varchar(255) NOT NULL,
-  `CONFIG_VAL` varchar(255) NOT NULL,
-  PRIMARY KEY (`CONFIG_KEY`,`CONFIG_VAL`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `CONFIGURATION`
---
-
-LOCK TABLES `CONFIGURATION` WRITE;
-/*!40000 ALTER TABLE `CONFIGURATION` DISABLE KEYS */;
-INSERT INTO `CONFIGURATION` VALUES ('data_catalog_version','0.16');
-/*!40000 ALTER TABLE `CONFIGURATION` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `DATA_PRODUCT`
---
-
-DROP TABLE IF EXISTS `DATA_PRODUCT`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `DATA_PRODUCT` (
-  `PRODUCT_URI` varchar(255) NOT NULL,
-  `GATEWAY_ID` varchar(255) DEFAULT NULL,
-  `PRODUCT_NAME` varchar(255) DEFAULT NULL,
-  `PRODUCT_DESCRIPTION` varchar(255) DEFAULT NULL,
-  `OWNER_NAME` varchar(255) DEFAULT NULL,
-  `PARENT_PRODUCT_URI` varchar(255) DEFAULT NULL,
-  `PRODUCT_SIZE` int(11) DEFAULT NULL,
-  `CREATION_TIME` timestamp NULL DEFAULT '0000-00-00 00:00:00',
-  `LAST_MODIFIED_TIME` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `PRODUCT_TYPE` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`PRODUCT_URI`),
-  KEY `PARENT_PRODUCT_URI` (`PARENT_PRODUCT_URI`),
-  CONSTRAINT `data_product_ibfk_1` FOREIGN KEY (`PARENT_PRODUCT_URI`) REFERENCES `DATA_PRODUCT` (`PRODUCT_URI`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `DATA_PRODUCT`
---
-
-LOCK TABLES `DATA_PRODUCT` WRITE;
-/*!40000 ALTER TABLE `DATA_PRODUCT` DISABLE KEYS */;
-/*!40000 ALTER TABLE `DATA_PRODUCT` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `DATA_PRODUCT_METADATA`
---
-
-DROP TABLE IF EXISTS `DATA_PRODUCT_METADATA`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `DATA_PRODUCT_METADATA` (
-  `PRODUCT_URI` varchar(255) NOT NULL,
-  `METADATA_KEY` varchar(255) NOT NULL,
-  `METADATA_VALUE` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`PRODUCT_URI`,`METADATA_KEY`),
-  CONSTRAINT `data_product_metadata_ibfk_1` FOREIGN KEY (`PRODUCT_URI`) REFERENCES `DATA_PRODUCT` (`PRODUCT_URI`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `DATA_PRODUCT_METADATA`
---
-
-LOCK TABLES `DATA_PRODUCT_METADATA` WRITE;
-/*!40000 ALTER TABLE `DATA_PRODUCT_METADATA` DISABLE KEYS */;
-/*!40000 ALTER TABLE `DATA_PRODUCT_METADATA` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `DATA_REPLICA_LOCATION`
---
-
-DROP TABLE IF EXISTS `DATA_REPLICA_LOCATION`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `DATA_REPLICA_LOCATION` (
-  `REPLICA_ID` varchar(255) NOT NULL,
-  `PRODUCT_URI` varchar(255) NOT NULL,
-  `REPLICA_NAME` varchar(255) DEFAULT NULL,
-  `REPLICA_DESCRIPTION` varchar(255) DEFAULT NULL,
-  `STORAGE_RESOURCE_ID` varchar(255) DEFAULT NULL,
-  `FILE_PATH` varchar(255) DEFAULT NULL,
-  `CREATION_TIME` timestamp NULL DEFAULT '0000-00-00 00:00:00',
-  `LAST_MODIFIED_TIME` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `VALID_UNTIL_TIME` timestamp NULL DEFAULT '0000-00-00 00:00:00',
-  `REPLICA_LOCATION_CATEGORY` varchar(26) DEFAULT NULL,
-  `REPLICA_PERSISTENT_TYPE` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`REPLICA_ID`),
-  KEY `PRODUCT_URI` (`PRODUCT_URI`),
-  CONSTRAINT `data_replica_location_ibfk_1` FOREIGN KEY (`PRODUCT_URI`) REFERENCES `DATA_PRODUCT` (`PRODUCT_URI`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `DATA_REPLICA_LOCATION`
---
-
-LOCK TABLES `DATA_REPLICA_LOCATION` WRITE;
-/*!40000 ALTER TABLE `DATA_REPLICA_LOCATION` DISABLE KEYS */;
-/*!40000 ALTER TABLE `DATA_REPLICA_LOCATION` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `DATA_REPLICA_METADATA`
---
-
-DROP TABLE IF EXISTS `DATA_REPLICA_METADATA`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `DATA_REPLICA_METADATA` (
-  `REPLICA_ID` varchar(255) NOT NULL,
-  `METADATA_KEY` varchar(255) NOT NULL,
-  `METADATA_VALUE` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`REPLICA_ID`,`METADATA_KEY`),
-  CONSTRAINT `data_replica_metadata_ibfk_1` FOREIGN KEY (`REPLICA_ID`) REFERENCES `DATA_REPLICA_LOCATION` (`REPLICA_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `DATA_REPLICA_METADATA`
---
-
-LOCK TABLES `DATA_REPLICA_METADATA` WRITE;
-/*!40000 ALTER TABLE `DATA_REPLICA_METADATA` DISABLE KEYS */;
-/*!40000 ALTER TABLE `DATA_REPLICA_METADATA` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Current Database: `sharing_catalog`
---
-
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `sharing_catalog` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci */;
-
-USE `sharing_catalog`;
-
---
--- Table structure for table `CONFIGURATION`
---
-
-DROP TABLE IF EXISTS `CONFIGURATION`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `CONFIGURATION` (
-  `CONFIG_KEY` varchar(255) NOT NULL,
-  `CONFIG_VALUE` varchar(255) NOT NULL,
-  PRIMARY KEY (`CONFIG_KEY`,`CONFIG_VALUE`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `CONFIGURATION`
---
-
-LOCK TABLES `CONFIGURATION` WRITE;
-/*!40000 ALTER TABLE `CONFIGURATION` DISABLE KEYS */;
-INSERT INTO `CONFIGURATION` VALUES ('sharing_reg_version','0.17');
-/*!40000 ALTER TABLE `CONFIGURATION` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `DOMAIN`
---
-
-DROP TABLE IF EXISTS `DOMAIN`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `DOMAIN` (
-  `DOMAIN_ID` varchar(255) NOT NULL,
-  `NAME` varchar(255) NOT NULL,
-  `DESCRIPTION` varchar(255) DEFAULT NULL,
-  `CREATED_TIME` bigint(20) NOT NULL,
-  `UPDATED_TIME` bigint(20) NOT NULL,
-  PRIMARY KEY (`DOMAIN_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `DOMAIN`
---
-
-LOCK TABLES `DOMAIN` WRITE;
-/*!40000 ALTER TABLE `DOMAIN` DISABLE KEYS */;
-INSERT INTO `DOMAIN` VALUES ('default','default','Domain entry for default',1551138011532,1551138011532);
-/*!40000 ALTER TABLE `DOMAIN` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `ENTITY`
---
-
-DROP TABLE IF EXISTS `ENTITY`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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) DEFAULT NULL,
-  `NAME` varchar(255) NOT NULL,
-  `DESCRIPTION` varchar(255) DEFAULT NULL,
-  `BINARY_DATA` blob,
-  `FULL_TEXT` text,
-  `SHARED_COUNT` bigint(20) DEFAULT '0',
-  `ORIGINAL_ENTITY_CREATION_TIME` bigint(20) NOT NULL,
-  `CREATED_TIME` bigint(20) NOT NULL,
-  `UPDATED_TIME` bigint(20) NOT NULL,
-  PRIMARY KEY (`ENTITY_ID`,`DOMAIN_ID`),
-  KEY `ENTITY_TYPE_ID` (`ENTITY_TYPE_ID`,`DOMAIN_ID`),
-  KEY `OWNER_ID` (`OWNER_ID`,`DOMAIN_ID`),
-  KEY `PARENT_ENTITY_ID` (`PARENT_ENTITY_ID`,`DOMAIN_ID`),
-  FULLTEXT KEY `FULL_TEXT_INDEX` (`FULL_TEXT`),
-  CONSTRAINT `entity_ibfk_1` FOREIGN KEY (`ENTITY_TYPE_ID`, `DOMAIN_ID`) REFERENCES `ENTITY_TYPE` (`ENTITY_TYPE_ID`, `DOMAIN_ID`) ON DELETE CASCADE ON UPDATE NO ACTION,
-  CONSTRAINT `entity_ibfk_2` FOREIGN KEY (`OWNER_ID`, `DOMAIN_ID`) REFERENCES `SHARING_USER` (`USER_ID`, `DOMAIN_ID`) ON DELETE CASCADE ON UPDATE NO ACTION,
-  CONSTRAINT `entity_ibfk_3` FOREIGN KEY (`PARENT_ENTITY_ID`, `DOMAIN_ID`) REFERENCES `ENTITY` (`ENTITY_ID`, `DOMAIN_ID`) ON DELETE CASCADE ON UPDATE NO ACTION
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `ENTITY`
---
-
-LOCK TABLES `ENTITY` WRITE;
-/*!40000 ALTER TABLE `ENTITY` DISABLE KEYS */;
-INSERT INTO `ENTITY` VALUES ('46a99a5a-8b55-4982-bfd7-90fe72b00d46','default','default:CREDENTIAL_TOKEN','default-admin@default',NULL,'46a99a5a-8b55-4982-bfd7-90fe72b00d46','Default',NULL,NULL,0,1551139607733,1551139607733,1551139607733),('af03c63d-a40e-4ed1-aee0-759a6ed0202c','default','default:GROUP_RESOURCE_PROFILE','default-admin@default',NULL,'Default-Group-Resource-Profile',NULL,NULL,NULL,3,1552318871908,1552318871908,1552318871908),('Clone_of_Clone_of_Echo_on_Mar_11,_2019_12:24_PM_9182a6b7-520d-4a8d-92e1-24463aae530b','default','default:EXPERIMENT','default-admin@default',NULL,'Clone of Clone of Echo on Mar 11, 2019 12:24 PM',NULL,NULL,NULL,3,1552323107891,1552323107891,1552323107891),('Clone_of_Echo_on_Mar_11,_2019_12:02_PM_32bd2154-9dd1-46c4-87c1-cd3925174f79','default','default:EXPERIMENT','default-admin@default',NULL,'Clone of Echo on Mar 11, 2019 12:02 PM',NULL,NULL,NULL,3,1552320576004,1552320576004,1552320576004),('Clone_of_Echo_on_Mar_11,_2019_12:24_PM_96170feb-9202-458f-8494-5fea6e5598dd','default','default:EXPERIMENT','default-admin@default',NULL,'Clone of Echo on Mar 11, 2019 12:24 PM',NULL,NULL,NULL,3,1552322784306,1552322784306,1552322784306),('Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc','default','default:PROJECT','default-admin@default',NULL,'Default Project','This is the default project for user default-admin',NULL,NULL,2,1551138405526,1551138405526,1551138405526),('echo2_190926b0-f389-4394-864e-0b2f0782692c','default','default:EXPERIMENT','default-admin@default','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc','echo2',' ',NULL,NULL,5,1551200818680,1551200818680,1551200818680),('Echo2_56e5b34d-5ce1-47db-9723-29244d41da32','default','default:EXPERIMENT','default-admin@default','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc','Echo2',' ',NULL,NULL,5,1551195758420,1551195758420,1551195758420),('Echo_on_Mar_11,_2019_11:47_AM_40ff0d5e-5053-43f7-8f80-faa53f623ca9','default','default:EXPERIMENT','default-admin@default','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc','Echo on Mar 11, 2019 11:47 AM',NULL,NULL,NULL,3,1552319249121,1552319249121,1552319249121),('Echo_on_Mar_11,_2019_11:59_AM_d17b5f17-f9d3-442a-82d2-b386c3a9eb6f','default','default:EXPERIMENT','default-admin@default','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc','Echo on Mar 11, 2019 11:59 AM',NULL,NULL,NULL,3,1552319973634,1552319973634,1552319973634),('Echo_on_Mar_11,_2019_12:02_PM_d7d67775-e7f6-4255-9c05-764b29ac9e3e','default','default:EXPERIMENT','default-admin@default','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc','Echo on Mar 11, 2019 12:02 PM',NULL,NULL,NULL,3,1552320158357,1552320158357,1552320158357),('Echo_on_Mar_11,_2019_12:11_PM_f2576ab2-c3af-47e9-8fe2-099802ba25c1','default','default:EXPERIMENT','default-admin@default','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc','Echo on Mar 11, 2019 12:11 PM',NULL,NULL,NULL,3,1552320714168,1552320714168,1552320714168),('Echo_on_Mar_11,_2019_12:24_PM_e78780cb-35a5-467b-baea-e9df5f498387','default','default:EXPERIMENT','default-admin@default','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc','Echo on Mar 11, 2019 12:24 PM',NULL,NULL,NULL,3,1552321490571,1552321490571,1552321490571),('js-156-93.jetstream-cloud.org_Echo_88202f35-beef-414a-84a4-6ee9dd4f5a84','default','default:APPLICATION_DEPLOYMENT','default-admin@default',NULL,'js-156-93.jetstream-cloud.org_Echo_88202f35-beef-414a-84a4-6ee9dd4f5a84','',NULL,NULL,3,1551195720578,1551195720578,1551195720578);
-/*!40000 ALTER TABLE `ENTITY` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `ENTITY_TYPE`
---
-
-DROP TABLE IF EXISTS `ENTITY_TYPE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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) DEFAULT NULL,
-  `CREATED_TIME` bigint(20) NOT NULL,
-  `UPDATED_TIME` bigint(20) NOT NULL,
-  PRIMARY KEY (`ENTITY_TYPE_ID`,`DOMAIN_ID`),
-  KEY `DOMAIN_ID` (`DOMAIN_ID`),
-  CONSTRAINT `entity_type_ibfk_1` FOREIGN KEY (`DOMAIN_ID`) REFERENCES `DOMAIN` (`DOMAIN_ID`) ON DELETE CASCADE ON UPDATE NO ACTION
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `ENTITY_TYPE`
---
-
-LOCK TABLES `ENTITY_TYPE` WRITE;
-/*!40000 ALTER TABLE `ENTITY_TYPE` DISABLE KEYS */;
-INSERT INTO `ENTITY_TYPE` VALUES ('default:APPLICATION_DEPLOYMENT','default','APPLICATION-DEPLOYMENT','Application Deployment entity type',1551138011706,1551138011706),('default:CREDENTIAL_TOKEN','default','CREDENTIAL_TOKEN','Credential Store Token entity type',1551138011735,1551138011735),('default:EXPERIMENT','default','EXPERIMENT','Experiment entity type',1551138011685,1551138011685),('default:FILE','default','FILE','File entity type',1551138011696,1551138011696),('default:GROUP_RESOURCE_PROFILE','default','GROUP_RESOURCE_PROFILE','Group Resource Profile entity type',1551138011716,1551138011716),('default:PROJECT','default','PROJECT','Project entity type',1551138011665,1551138011665);
-/*!40000 ALTER TABLE `ENTITY_TYPE` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `GROUP_ADMIN`
---
-
-DROP TABLE IF EXISTS `GROUP_ADMIN`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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`),
-  KEY `ADMIN_ID` (`ADMIN_ID`,`DOMAIN_ID`),
-  CONSTRAINT `group_admin_ibfk_1` FOREIGN KEY (`ADMIN_ID`, `DOMAIN_ID`) REFERENCES `SHARING_USER` (`USER_ID`, `DOMAIN_ID`) ON DELETE CASCADE ON UPDATE NO ACTION
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `GROUP_ADMIN`
---
-
-LOCK TABLES `GROUP_ADMIN` WRITE;
-/*!40000 ALTER TABLE `GROUP_ADMIN` DISABLE KEYS */;
-/*!40000 ALTER TABLE `GROUP_ADMIN` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `GROUP_MEMBERSHIP`
---
-
-DROP TABLE IF EXISTS `GROUP_MEMBERSHIP`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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(20) NOT NULL,
-  `UPDATED_TIME` bigint(20) NOT NULL,
-  PRIMARY KEY (`PARENT_ID`,`CHILD_ID`,`DOMAIN_ID`),
-  KEY `PARENT_ID` (`PARENT_ID`,`DOMAIN_ID`),
-  KEY `CHILD_ID` (`CHILD_ID`,`DOMAIN_ID`),
-  CONSTRAINT `group_membership_ibfk_1` FOREIGN KEY (`PARENT_ID`, `DOMAIN_ID`) REFERENCES `USER_GROUP` (`GROUP_ID`, `DOMAIN_ID`) ON DELETE CASCADE ON UPDATE NO ACTION,
-  CONSTRAINT `group_membership_ibfk_2` FOREIGN KEY (`CHILD_ID`, `DOMAIN_ID`) REFERENCES `USER_GROUP` (`GROUP_ID`, `DOMAIN_ID`) ON DELETE CASCADE ON UPDATE NO ACTION
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `GROUP_MEMBERSHIP`
---
-
-LOCK TABLES `GROUP_MEMBERSHIP` WRITE;
-/*!40000 ALTER TABLE `GROUP_MEMBERSHIP` DISABLE KEYS */;
-INSERT INTO `GROUP_MEMBERSHIP` VALUES ('Admin_Users_ba3e4af7-9b1d-4f46-b43a-2b44790f6868','default-admin@default','default','USER',1551138405079,1551138405079),('Gateway_Users_2e4e6eb4-05ad-4a0f-92d1-02aa26c56004','default-admin@default','default','USER',1551138405029,1551138405029),('Read_Only_Admin_Users_68f97cb6-9d9a-4a41-a15e-1db24ec087b3','default-admin@default','default','USER',1551138405107,1551138405107);
-/*!40000 ALTER TABLE `GROUP_MEMBERSHIP` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `PERMISSION_TYPE`
---
-
-DROP TABLE IF EXISTS `PERMISSION_TYPE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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) DEFAULT NULL,
-  `CREATED_TIME` bigint(20) NOT NULL,
-  `UPDATED_TIME` bigint(20) NOT NULL,
-  PRIMARY KEY (`PERMISSION_TYPE_ID`,`DOMAIN_ID`),
-  KEY `DOMAIN_ID` (`DOMAIN_ID`),
-  CONSTRAINT `permission_type_ibfk_1` FOREIGN KEY (`DOMAIN_ID`) REFERENCES `DOMAIN` (`DOMAIN_ID`) ON DELETE CASCADE ON UPDATE NO ACTION
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `PERMISSION_TYPE`
---
-
-LOCK TABLES `PERMISSION_TYPE` WRITE;
-/*!40000 ALTER TABLE `PERMISSION_TYPE` DISABLE KEYS */;
-INSERT INTO `PERMISSION_TYPE` VALUES ('default:OWNER','default','OWNER','GLOBAL permission to default',1551138011561,1551138011561),('default:READ','default','READ','Read permission type',1551138011783,1551138011783),('default:WRITE','default','WRITE','Write permission type',1551138011808,1551138011808),('default:MANAGE_SHARING','default','MANAGE_SHARING','Sharing permission type',1551138011853,1551138011853);
-/*!40000 ALTER TABLE `PERMISSION_TYPE` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `SHARING`
---
-
-DROP TABLE IF EXISTS `SHARING`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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) NOT NULL,
-  `CREATED_TIME` bigint(20) NOT NULL,
-  `UPDATED_TIME` bigint(20) NOT NULL,
-  PRIMARY KEY (`PERMISSION_TYPE_ID`,`ENTITY_ID`,`GROUP_ID`,`DOMAIN_ID`,`INHERITED_PARENT_ID`),
-  KEY `SHARING_PERMISSION_TYPE_ID_DOMAIN_ID_FK` (`PERMISSION_TYPE_ID`,`DOMAIN_ID`),
-  KEY `SHARING_ENTITY_ID_DOMAIN_ID_FK` (`ENTITY_ID`,`DOMAIN_ID`),
-  KEY `SHARING_INHERITED_PARENT_ID_DOMAIN_ID_FK` (`INHERITED_PARENT_ID`,`DOMAIN_ID`),
-  KEY `SHARING_GROUP_ID_DOMAIN_ID_FK` (`GROUP_ID`,`DOMAIN_ID`),
-  CONSTRAINT `SHARING_ENTITY_ID_DOMAIN_ID_FK` FOREIGN KEY (`ENTITY_ID`, `DOMAIN_ID`) REFERENCES `ENTITY` (`ENTITY_ID`, `DOMAIN_ID`) ON DELETE CASCADE ON UPDATE NO ACTION,
-  CONSTRAINT `SHARING_GROUP_ID_DOMAIN_ID_FK` FOREIGN KEY (`GROUP_ID`, `DOMAIN_ID`) REFERENCES `USER_GROUP` (`GROUP_ID`, `DOMAIN_ID`) ON DELETE CASCADE ON UPDATE NO ACTION,
-  CONSTRAINT `SHARING_INHERITED_PARENT_ID_DOMAIN_ID_FK` FOREIGN KEY (`INHERITED_PARENT_ID`, `DOMAIN_ID`) REFERENCES `ENTITY` (`ENTITY_ID`, `DOMAIN_ID`) ON DELETE CASCADE ON UPDATE NO ACTION,
-  CONSTRAINT `SHARING_PERMISSION_TYPE_ID_DOMAIN_ID_FK` FOREIGN KEY (`PERMISSION_TYPE_ID`, `DOMAIN_ID`) REFERENCES `PERMISSION_TYPE` (`PERMISSION_TYPE_ID`, `DOMAIN_ID`) ON DELETE CASCADE ON UPDATE NO ACTION
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `SHARING`
---
-
-LOCK TABLES `SHARING` WRITE;
-/*!40000 ALTER TABLE `SHARING` DISABLE KEYS */;
-INSERT INTO `SHARING` VALUES ('default:OWNER','46a99a5a-8b55-4982-bfd7-90fe72b00d46','default','default-admin@default','DIRECT_CASCADING','46a99a5a-8b55-4982-bfd7-90fe72b00d46',1551139607745,1551139607745),('default:OWNER','af03c63d-a40e-4ed1-aee0-759a6ed0202c','default','default-admin@default','DIRECT_CASCADING','af03c63d-a40e-4ed1-aee0-759a6ed0202c',1552318871935,1552318871935),('default:OWNER','Clone_of_Clone_of_Echo_on_Mar_11,_2019_12:24_PM_9182a6b7-520d-4a8d-92e1-24463aae530b','default','default-admin@default','DIRECT_CASCADING','Clone_of_Clone_of_Echo_on_Mar_11,_2019_12:24_PM_9182a6b7-520d-4a8d-92e1-24463aae530b',1552323107903,1552323107903),('default:OWNER','Clone_of_Echo_on_Mar_11,_2019_12:02_PM_32bd2154-9dd1-46c4-87c1-cd3925174f79','default','default-admin@default','DIRECT_CASCADING','Clone_of_Echo_on_Mar_11,_2019_12:02_PM_32bd2154-9dd1-46c4-87c1-cd3925174f79',1552320576016,1552320576016),('default:OWNER','Clone_of_Echo_on_Mar_11,_2019_12:24_PM_96170feb-9202-458f-8494-5fea6e5598dd','default','default-admin@default','DIRECT_CASCADING','Clone_of_Echo_on_Mar_11,_2019_12:24_PM_96170feb-9202-458f-8494-5fea6e5598dd',1552322784315,1552322784315),('default:OWNER','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc','default','default-admin@default','DIRECT_CASCADING','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc',1551138405554,1551138405554),('default:OWNER','echo2_190926b0-f389-4394-864e-0b2f0782692c','default','default-admin@default','INDIRECT_CASCADING','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc',1551200818759,1551200818759),('default:OWNER','echo2_190926b0-f389-4394-864e-0b2f0782692c','default','default-admin@default','DIRECT_CASCADING','echo2_190926b0-f389-4394-864e-0b2f0782692c',1551200818705,1551200818705),('default:OWNER','Echo2_56e5b34d-5ce1-47db-9723-29244d41da32','default','default-admin@default','INDIRECT_CASCADING','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc',1551195758468,1551195758468),('default:OWNER','Echo2_56e5b34d-5ce1-47db-9723-29244d41da32','default','default-admin@default','DIRECT_CASCADING','Echo2_56e5b34d-5ce1-47db-9723-29244d41da32',1551195758430,1551195758430),('default:OWNER','Echo_on_Mar_11,_2019_11:47_AM_40ff0d5e-5053-43f7-8f80-faa53f623ca9','default','default-admin@default','INDIRECT_CASCADING','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc',1552319249178,1552319249178),('default:OWNER','Echo_on_Mar_11,_2019_11:47_AM_40ff0d5e-5053-43f7-8f80-faa53f623ca9','default','default-admin@default','DIRECT_CASCADING','Echo_on_Mar_11,_2019_11:47_AM_40ff0d5e-5053-43f7-8f80-faa53f623ca9',1552319249136,1552319249136),('default:OWNER','Echo_on_Mar_11,_2019_11:59_AM_d17b5f17-f9d3-442a-82d2-b386c3a9eb6f','default','default-admin@default','INDIRECT_CASCADING','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc',1552319973685,1552319973685),('default:OWNER','Echo_on_Mar_11,_2019_11:59_AM_d17b5f17-f9d3-442a-82d2-b386c3a9eb6f','default','default-admin@default','DIRECT_CASCADING','Echo_on_Mar_11,_2019_11:59_AM_d17b5f17-f9d3-442a-82d2-b386c3a9eb6f',1552319973651,1552319973651),('default:OWNER','Echo_on_Mar_11,_2019_12:02_PM_d7d67775-e7f6-4255-9c05-764b29ac9e3e','default','default-admin@default','INDIRECT_CASCADING','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc',1552320158415,1552320158415),('default:OWNER','Echo_on_Mar_11,_2019_12:02_PM_d7d67775-e7f6-4255-9c05-764b29ac9e3e','default','default-admin@default','DIRECT_CASCADING','Echo_on_Mar_11,_2019_12:02_PM_d7d67775-e7f6-4255-9c05-764b29ac9e3e',1552320158375,1552320158375),('default:OWNER','Echo_on_Mar_11,_2019_12:11_PM_f2576ab2-c3af-47e9-8fe2-099802ba25c1','default','default-admin@default','INDIRECT_CASCADING','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc',1552320714215,1552320714215),('default:OWNER','Echo_on_Mar_11,_2019_12:11_PM_f2576ab2-c3af-47e9-8fe2-099802ba25c1','default','default-admin@default','DIRECT_CASCADING','Echo_on_Mar_11,_2019_12:11_PM_f2576ab2-c3af-47e9-8fe2-099802ba25c1',1552320714184,1552320714184),('default:OWNER','Echo_on_Mar_11,_2019_12:24_PM_e78780cb-35a5-467b-baea-e9df5f498387','default','default-admin@default','INDIRECT_CASCADING','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc',1552321490609,1552321490609),('default:OWNER','Echo_on_Mar_11,_2019_12:24_PM_e78780cb-35a5-467b-baea-e9df5f498387','default','default-admin@default','DIRECT_CASCADING','Echo_on_Mar_11,_2019_12:24_PM_e78780cb-35a5-467b-baea-e9df5f498387',1552321490586,1552321490586),('default:OWNER','js-156-93.jetstream-cloud.org_Echo_88202f35-beef-414a-84a4-6ee9dd4f5a84','default','default-admin@default','DIRECT_CASCADING','js-156-93.jetstream-cloud.org_Echo_88202f35-beef-414a-84a4-6ee9dd4f5a84',1551195720607,1551195720607),('default:READ','af03c63d-a40e-4ed1-aee0-759a6ed0202c','default','Admin_Users_ba3e4af7-9b1d-4f46-b43a-2b44790f6868','DIRECT_CASCADING','af03c63d-a40e-4ed1-aee0-759a6ed0202c',1552318872021,1552318872021),('default:READ','af03c63d-a40e-4ed1-aee0-759a6ed0202c','default','Read_Only_Admin_Users_68f97cb6-9d9a-4a41-a15e-1db24ec087b3','DIRECT_CASCADING','af03c63d-a40e-4ed1-aee0-759a6ed0202c',1552318872021,1552318872021),('default:READ','Clone_of_Clone_of_Echo_on_Mar_11,_2019_12:24_PM_9182a6b7-520d-4a8d-92e1-24463aae530b','default','Admin_Users_ba3e4af7-9b1d-4f46-b43a-2b44790f6868','DIRECT_CASCADING','Clone_of_Clone_of_Echo_on_Mar_11,_2019_12:24_PM_9182a6b7-520d-4a8d-92e1-24463aae530b',1552323107949,1552323107949),('default:READ','Clone_of_Clone_of_Echo_on_Mar_11,_2019_12:24_PM_9182a6b7-520d-4a8d-92e1-24463aae530b','default','Read_Only_Admin_Users_68f97cb6-9d9a-4a41-a15e-1db24ec087b3','DIRECT_CASCADING','Clone_of_Clone_of_Echo_on_Mar_11,_2019_12:24_PM_9182a6b7-520d-4a8d-92e1-24463aae530b',1552323107949,1552323107949),('default:READ','Clone_of_Echo_on_Mar_11,_2019_12:02_PM_32bd2154-9dd1-46c4-87c1-cd3925174f79','default','Admin_Users_ba3e4af7-9b1d-4f46-b43a-2b44790f6868','DIRECT_CASCADING','Clone_of_Echo_on_Mar_11,_2019_12:02_PM_32bd2154-9dd1-46c4-87c1-cd3925174f79',1552320576060,1552320576060),('default:READ','Clone_of_Echo_on_Mar_11,_2019_12:02_PM_32bd2154-9dd1-46c4-87c1-cd3925174f79','default','Read_Only_Admin_Users_68f97cb6-9d9a-4a41-a15e-1db24ec087b3','DIRECT_CASCADING','Clone_of_Echo_on_Mar_11,_2019_12:02_PM_32bd2154-9dd1-46c4-87c1-cd3925174f79',1552320576060,1552320576060),('default:READ','Clone_of_Echo_on_Mar_11,_2019_12:24_PM_96170feb-9202-458f-8494-5fea6e5598dd','default','Admin_Users_ba3e4af7-9b1d-4f46-b43a-2b44790f6868','DIRECT_CASCADING','Clone_of_Echo_on_Mar_11,_2019_12:24_PM_96170feb-9202-458f-8494-5fea6e5598dd',1552322784367,1552322784367),('default:READ','Clone_of_Echo_on_Mar_11,_2019_12:24_PM_96170feb-9202-458f-8494-5fea6e5598dd','default','Read_Only_Admin_Users_68f97cb6-9d9a-4a41-a15e-1db24ec087b3','DIRECT_CASCADING','Clone_of_Echo_on_Mar_11,_2019_12:24_PM_96170feb-9202-458f-8494-5fea6e5598dd',1552322784367,1552322784367),('default:READ','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc','default','default-admin@default','DIRECT_CASCADING','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc',1551138406052,1551138406052),('default:READ','echo2_190926b0-f389-4394-864e-0b2f0782692c','default','Admin_Users_ba3e4af7-9b1d-4f46-b43a-2b44790f6868','DIRECT_CASCADING','echo2_190926b0-f389-4394-864e-0b2f0782692c',1551200818860,1551200818860),('default:READ','echo2_190926b0-f389-4394-864e-0b2f0782692c','default','default-admin@default','INDIRECT_CASCADING','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc',1551200818736,1551200818736),('default:READ','echo2_190926b0-f389-4394-864e-0b2f0782692c','default','default-admin@default','DIRECT_CASCADING','echo2_190926b0-f389-4394-864e-0b2f0782692c',1551200819351,1551200819351),('default:READ','echo2_190926b0-f389-4394-864e-0b2f0782692c','default','Read_Only_Admin_Users_68f97cb6-9d9a-4a41-a15e-1db24ec087b3','DIRECT_CASCADING','echo2_190926b0-f389-4394-864e-0b2f0782692c',1551200818860,1551200818860),('default:READ','Echo2_56e5b34d-5ce1-47db-9723-29244d41da32','default','Admin_Users_ba3e4af7-9b1d-4f46-b43a-2b44790f6868','DIRECT_CASCADING','Echo2_56e5b34d-5ce1-47db-9723-29244d41da32',1551195758537,1551195758537),('default:READ','Echo2_56e5b34d-5ce1-47db-9723-29244d41da32','default','default-admin@default','INDIRECT_CASCADING','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc',1551195758452,1551195758452),('default:READ','Echo2_56e5b34d-5ce1-47db-9723-29244d41da32','default','default-admin@default','DIRECT_CASCADING','Echo2_56e5b34d-5ce1-47db-9723-29244d41da32',1551195759028,1551195759028),('default:READ','Echo2_56e5b34d-5ce1-47db-9723-29244d41da32','default','Read_Only_Admin_Users_68f97cb6-9d9a-4a41-a15e-1db24ec087b3','DIRECT_CASCADING','Echo2_56e5b34d-5ce1-47db-9723-29244d41da32',1551195758537,1551195758537),('default:READ','Echo_on_Mar_11,_2019_11:47_AM_40ff0d5e-5053-43f7-8f80-faa53f623ca9','default','Admin_Users_ba3e4af7-9b1d-4f46-b43a-2b44790f6868','DIRECT_CASCADING','Echo_on_Mar_11,_2019_11:47_AM_40ff0d5e-5053-43f7-8f80-faa53f623ca9',1552319249231,1552319249231),('default:READ','Echo_on_Mar_11,_2019_11:47_AM_40ff0d5e-5053-43f7-8f80-faa53f623ca9','default','default-admin@default','INDIRECT_CASCADING','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc',1552319249161,1552319249161),('default:READ','Echo_on_Mar_11,_2019_11:47_AM_40ff0d5e-5053-43f7-8f80-faa53f623ca9','default','Read_Only_Admin_Users_68f97cb6-9d9a-4a41-a15e-1db24ec087b3','DIRECT_CASCADING','Echo_on_Mar_11,_2019_11:47_AM_40ff0d5e-5053-43f7-8f80-faa53f623ca9',1552319249231,1552319249231),('default:READ','Echo_on_Mar_11,_2019_11:59_AM_d17b5f17-f9d3-442a-82d2-b386c3a9eb6f','default','Admin_Users_ba3e4af7-9b1d-4f46-b43a-2b44790f6868','DIRECT_CASCADING','Echo_on_Mar_11,_2019_11:59_AM_d17b5f17-f9d3-442a-82d2-b386c3a9eb6f',1552319973762,1552319973762),('default:READ','Echo_on_Mar_11,_2019_11:59_AM_d17b5f17-f9d3-442a-82d2-b386c3a9eb6f','default','default-admin@default','INDIRECT_CASCADING','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc',1552319973669,1552319973669),('default:READ','Echo_on_Mar_11,_2019_11:59_AM_d17b5f17-f9d3-442a-82d2-b386c3a9eb6f','default','Read_Only_Admin_Users_68f97cb6-9d9a-4a41-a15e-1db24ec087b3','DIRECT_CASCADING','Echo_on_Mar_11,_2019_11:59_AM_d17b5f17-f9d3-442a-82d2-b386c3a9eb6f',1552319973762,1552319973762),('default:READ','Echo_on_Mar_11,_2019_12:02_PM_d7d67775-e7f6-4255-9c05-764b29ac9e3e','default','Admin_Users_ba3e4af7-9b1d-4f46-b43a-2b44790f6868','DIRECT_CASCADING','Echo_on_Mar_11,_2019_12:02_PM_d7d67775-e7f6-4255-9c05-764b29ac9e3e',1552320158500,1552320158500),('default:READ','Echo_on_Mar_11,_2019_12:02_PM_d7d67775-e7f6-4255-9c05-764b29ac9e3e','default','default-admin@default','INDIRECT_CASCADING','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc',1552320158395,1552320158395),('default:READ','Echo_on_Mar_11,_2019_12:02_PM_d7d67775-e7f6-4255-9c05-764b29ac9e3e','default','Read_Only_Admin_Users_68f97cb6-9d9a-4a41-a15e-1db24ec087b3','DIRECT_CASCADING','Echo_on_Mar_11,_2019_12:02_PM_d7d67775-e7f6-4255-9c05-764b29ac9e3e',1552320158500,1552320158500),('default:READ','Echo_on_Mar_11,_2019_12:11_PM_f2576ab2-c3af-47e9-8fe2-099802ba25c1','default','Admin_Users_ba3e4af7-9b1d-4f46-b43a-2b44790f6868','DIRECT_CASCADING','Echo_on_Mar_11,_2019_12:11_PM_f2576ab2-c3af-47e9-8fe2-099802ba25c1',1552320714263,1552320714263),('default:READ','Echo_on_Mar_11,_2019_12:11_PM_f2576ab2-c3af-47e9-8fe2-099802ba25c1','default','default-admin@default','INDIRECT_CASCADING','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc',1552320714198,1552320714198),('default:READ','Echo_on_Mar_11,_2019_12:11_PM_f2576ab2-c3af-47e9-8fe2-099802ba25c1','default','Read_Only_Admin_Users_68f97cb6-9d9a-4a41-a15e-1db24ec087b3','DIRECT_CASCADING','Echo_on_Mar_11,_2019_12:11_PM_f2576ab2-c3af-47e9-8fe2-099802ba25c1',1552320714263,1552320714263),('default:READ','Echo_on_Mar_11,_2019_12:24_PM_e78780cb-35a5-467b-baea-e9df5f498387','default','Admin_Users_ba3e4af7-9b1d-4f46-b43a-2b44790f6868','DIRECT_CASCADING','Echo_on_Mar_11,_2019_12:24_PM_e78780cb-35a5-467b-baea-e9df5f498387',1552321490657,1552321490657),('default:READ','Echo_on_Mar_11,_2019_12:24_PM_e78780cb-35a5-467b-baea-e9df5f498387','default','default-admin@default','INDIRECT_CASCADING','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc',1552321490595,1552321490595),('default:READ','Echo_on_Mar_11,_2019_12:24_PM_e78780cb-35a5-467b-baea-e9df5f498387','default','Read_Only_Admin_Users_68f97cb6-9d9a-4a41-a15e-1db24ec087b3','DIRECT_CASCADING','Echo_on_Mar_11,_2019_12:24_PM_e78780cb-35a5-467b-baea-e9df5f498387',1552321490657,1552321490657),('default:READ','js-156-93.jetstream-cloud.org_Echo_88202f35-beef-414a-84a4-6ee9dd4f5a84','default','Admin_Users_ba3e4af7-9b1d-4f46-b43a-2b44790f6868','DIRECT_CASCADING','js-156-93.jetstream-cloud.org_Echo_88202f35-beef-414a-84a4-6ee9dd4f5a84',1551195720704,1551195720704),('default:READ','js-156-93.jetstream-cloud.org_Echo_88202f35-beef-414a-84a4-6ee9dd4f5a84','default','Read_Only_Admin_Users_68f97cb6-9d9a-4a41-a15e-1db24ec087b3','DIRECT_CASCADING','js-156-93.jetstream-cloud.org_Echo_88202f35-beef-414a-84a4-6ee9dd4f5a84',1551195720704,1551195720704),('default:WRITE','af03c63d-a40e-4ed1-aee0-759a6ed0202c','default','Admin_Users_ba3e4af7-9b1d-4f46-b43a-2b44790f6868','DIRECT_CASCADING','af03c63d-a40e-4ed1-aee0-759a6ed0202c',1552318871972,1552318871972),('default:WRITE','Clone_of_Clone_of_Echo_on_Mar_11,_2019_12:24_PM_9182a6b7-520d-4a8d-92e1-24463aae530b','default','Admin_Users_ba3e4af7-9b1d-4f46-b43a-2b44790f6868','DIRECT_CASCADING','Clone_of_Clone_of_Echo_on_Mar_11,_2019_12:24_PM_9182a6b7-520d-4a8d-92e1-24463aae530b',1552323107921,1552323107921),('default:WRITE','Clone_of_Echo_on_Mar_11,_2019_12:02_PM_32bd2154-9dd1-46c4-87c1-cd3925174f79','default','Admin_Users_ba3e4af7-9b1d-4f46-b43a-2b44790f6868','DIRECT_CASCADING','Clone_of_Echo_on_Mar_11,_2019_12:02_PM_32bd2154-9dd1-46c4-87c1-cd3925174f79',1552320576035,1552320576035),('default:WRITE','Clone_of_Echo_on_Mar_11,_2019_12:24_PM_96170feb-9202-458f-8494-5fea6e5598dd','default','Admin_Users_ba3e4af7-9b1d-4f46-b43a-2b44790f6868','DIRECT_CASCADING','Clone_of_Echo_on_Mar_11,_2019_12:24_PM_96170feb-9202-458f-8494-5fea6e5598dd',1552322784331,1552322784331),('default:WRITE','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc','default','default-admin@default','DIRECT_CASCADING','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc',1551138405837,1551138405837),('default:WRITE','echo2_190926b0-f389-4394-864e-0b2f0782692c','default','Admin_Users_ba3e4af7-9b1d-4f46-b43a-2b44790f6868','DIRECT_CASCADING','echo2_190926b0-f389-4394-864e-0b2f0782692c',1551200818802,1551200818802),('default:WRITE','echo2_190926b0-f389-4394-864e-0b2f0782692c','default','default-admin@default','INDIRECT_CASCADING','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc',1551200818748,1551200818748),('default:WRITE','echo2_190926b0-f389-4394-864e-0b2f0782692c','default','default-admin@default','DIRECT_CASCADING','echo2_190926b0-f389-4394-864e-0b2f0782692c',1551200819185,1551200819185),('default:WRITE','Echo2_56e5b34d-5ce1-47db-9723-29244d41da32','default','Admin_Users_ba3e4af7-9b1d-4f46-b43a-2b44790f6868','DIRECT_CASCADING','Echo2_56e5b34d-5ce1-47db-9723-29244d41da32',1551195758494,1551195758494),('default:WRITE','Echo2_56e5b34d-5ce1-47db-9723-29244d41da32','default','default-admin@default','INDIRECT_CASCADING','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc',1551195758461,1551195758461),('default:WRITE','Echo2_56e5b34d-5ce1-47db-9723-29244d41da32','default','default-admin@default','DIRECT_CASCADING','Echo2_56e5b34d-5ce1-47db-9723-29244d41da32',1551195758871,1551195758871),('default:WRITE','Echo_on_Mar_11,_2019_11:47_AM_40ff0d5e-5053-43f7-8f80-faa53f623ca9','default','Admin_Users_ba3e4af7-9b1d-4f46-b43a-2b44790f6868','DIRECT_CASCADING','Echo_on_Mar_11,_2019_11:47_AM_40ff0d5e-5053-43f7-8f80-faa53f623ca9',1552319249200,1552319249200),('default:WRITE','Echo_on_Mar_11,_2019_11:47_AM_40ff0d5e-5053-43f7-8f80-faa53f623ca9','default','default-admin@default','INDIRECT_CASCADING','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc',1552319249169,1552319249169),('default:WRITE','Echo_on_Mar_11,_2019_11:59_AM_d17b5f17-f9d3-442a-82d2-b386c3a9eb6f','default','Admin_Users_ba3e4af7-9b1d-4f46-b43a-2b44790f6868','DIRECT_CASCADING','Echo_on_Mar_11,_2019_11:59_AM_d17b5f17-f9d3-442a-82d2-b386c3a9eb6f',1552319973716,1552319973716),('default:WRITE','Echo_on_Mar_11,_2019_11:59_AM_d17b5f17-f9d3-442a-82d2-b386c3a9eb6f','default','default-admin@default','INDIRECT_CASCADING','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc',1552319973676,1552319973676),('default:WRITE','Echo_on_Mar_11,_2019_12:02_PM_d7d67775-e7f6-4255-9c05-764b29ac9e3e','default','Admin_Users_ba3e4af7-9b1d-4f46-b43a-2b44790f6868','DIRECT_CASCADING','Echo_on_Mar_11,_2019_12:02_PM_d7d67775-e7f6-4255-9c05-764b29ac9e3e',1552320158451,1552320158451),('default:WRITE','Echo_on_Mar_11,_2019_12:02_PM_d7d67775-e7f6-4255-9c05-764b29ac9e3e','default','default-admin@default','INDIRECT_CASCADING','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc',1552320158405,1552320158405),('default:WRITE','Echo_on_Mar_11,_2019_12:11_PM_f2576ab2-c3af-47e9-8fe2-099802ba25c1','default','Admin_Users_ba3e4af7-9b1d-4f46-b43a-2b44790f6868','DIRECT_CASCADING','Echo_on_Mar_11,_2019_12:11_PM_f2576ab2-c3af-47e9-8fe2-099802ba25c1',1552320714233,1552320714233),('default:WRITE','Echo_on_Mar_11,_2019_12:11_PM_f2576ab2-c3af-47e9-8fe2-099802ba25c1','default','default-admin@default','INDIRECT_CASCADING','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc',1552320714207,1552320714207),('default:WRITE','Echo_on_Mar_11,_2019_12:24_PM_e78780cb-35a5-467b-baea-e9df5f498387','default','Admin_Users_ba3e4af7-9b1d-4f46-b43a-2b44790f6868','DIRECT_CASCADING','Echo_on_Mar_11,_2019_12:24_PM_e78780cb-35a5-467b-baea-e9df5f498387',1552321490625,1552321490625),('default:WRITE','Echo_on_Mar_11,_2019_12:24_PM_e78780cb-35a5-467b-baea-e9df5f498387','default','default-admin@default','INDIRECT_CASCADING','Default_Project_93d9a30a-4299-44dd-9e48-a7b8961464dc',1552321490602,1552321490602),('default:WRITE','js-156-93.jetstream-cloud.org_Echo_88202f35-beef-414a-84a4-6ee9dd4f5a84','default','Admin_Users_ba3e4af7-9b1d-4f46-b43a-2b44790f6868','DIRECT_CASCADING','js-156-93.jetstream-cloud.org_Echo_88202f35-beef-414a-84a4-6ee9dd4f5a84',1551195720648,1551195720648);
-/*!40000 ALTER TABLE `SHARING` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `SHARING_USER`
---
-
-DROP TABLE IF EXISTS `SHARING_USER`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-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) DEFAULT NULL,
-  `LAST_NAME` varchar(255) DEFAULT NULL,
-  `EMAIL` varchar(255) DEFAULT NULL,
-  `ICON` blob,
-  `CREATED_TIME` bigint(20) NOT NULL,
-  `UPDATED_TIME` bigint(20) NOT NULL,
-  PRIMARY KEY (`USER_ID`,`DOMAIN_ID`),
-  KEY `DOMAIN_ID` (`DOMAIN_ID`),
-  CONSTRAINT `sharing_user_ibfk_1` FOREIGN KEY (`DOMAIN_ID`) REFERENCES `DOMAIN` (`DOMAIN_ID`) ON DELETE CASCADE ON UPDATE NO ACTION
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `SHARING_USER`
---
-
-LOCK TABLES `SHARING_USER` WRITE;
-/*!40000 ALTER TABLE `SHARING_USER` DISABLE KEYS */;
-INSERT INTO `SHARING_USER` VALUES ('default-admin@default','default','dim Upe',NULL,NULL,'dimuthu.upeksha2@gmail.com',NULL,1551138011603,1551138404868);
-/*!40000 ALTER TABLE `SHARING_USER` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `USER_GROUP`
---
-
-DROP TABLE IF EXISTS `USER_GROUP`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `USER_GROUP` (
-  `GROUP_ID` varchar(255) NOT NULL,
-  `DOMAIN_ID` varchar(255) NOT NULL,
-  `NAME` varchar(255) NOT NULL,
-  `DESCRIPTION` varchar(255) DEFAULT NULL,
-  `OWNER_ID` varchar(255) NOT NULL,
-  `GROUP_TYPE` varchar(255) NOT NULL,
-  `GROUP_CARDINALITY` varchar(255) NOT NULL,
-  `CREATED_TIME` bigint(20) NOT NULL,
-  `UPDATED_TIME` bigint(20) NOT NULL,
-  PRIMARY KEY (`GROUP_ID`,`DOMAIN_ID`),
-  KEY `OWNER_ID` (`OWNER_ID`,`DOMAIN_ID`),
-  CONSTRAINT `user_group_ibfk_1` FOREIGN KEY (`OWNER_ID`, `DOMAIN_ID`) REFERENCES `SHARING_USER` (`USER_ID`, `DOMAIN_ID`) ON DELETE CASCADE ON UPDATE NO ACTION
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `USER_GROUP`
---
-
-LOCK TABLES `USER_GROUP` WRITE;
-/*!40000 ALTER TABLE `USER_GROUP` DISABLE KEYS */;
-INSERT INTO `USER_GROUP` VALUES ('Admin_Users_ba3e4af7-9b1d-4f46-b43a-2b44790f6868','default','Admin Users','Admin users group.','default-admin@default','DOMAIN_LEVEL_GROUP','MULTI_USER',1551138405064,1551138405064),('default-admin@default','default','dim Upe','user dim Upe group','default-admin@default','USER_LEVEL_GROUP','SINGLE_USER',0,1551138404890),('Gateway_Users_2e4e6eb4-05ad-4a0f-92d1-02aa26c56004','default','Gateway Users','Default group for users of the gateway.','default-admin@default','DOMAIN_LEVEL_GROUP','MULTI_USER',1551138405011,1551138405011),('Read_Only_Admin_Users_68f97cb6-9d9a-4a41-a15e-1db24ec087b3','default','Read Only Admin Users','Group of admin users with read-only access.','default-admin@default','DOMAIN_LEVEL_GROUP','MULTI_USER',1551138405099,1551138405099);
-/*!40000 ALTER TABLE `USER_GROUP` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Current Database: `workflow_catalog`
---
-
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `workflow_catalog` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci */;
-
-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`
---
-
-USE `app_catalog`;
-
---
--- Current Database: `credential_store`
---
-
-USE `credential_store`;
-
---
--- Current Database: `experiment_catalog`
---
-
-USE `experiment_catalog`;
-
---
--- Final view structure for view `experiment_summary`
---
-
-/*!50001 DROP VIEW IF EXISTS `experiment_summary`*/;
-/*!50001 SET @saved_cs_client          = @@character_set_client */;
-/*!50001 SET @saved_cs_results         = @@character_set_results */;
-/*!50001 SET @saved_col_connection     = @@collation_connection */;
-/*!50001 SET character_set_client      = utf8mb4 */;
-/*!50001 SET character_set_results     = utf8mb4 */;
-/*!50001 SET collation_connection      = utf8mb4_unicode_ci */;
-/*!50001 CREATE ALGORITHM=UNDEFINED */
-/*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 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 1 */;
-/*!50001 SET character_set_client      = @saved_cs_client */;
-/*!50001 SET character_set_results     = @saved_cs_results */;
-/*!50001 SET collation_connection      = @saved_col_connection */;
-
---
--- Final view structure for view `latest_experiment_status`
---
-
-/*!50001 DROP VIEW IF EXISTS `latest_experiment_status`*/;
-/*!50001 SET @saved_cs_client          = @@character_set_client */;
-/*!50001 SET @saved_cs_results         = @@character_set_results */;
-/*!50001 SET @saved_col_connection     = @@collation_connection */;
-/*!50001 SET character_set_client      = utf8mb4 */;
-/*!50001 SET character_set_results     = utf8mb4 */;
-/*!50001 SET collation_connection      = utf8mb4_unicode_ci */;
-/*!50001 CREATE ALGORITHM=UNDEFINED */
-/*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
-/*!50001 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 isnull(`ES2`.`TIME_OF_STATE_CHANGE`) */;
-/*!50001 SET character_set_client      = @saved_cs_client */;
-/*!50001 SET character_set_results     = @saved_cs_results */;
-/*!50001 SET collation_connection      = @saved_col_connection */;
-
---
--- Current Database: `profile_service`
---
-
-USE `profile_service`;
-
---
--- Current Database: `replica_catalog`
---
-
-USE `replica_catalog`;
-
---
--- Current Database: `sharing_catalog`
---
-
-USE `sharing_catalog`;
-
---
--- Current Database: `workflow_catalog`
---
-
-USE `workflow_catalog`;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2019-03-11 19:13:25
diff --git a/.devcontainer/database_scripts/init/02-sharing-registry-migrations.sql b/.devcontainer/database_scripts/init/02-sharing-registry-migrations.sql
deleted file mode 100644
index 9b5733b8b09..00000000000
--- a/.devcontainer/database_scripts/init/02-sharing-registry-migrations.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-use sharing_catalog;
-
-ALTER TABLE DOMAIN ADD COLUMN IF NOT EXISTS INITIAL_USER_GROUP_ID varchar(255);
-ALTER TABLE DOMAIN ADD CONSTRAINT `DOMAIN_INITIAL_USER_GROUP_ID_FK` FOREIGN KEY IF NOT EXISTS (INITIAL_USER_GROUP_ID, DOMAIN_ID) REFERENCES USER_GROUP(GROUP_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION;
diff --git a/.devcontainer/database_scripts/init/03-appcatalog-migrations.sql b/.devcontainer/database_scripts/init/03-appcatalog-migrations.sql
deleted file mode 100644
index e7ef4a55c85..00000000000
--- a/.devcontainer/database_scripts/init/03-appcatalog-migrations.sql
+++ /dev/null
@@ -1,22 +0,0 @@
-use app_catalog;
-
-ALTER TABLE APPLICATION_INPUT ADD COLUMN IF NOT EXISTS OVERRIDE_FILENAME VARCHAR(255);
--- AIRAVATA-3126
-CREATE TABLE IF NOT EXISTS 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)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-CREATE TABLE IF NOT EXISTS COMPUTE_RESOURCE_RESERVATION_QUEUE (RESERVATION_ID VARCHAR(255), QUEUE_NAME VARCHAR(255) NOT NULL
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-CREATE INDEX IF NOT EXISTS I_CMPTN_Q_RESERVATION_ID ON COMPUTE_RESOURCE_RESERVATION_QUEUE (RESERVATION_ID);
-ALTER TABLE COMPUTE_RESOURCE_RESERVATION ADD CONSTRAINT FK_COMPUTE_RESOURCE_RESERVATION FOREIGN KEY IF NOT EXISTS (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID) REFERENCES GROUP_COMPUTE_RESOURCE_PREFERENCE (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID) ON DELETE CASCADE;
-
--- AIRAVATA-3327: Remove deprecated reservation fields
---alter table GROUP_COMPUTE_RESOURCE_PREFERENCE drop column IF EXISTS RESERVATION;
---alter table GROUP_COMPUTE_RESOURCE_PREFERENCE drop column IF EXISTS RESERVATION_START_TIME;
---alter table GROUP_COMPUTE_RESOURCE_PREFERENCE drop column IF EXISTS RESERVATION_END_TIME;
-
--- AIRAVATA-3369: Convert USER_FRIENDLY_DESC from VARCHAR to TEXT (CLOB)
-alter table APPLICATION_INPUT modify column USER_FRIENDLY_DESC TEXT;
-
--- Add cleanAfterStaged flag to APPLICATION_INTERFACE
-ALTER TABLE APPLICATION_INTERFACE ADD COLUMN IF NOT EXISTS CLEAN_AFTER_STAGED SMALLINT DEFAULT 0;
diff --git a/.devcontainer/database_scripts/init/04-expcatalog-migrations.sql b/.devcontainer/database_scripts/init/04-expcatalog-migrations.sql
deleted file mode 100644
index bb32d3f438d..00000000000
--- a/.devcontainer/database_scripts/init/04-expcatalog-migrations.sql
+++ /dev/null
@@ -1,54 +0,0 @@
-use experiment_catalog;
-
-ALTER TABLE EXPERIMENT_INPUT ADD COLUMN IF NOT EXISTS OVERRIDE_FILENAME VARCHAR(255);
-ALTER TABLE PROCESS_INPUT ADD COLUMN IF NOT EXISTS OVERRIDE_FILENAME VARCHAR(255);
-
-CREATE TABLE IF NOT EXISTS GATEWAY_USAGE_REPORTING_COMMAND (
-  GATEWAY_ID VARCHAR(255) NOT NULL,
-  COMPUTE_RESOURCE_ID VARCHAR(255) NOT NULL,
-  COMMAND LONGTEXT NOT NULL,
-  PRIMARY KEY (GATEWAY_ID, COMPUTE_RESOURCE_ID)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
--- AIRAVATA-3369: Convert USER_FRIENDLY_DESCRIPTION from VARCHAR to TEXT (CLOB)
-alter table EXPERIMENT_INPUT modify column USER_FRIENDLY_DESCRIPTION TEXT;
-alter table PROCESS_INPUT modify column USER_FRIENDLY_DESCRIPTION TEXT;
-
-CREATE TABLE IF NOT EXISTS 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,
-       STATIC_WORKING_DIR varchar(255),
-       OVERRIDE_LOGIN_USER_NAME varchar(255),
-       OVERRIDE_SCRATCH_LOCATION varchar(255),
-       OVERRIDE_ALLOCATION_PROJECT_NUMBER varchar(255),
-       PARALLEL_GROUP_COUNT INT,
-       PRIMARY KEY (EXPERIMENT_ID,RESOURCE_HOST_ID,QUEUE_NAME),
-       FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
--- Rename storage resource ID to input storage resource ID
-ALTER TABLE USER_CONFIGURATION_DATA CHANGE COLUMN STORAGE_RESOURCE_ID INPUT_STORAGE_RESOURCE_ID VARCHAR(255) DEFAULT NULL;
-ALTER TABLE PROCESS CHANGE COLUMN STORAGE_RESOURCE_ID INPUT_STORAGE_RESOURCE_ID VARCHAR(255) DEFAULT NULL;
-
--- Add output storage resource ID columns
-ALTER TABLE USER_CONFIGURATION_DATA ADD COLUMN IF NOT EXISTS OUTPUT_STORAGE_RESOURCE_ID VARCHAR(255) DEFAULT NULL;
-ALTER TABLE PROCESS ADD COLUMN IF NOT EXISTS OUTPUT_STORAGE_RESOURCE_ID VARCHAR(255) DEFAULT NULL;
-
--- Update OUTPUT_STORAGE_RESOURCE_ID with INPUT_STORAGE_RESOURCE_ID when missing
-UPDATE USER_CONFIGURATION_DATA
-SET OUTPUT_STORAGE_RESOURCE_ID = INPUT_STORAGE_RESOURCE_ID
-WHERE (OUTPUT_STORAGE_RESOURCE_ID IS NULL OR OUTPUT_STORAGE_RESOURCE_ID = '')
-  AND INPUT_STORAGE_RESOURCE_ID IS NOT NULL
-  AND INPUT_STORAGE_RESOURCE_ID != '';
-
-UPDATE PROCESS
-SET OUTPUT_STORAGE_RESOURCE_ID = INPUT_STORAGE_RESOURCE_ID
-WHERE (OUTPUT_STORAGE_RESOURCE_ID IS NULL OR OUTPUT_STORAGE_RESOURCE_ID = '')
-  AND INPUT_STORAGE_RESOURCE_ID IS NOT NULL
-  AND INPUT_STORAGE_RESOURCE_ID != '';
\ No newline at end of file
diff --git a/.devcontainer/database_scripts/init/05-replica-catalog-migrations.sql b/.devcontainer/database_scripts/init/05-replica-catalog-migrations.sql
deleted file mode 100644
index 1c3b8d1c3ff..00000000000
--- a/.devcontainer/database_scripts/init/05-replica-catalog-migrations.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-USE replica_catalog;
-
--- AIRAVATA-3697: Support file names that have UTF8 characters and that are long
-ALTER TABLE
-  DATA_PRODUCT
-MODIFY
-  PRODUCT_NAME text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
-
-ALTER TABLE
-  DATA_PRODUCT
-MODIFY
-  PRODUCT_DESCRIPTION varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
-
-ALTER TABLE
-  DATA_REPLICA_LOCATION
-MODIFY
-  REPLICA_NAME text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
-
-ALTER TABLE
-  DATA_REPLICA_LOCATION
-MODIFY
-  REPLICA_DESCRIPTION varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
-
-ALTER TABLE
-  DATA_REPLICA_LOCATION
-MODIFY
-  FILE_PATH varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
diff --git a/.devcontainer/database_scripts/init/06-cloud-execution-support-migration.sql b/.devcontainer/database_scripts/init/06-cloud-execution-support-migration.sql
deleted file mode 100644
index 81718b8f964..00000000000
--- a/.devcontainer/database_scripts/init/06-cloud-execution-support-migration.sql
+++ /dev/null
@@ -1,84 +0,0 @@
-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';
-
--- Make sure all future inserts require an explicit RESOURCE_TYPE
-ALTER TABLE `GROUP_COMPUTE_RESOURCE_PREFERENCE`
-    ALTER COLUMN `RESOURCE_TYPE` DROP DEFAULT;
-
--- Create the new Slurm-specific table
-CREATE TABLE `SLURM_GROUP_COMPUTE_RESOURCE_PREFERENCE`
-(
-    `RESOURCE_ID`                             VARCHAR(255) NOT NULL,
-    `GROUP_RESOURCE_PROFILE_ID`               VARCHAR(255) NOT NULL,
-    `PREFERED_BATCH_QUEUE`                    VARCHAR(255)          DEFAULT NULL,
-    `ALLOCATION_PROJECT_NUMBER`               VARCHAR(255)          DEFAULT NULL,
-    `USAGE_REPORTING_GATEWAY_ID`              VARCHAR(255)          DEFAULT NULL,
-    `QUALITY_OF_SERVICE`                      VARCHAR(255)          DEFAULT NULL,
-    `RESERVATION`                             VARCHAR(255)          DEFAULT NULL,
-    `RESERVATION_START_TIME`                  TIMESTAMP    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-    `RESERVATION_END_TIME`                    TIMESTAMP    NOT NULL DEFAULT '0000-00-00 00:00:00',
-    `SSH_ACCOUNT_PROVISIONER`                 VARCHAR(255)          DEFAULT NULL,
-    `SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO` TEXT                  DEFAULT NULL,
-    PRIMARY KEY (`RESOURCE_ID`, `GROUP_RESOURCE_PROFILE_ID`),
-    CONSTRAINT `FK_SLURM_PREF_TO_BASE` FOREIGN KEY (`RESOURCE_ID`, `GROUP_RESOURCE_PROFILE_ID`)
-        REFERENCES `GROUP_COMPUTE_RESOURCE_PREFERENCE` (`RESOURCE_ID`, `GROUP_RESOURCE_PROFILE_ID`)
-        ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
--- Migrate Slurm-specific field data from the base table into the new Slurm table
-INSERT INTO `SLURM_GROUP_COMPUTE_RESOURCE_PREFERENCE` (
-    `RESOURCE_ID`,
-    `GROUP_RESOURCE_PROFILE_ID`,
-    `PREFERED_BATCH_QUEUE`,
-    `ALLOCATION_PROJECT_NUMBER`,
-    `USAGE_REPORTING_GATEWAY_ID`,
-    `QUALITY_OF_SERVICE`,
-    `RESERVATION`,
-    `RESERVATION_START_TIME`,
-    `RESERVATION_END_TIME`,
-    `SSH_ACCOUNT_PROVISIONER`,
-    `SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO`
-)
-SELECT
-    `RESOURCE_ID`,
-    `GROUP_RESOURCE_PROFILE_ID`,
-    `PREFERED_BATCH_QUEUE`,
-    `ALLOCATION_PROJECT_NUMBER`,
-    `USAGE_REPORTING_GATEWAY_ID`,
-    `QUALITY_OF_SERVICE`,
-    `RESERVATION`,
-    `RESERVATION_START_TIME`,
-    `RESERVATION_END_TIME`,
-    `SSH_ACCOUNT_PROVISIONER`,
-    `SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO`
-FROM `GROUP_COMPUTE_RESOURCE_PREFERENCE`;
-
--- Drop the Slurm-specific columns from the base table
-ALTER TABLE `GROUP_COMPUTE_RESOURCE_PREFERENCE`
-DROP COLUMN `PREFERED_BATCH_QUEUE`,
-  DROP COLUMN `ALLOCATION_PROJECT_NUMBER`,
-  DROP COLUMN `USAGE_REPORTING_GATEWAY_ID`,
-  DROP COLUMN `QUALITY_OF_SERVICE`,
-  DROP COLUMN `RESERVATION`,
-  DROP COLUMN `RESERVATION_START_TIME`,
-  DROP COLUMN `RESERVATION_END_TIME`,
-  DROP COLUMN `SSH_ACCOUNT_PROVISIONER`,
-  DROP COLUMN `SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO`;
-
--- Create the AWS-specific group compute preference table
-CREATE TABLE `AWS_GROUP_COMPUTE_RESOURCE_PREFERENCE`
-(
-    `RESOURCE_ID`                 VARCHAR(255) NOT NULL,
-    `GROUP_RESOURCE_PROFILE_ID`   VARCHAR(255) NOT NULL,
-    `AWS_REGION`                  VARCHAR(255) NOT NULL,
-    `PREFERRED_AMI_ID`            VARCHAR(255) NOT NULL,
-    `PREFERRED_INSTANCE_TYPE`     VARCHAR(255) NOT NULL,
-
-    PRIMARY KEY (`RESOURCE_ID`, `GROUP_RESOURCE_PROFILE_ID`),
-    CONSTRAINT `FK_AWS_PREF_TO_BASE` FOREIGN KEY (`RESOURCE_ID`, `GROUP_RESOURCE_PROFILE_ID`)
-        REFERENCES `GROUP_COMPUTE_RESOURCE_PREFERENCE` (`RESOURCE_ID`, `GROUP_RESOURCE_PROFILE_ID`)
-        ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
\ No newline at end of file
diff --git a/.devcontainer/database_scripts/init/07-cleanup-strategy-migration.sql b/.devcontainer/database_scripts/init/07-cleanup-strategy-migration.sql
deleted file mode 100644
index 4b40dbd7ed0..00000000000
--- a/.devcontainer/database_scripts/init/07-cleanup-strategy-migration.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-USE experiment_catalog;
-
--- Add cleanupStrategy flag to EXPERIMENT
-ALTER TABLE EXPERIMENT ADD COLUMN IF NOT EXISTS CLEANUP_STRATEGY VARCHAR(255) DEFAULT 'NONE';
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
deleted file mode 100644
index ce760a63344..00000000000
--- a/.devcontainer/devcontainer.json
+++ /dev/null
@@ -1,27 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the
-// README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu
-{
-  "name": "Airavata",
-  "dockerComposeFile": "docker-compose.yml",
-  "service": "devcontainer",
-  "features": {},
-  "workspaceFolder": "/home/developer/workspace",
-  "forwardPorts": [],
-  "customizations": {
-    "vscode": {
-      "extensions": [
-        "esbenp.prettier-vscode",
-        "eamodio.gitlens",
-        "foxundermoon.shell-format",
-        "golang.go",
-        "lkrms.inifmt",
-        "ms-python.python",
-        "ms-python.autopep8",
-        "ms-python.isort",
-        "ms-toolsai.jupyter",
-        "njpwerner.autodocstring",
-        "vscjava.vscode-java-pack",
-      ]
-    },
-  }
-}
\ No newline at end of file
diff --git a/.devcontainer/docker-compose-alt.yml b/.devcontainer/docker-compose-alt.yml
deleted file mode 100644
index 50ff2937cc0..00000000000
--- a/.devcontainer/docker-compose-alt.yml
+++ /dev/null
@@ -1,279 +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.
-
-version: '3'
-services:
-
-  controller:
-    image: airavata/controller
-    restart: always
-    depends_on:
-      - zookeeper
-      - db
-      - kafka
-      - keycloak
-    environment:
-      - zookeeper.server.connection=zookeeper:2181
-    command: ["/tmp/wait-for-it.sh", "zookeeper:2181", "--" , "/opt/apache-airavata-controller/bin/controller.sh"]
-
-  apiserver:
-    image: airavata/api-server
-    restart: always
-    depends_on:
-      - zookeeper
-      - db
-      - kafka
-      - keycloak
-      - rabbitmq
-    links:
-      - "keycloak:airavata.host"
-    ports:
-      - "8930:8930"
-      - "7878:7878"
-      - "8962:8962"
-      - "8960:8960"
-      - "8970:8970"
-    volumes:
-      - ../resources/keystores:/opt/keystores
-    environment:
-      - registry.jdbc.driver=org.mariadb.jdbc.Driver
-      - registry.jdbc.url=jdbc:mariadb://db:3306/experiment_catalog
-      - registry.jdbc.user=root
-      - registry.jdbc.password=123456
-      - start.derby.server.mode=false
-      - validationQuery=SELECT 1 from CONFIGURATION
-      - enable.sharing=true
-      - default.registry.user=default-admin
-      - default.registry.password=123456
-      - default.registry.gateway=default
-      - default.registry.oauth.client.id=pga
-      - default.registry.oauth.client.secret=9790c8c4-7d9b-4ccc-a820-ca5aac38d2ad
-      - super.tenant.gatewayId=default
-      - cluster.status.monitoring.enable=false
-      - cluster.status.monitoring.repeat.time=18000
-      - appcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-      - appcatalog.jdbc.url=jdbc:mariadb://db:3306/app_catalog
-      - appcatalog.jdbc.user=root
-      - appcatalog.jdbc.password=123456
-      - appcatalog.validationQuery=SELECT 1 from CONFIGURATION
-      - replicacatalog.jdbc.driver=org.mariadb.jdbc.Driver
-      - replicacatalog.jdbc.url=jdbc:mariadb://db:3306/replica_catalog
-      - replicacatalog.jdbc.user=root
-      - replicacatalog.jdbc.password=123456
-      - replicacatalog.validationQuery=SELECT 1 from CONFIGURATION
-      - workflowcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-      - workflowcatalog.jdbc.url=jdbc:mariadb://db:3306/workflow_catalog
-      - workflowcatalog.jdbc.user=root
-      - workflowcatalog.jdbc.password=123456
-      - workflowcatalog.validationQuery=SELECT 1 from CONFIGURATION
-      - sharingcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-      - sharingcatalog.jdbc.url=jdbc:mariadb://db:3306/sharing_catalog
-      - sharingcatalog.jdbc.user=root
-      - sharingcatalog.jdbc.password=123456
-      - sharingcatalog.validationQuery=SELECT 1 from CONFIGURATION
-      - sharing_server=org.apache.airavata.sharing.registry.server.SharingRegistryServer
-      - sharing.registry.server.host=0.0.0.0
-      - sharing.registry.server.port=7878
-      - apiserver.class=org.apache.airavata.api.server.AiravataAPIServer
-      - apiserver.host=0.0.0.0
-      - apiserver.port=8930
-      - orchestrator=org.apache.airavata.orchestrator.server.OrchestratorServer
-      - orchestrator.server.host=0.0.0.0
-      - orchestrator.server.port=8940
-      - orchestrator.server.min.threads=50
-      - job.validators=org.apache.airavata.orchestrator.core.validator.impl.BatchQueueValidator,org.apache.airavata.orchestrator.core.validator.impl.ExperimentStatusValidator
-      - enable.validation=true
-      - host.scheduler=org.apache.airavata.orchestrator.core.schedule.DefaultHostScheduler
-      - regserver=org.apache.airavata.registry.api.service.RegistryAPIServer
-      - regserver.server.host=localhost
-      - regserver.server.port=8970
-      - regserver.server.min.threads=50
-      - job.notification.enable=true
-      - job.notification.emailids=
-      - credential.store.keystore.url=/opt/keystores/airavata.sym.p12
-      - credential.store.keystore.alias=airavata
-      - credential.store.keystore.password=airavata
-      - credential.store.jdbc.url=jdbc:mariadb://db:3306/credential_store
-      - credential.store.jdbc.user=root
-      - credential.store.jdbc.password=123456
-      - credential.store.jdbc.driver=org.mariadb.jdbc.Driver
-      - credential.store.server.host=0.0.0.0
-      - credential.store.server.port=8960
-      - credential.store.class=org.apache.airavata.credential.store.server.CredentialStoreServer
-      - credential.store.jdbc.validationQuery=SELECT 1 from CONFIGURATION
-      - rabbitmq.broker.url=amqp://guest:guest@rabbitmq:5672/develop
-      - rabbitmq.status.exchange.name=status_exchange
-      - rabbitmq.process.exchange.name=process_exchange
-      - rabbitmq.experiment.exchange.name=experiment_exchange
-      - durable.queue=false
-      - prefetch.count=200
-      - embedded.zk=false
-      - zookeeper.server.connection=zookeeper:2181
-      - security.manager.class=org.apache.airavata.service.security.KeyCloakSecurityManager
-      - TLS.enabled=true
-      - TLS.client.timeout=10000
-      - keystore.path=/opt/keystores/airavata.p12
-      - keystore.password=airavata
-      - authz.cache.enabled=true
-      - authz.cache.manager.class=org.apache.airavata.service.security.authzcache.DefaultAuthzCacheManager
-      - in.memory.cache.size=1000
-      - profile.service.server.host=0.0.0.0
-      - profile.service.server.port=8962
-      - profile_service.class=org.apache.airavata.service.profile.server.ProfileServiceServer
-      - profile.service.jdbc.url=jdbc:mariadb://db:3306/profile_service
-      - profile.service.jdbc.user=root
-      - profile.service.jdbc.password=123456
-      - profile.service.jdbc.driver=org.mariadb.jdbc.Driver
-      - profile.service.validationQuery=SELECT 1
-      - iam.server.url=https://airavata.host:8443
-      - iam.server.super.admin.username=admin
-      - iam.server.super.admin.password=admin
-      - db_event_manager.class=org.apache.airavata.db.event.manager.DBEventManagerRunner
-      - thrift.client.pool.abandoned.removal.enabled=true
-    command: ["/tmp/wait-for-it.sh", "db:3306", "--", "/tmp/wait-for-it.sh", "rabbitmq:5672", "--" , "/opt/apache-airavata-api-server/bin/airavata-server-start.sh", "api-orch"]
-
-  prewm:
-    image: airavata/pre-wm
-    restart: always
-    depends_on:
-      - zookeeper
-      - db
-      - kafka
-      - keycloak
-      - apiserver
-      - rabbitmq
-    environment:
-      - zookeeper.server.connection=zookeeper:2181
-      - regserver.server.host=apiserver
-      - rabbitmq.broker.url=amqp://guest:guest@rabbitmq:5672/develop
-      - pre.workflow.manager.loadbalance.clusters=false
-    command: ["/tmp/wait-for-it.sh", "zookeeper:2181", "--", "/tmp/wait-for-it.sh", "apiserver:8970", "--" , "/tmp/wait-for-it.sh", "rabbitmq:5672", "--", "/opt/apache-airavata-pre-wm/bin/pre-wm.sh"]
-
-  participant:
-    image: airavata/participant
-    restart: always
-    depends_on:
-      - zookeeper
-      - db
-      - kafka
-      - keycloak
-      - apiserver
-      - rabbitmq
-    environment:
-      - zookeeper.server.connection=zookeeper:2181
-      - regserver.server.host=apiserver
-      - rabbitmq.broker.url=amqp://guest:guest@rabbitmq:5672/develop
-      - credential.store.server.host=apiserver
-      - email.based.monitor.address=CHANGEME
-      - enable.realtime.monitor=false
-      - profile.service.server.host=apiserver
-      - profile.service.server.port=8962
-    command: ["/tmp/wait-for-it.sh", "zookeeper:2181", "--", "/tmp/wait-for-it.sh", "apiserver:8970", "--" , "/tmp/wait-for-it.sh", "rabbitmq:5672", "--", "/opt/apache-airavata-participant/bin/participant.sh"]
-
-  emailmonitor:
-    image: airavata/email-monitor
-    restart: always
-    depends_on:
-      - zookeeper
-      - db
-      - kafka
-      - keycloak
-      - apiserver
-      - rabbitmq
-    environment:
-      - zookeeper.server.connection=zookeeper:2181
-      - regserver.server.host=apiserver
-      - regserver.server.port=8970
-      - email.based.monitor.address=CHANGEME
-      - email.based.monitor.password=CHANGEME
-      - kafka.broker.url=kafka:9092
-    command: ["/tmp/wait-for-it.sh", "zookeeper:2181", "--", "/tmp/wait-for-it.sh", "apiserver:8970", "--" , "/tmp/wait-for-it.sh", "kafka:9092", "--", "/opt/apache-airavata-email-monitor/bin/email-monitor.sh"]
-
-  db:
-    image: mariadb:10.4.13
-    environment:
-      MYSQL_ROOT_PASSWORD: 123456
-    ports:
-      - "3306:3306"
-    volumes:
-      - mariadb_data:/var/lib/mysql
-
-  keycloak:
-    image: keycloak/keycloak:24.0
-    environment:
-      KEYCLOAK_ADMIN: admin
-      KEYCLOAK_ADMIN_PASSWORD: admin
-    command: ["start-dev", "--https-port=8443"]
-    ports:
-      - "8443:8443"
-      - "18080:8080"
-
-  rabbitmq:
-    image: rabbitmq:3.12.14-management
-    ports:
-      - "5672:5672"
-      - "15672:15672"
-    environment:
-      - RABBITMQ_DEFAULT_USER=guest
-      - RABBITMQ_DEFAULT_PASS=guest
-    command: >
-      bash -c "
-        rabbitmq-server &
-        until rabbitmqctl status > /dev/null 2>&1; do
-          echo 'Waiting for RabbitMQ to be ready...'
-          sleep 2
-        done
-        rabbitmqctl add_vhost develop
-        rabbitmqctl set_permissions -p develop guest '.*' '.*' '.*'
-        wait
-      "
-
-  zookeeper:
-    image: wurstmeister/zookeeper
-    hostname: zookeeper
-    ports:
-      - "2181:2181"
-
-  kafka:
-    image: wurstmeister/kafka
-    hostname: kafka
-    ports:
-      - "9092:9092"
-    environment:
-      KAFKA_ADVERTISED_HOST_NAME: kafka
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-
-  postwm:
-    image: airavata/post-wm
-    restart: always
-    depends_on:
-      - zookeeper
-      - db
-      - kafka
-      - keycloak
-      - apiserver
-      - rabbitmq
-    environment:
-      - zookeeper.server.connection=zookeeper:2181
-      - regserver.server.host=apiserver
-      - rabbitmq.broker.url=amqp://guest:guest@rabbitmq:5672/develop
-      - post.workflow.manager.loadbalance.clusters=false
-      - kafka.broker.url=kafka:9092
-    command: ["/tmp/wait-for-it.sh", "zookeeper:2181", "--", "/tmp/wait-for-it.sh", "apiserver:8970", "--" , "/tmp/wait-for-it.sh", "rabbitmq:5672", "--",  "/tmp/wait-for-it.sh", "kafka:9092", "--", "/opt/apache-airavata-post-wm/bin/post-wm.sh"]
-
-volumes:
-  mariadb_data:
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
deleted file mode 100644
index ec91fabdf51..00000000000
--- a/.devcontainer/docker-compose.yml
+++ /dev/null
@@ -1,263 +0,0 @@
-networks:
-  airavata-network:
-    driver: bridge
-    name: airavata.host
-    ipam:
-      config:
-        - subnet: 192.168.100.0/24
-          gateway: 192.168.100.1
-
-volumes:
-  db_data:
-    driver: local
-
-services:
-  devcontainer:
-    profiles:
-      - development
-    build:
-      dockerfile: Dockerfile
-      target: deps
-    container_name: devcontainer
-    restart: always
-    volumes:
-      - ..:/home/developer/workspace:cached
-      - $HOME/.m2:/home/developer/.m2
-      - $HOME/.ssh:/home/developer/.ssh
-    networks:
-      airavata-network:
-        ipv4_address: 192.168.100.9
-    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
-      - "8082:8082"   # rest proxy
-      - "8930:8930"   # api service
-      - "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
-    container_name: microservices
-    restart: always
-    volumes:
-      - ../vault:/app/vault
-    networks:
-      airavata-network:
-        ipv4_address: 192.168.100.9
-    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
-      - "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:
-    profiles:
-      - development
-      - staging
-    build:
-      context: portals
-      dockerfile: Dockerfile
-    container_name: portals
-    restart: always
-    volumes:
-      - /tmp:/tmp
-      - ./portals/pga_config.php:/var/www/html/default/config/pga_config.php
-    networks:
-      airavata-network:
-        ipv4_address: 192.168.100.11
-    extra_hosts:
-      - "airavata.host:192.168.100.1"
-
-  jupyterhub:
-    profiles:
-      - development
-      - staging
-    build:
-      context: ../modules/research-framework/research-hub/compose
-      dockerfile: Dockerfile
-    container_name: jupyterhub
-    restart: always
-    environment:
-      OAUTH_CLIENT_ID: "cs-jupyterlab"
-      OAUTH_CLIENT_SECRET: "DxeMtfiWU1qkDEmaGHf13RDahCujzhy1"
-      JUPYTERHUB_CRYPT_KEY: "a99323294a5d6f9b1d0e7e33450dff44db664264231b985e069c6eba8f9a3e09"
-      DOCKER_NETWORK_NAME: jupyterhub_network
-      DOCKER_NOTEBOOK_IMAGE: cybershuttle/dev_jupyterlab-base
-    volumes:
-      - ../modules/research-framework/research-hub/compose/jupyterhub_config.py:/srv/jupyterhub/jupyterhub_config.py
-      - /var/run/docker.sock:/var/run/docker.sock
-    networks:
-      airavata-network:
-        ipv4_address: 192.168.100.12
-    extra_hosts:
-      - "airavata.host:192.168.100.1"
-
-  proxy:
-    image: nginx:stable
-    container_name: proxy
-    restart: always
-    volumes:
-      - ../vault.local/server.key:/vault/server.key:ro
-      - ../vault.local/server.crt:/vault/server.crt:ro
-      - ./proxy/nginx.conf:/etc/nginx/nginx.conf:ro
-      - ./proxy/http.conf:/etc/nginx/conf.d/http.conf:ro
-      - ./proxy/stream.conf:/etc/nginx/conf.d/stream.conf:ro
-    networks:
-      airavata-network:
-        ipv4_address: 192.168.100.13
-    extra_hosts:
-      - "airavata.host:192.168.100.1"
-    ports:
-      - "5173:5173" # tls + research portal
-      - "8008:8008" # tls + php portal
-      - "8009:8009" # tls + django portal
-      - "8443:8443" # tls + keycloak
-      - "9930:9930" # tls + api
-      - "20000:20000" # tls + jupyterhub
-
-  keycloak:
-    image: keycloak/keycloak:25.0
-    container_name: keycloak
-    restart: always
-    environment:
-      KEYCLOAK_ADMIN: admin
-      KEYCLOAK_ADMIN_PASSWORD: admin
-    volumes:
-      - ./keycloak/realm-default.json:/opt/keycloak/data/import/realm-default.json
-      - ./keycloak/keycloak.conf:/opt/keycloak/conf/keycloak.conf
-    command: [ "start", "--import-realm" ]
-    networks:
-      airavata-network:
-        ipv4_address: 192.168.100.14
-    extra_hosts:
-      - "airavata.host:192.168.100.1"
-    ports:
-      - "18080:18080"
-
-  db:
-    image: mariadb:10.4.13
-    container_name: db
-    restart: always
-    environment:
-      MYSQL_ROOT_PASSWORD: 123456
-      MYSQL_USER: airavata
-      MYSQL_PASSWORD: 123456
-    volumes:
-      - ./database_scripts/init:/docker-entrypoint-initdb.d
-      - db_data:/var/lib/mysql
-    command:
-      [
-        "mysqld",
-        "--character-set-server=utf8mb4",
-        "--collation-server=utf8mb4_unicode_ci",
-        "--sql-mode=NO_ENGINE_SUBSTITUTION",
-      ]
-    networks:
-      airavata-network:
-        ipv4_address: 192.168.100.15
-    extra_hosts:
-      - "airavata.host:192.168.100.1"
-    ports:
-      - "13306:3306"
-
-  rabbitmq:
-    image: rabbitmq:4.0-management
-    container_name: rabbitmq
-    restart: always
-    environment:
-      RABBITMQ_DEFAULT_VHOST: develop
-    networks:
-      airavata-network:
-        ipv4_address: 192.168.100.16
-    extra_hosts:
-      - "airavata.host:192.168.100.1"
-    ports:
-      - "5672:5672"
-      - "15672:15672"
-
-  zookeeper:
-    image: zookeeper:latest
-    container_name: zookeeper
-    restart: always
-    networks:
-      airavata-network:
-        ipv4_address: 192.168.100.17
-    extra_hosts:
-      - "airavata.host:192.168.100.1"
-    ports:
-      - "2181:2181"
-
-  kafka:
-    image: wurstmeister/kafka:latest
-    container_name: kafka
-    restart: always
-    environment:
-      KAFKA_ADVERTISED_HOST_NAME: airavata.host
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-    networks:
-      airavata-network:
-        ipv4_address: 192.168.100.18
-    extra_hosts:
-      - "airavata.host:192.168.100.1"
-    ports:
-      - "9092:9092"
-    depends_on:
-      - zookeeper
-
-  sshd:
-    image: panubo/sshd
-    container_name: sshd
-    restart: always
-    volumes:
-      - /tmp:/tmp
-    networks:
-      airavata-network:
-        ipv4_address: 192.168.100.20
-    extra_hosts:
-      - "airavata.host:192.168.100.1"
-    ports:
-      - "22222:22"
-
-  adminer:
-    image: adminer:latest
-    container_name: adminer
-    restart: always
-    networks:
-      airavata-network:
-        ipv4_address: 192.168.100.21
-    extra_hosts:
-      - "airavata.host:192.168.100.1"
-    ports:
-      - "18088:8080"
-    depends_on:
-      - db
diff --git a/.devcontainer/gateway-storage/Dockerfile b/.devcontainer/gateway-storage/Dockerfile
deleted file mode 100644
index 4e1ddb220ad..00000000000
--- a/.devcontainer/gateway-storage/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM ubuntu:16.04
-
-RUN apt-get update && apt-get install -y openssh-server
-RUN mkdir /var/run/sshd
-RUN echo 'root:root' | chpasswd
-RUN sed -i 's/PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
-
-# SSH login fix. Otherwise user is kicked off after login
-RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd
-
-ENV NOTVISIBLE "in users profile"
-RUN echo "export VISIBLE=now" >> /etc/profile
-
-RUN mkdir -p /var/www/portals/gateway-user-data
-RUN mkdir /root/.ssh
-ADD authorized_keys /root/.ssh/authorized_keys
-
-RUN chmod 700 /root/.ssh
-RUN chmod 644 /root/.ssh/authorized_keys
-
-EXPOSE 22
-CMD ["/usr/sbin/sshd", "-D"]
\ No newline at end of file
diff --git a/.devcontainer/gateway-storage/authorized_keys b/.devcontainer/gateway-storage/authorized_keys
deleted file mode 100644
index de688215ec7..00000000000
--- a/.devcontainer/gateway-storage/authorized_keys
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCr0zWkrd3MJe397xm1q7EBZd7HuIcgLva0Dl3uyE3N7vqcWeXjXngtVicJLIROIASwy1+MAbhDDQLykQtIcJTJ5cvZM29nqqsIZ9l0acURVtDVnMd7PqRs+0wBQnrdZm34NT3/QJhxZTOuSn+i44VPFM1HWFObDP7GGtRMheGAKKV2tTbF1o/q1XaBiQJABOsP/Yt20nox1Hd6OCl0E3loK0sA+DnVVK9Ox0WShr4CWOLUCWavghXbgbDQPe/3VMSvwYqvLjNd+VfrNiAx7jNm+nxVKQSzYJ46RSwVs4jLKrnrG85+eAFwLeIFjlLyrsVNvBlOCs6XQ6lmVDD1u97B
\ No newline at end of file
diff --git a/.devcontainer/portals/Dockerfile b/.devcontainer/portals/Dockerfile
deleted file mode 100644
index 94a9de0b06f..00000000000
--- a/.devcontainer/portals/Dockerfile
+++ /dev/null
@@ -1,33 +0,0 @@
-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/portals/pga-default.conf b/.devcontainer/portals/pga-default.conf
deleted file mode 100644
index e3b250eac4b..00000000000
--- a/.devcontainer/portals/pga-default.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<VirtualHost *:8008>
-
-    DocumentRoot /var/www/html/default/public
-    <Directory "/var/www/html/default/public">
-       AllowOverride All
-    </Directory>
-    ErrorLog /var/log/apache2/default.error.log
-    CustomLog /var/log/apache2/default.requests.log combined
-
-</VirtualHost>
\ No newline at end of file
diff --git a/.devcontainer/portals/pga_config.php b/.devcontainer/portals/pga_config.php
deleted file mode 100644
index 80fb112cec2..00000000000
--- a/.devcontainer/portals/pga_config.php
+++ /dev/null
@@ -1,324 +0,0 @@
-<?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/http.conf b/.devcontainer/proxy/http.conf
deleted file mode 100644
index 19ebd0c9c51..00000000000
--- a/.devcontainer/proxy/http.conf
+++ /dev/null
@@ -1,104 +0,0 @@
-# research portal (5173)
-server {
-    listen              5173 ssl;
-    if ($scheme != "https") {
-        return 301 https://$host$request_uri;
-    }
-    http2 on;
-    server_name         airavata.host;
-    ssl_certificate     /vault/server.crt;
-    ssl_certificate_key /vault/server.key;
-    location / {
-        proxy_pass         http://portals:5173;
-        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  $scheme;
-        proxy_set_header   X-Forwarded-Port   $server_port;
-        proxy_redirect     default;
-    }
-}
-
-# php portal (8008)
-server {
-    listen              8008 ssl;
-    if ($scheme != "https") {
-        return 301 https://$host$request_uri;
-    }
-    http2 on;
-    server_name         airavata.host;
-    ssl_certificate     /vault/server.crt;
-    ssl_certificate_key /vault/server.key;
-    location / {
-        proxy_pass         http://portals:8008;
-        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  $scheme;
-        proxy_set_header   X-Forwarded-Port   $server_port;
-        proxy_redirect     default;
-    }
-}
-
-# django portal (8009)
-server {
-    listen              8009 ssl;
-    if ($scheme != "https") {
-        return 301 https://$host$request_uri;
-    }
-    http2 on;
-    server_name         airavata.host;
-    ssl_certificate     /vault/server.crt;
-    ssl_certificate_key /vault/server.key;
-    location / {
-        proxy_pass         http://portals:8009;
-        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  $scheme;
-        proxy_set_header   X-Forwarded-Port   $server_port;
-        proxy_redirect     default;
-    }
-}
-
-# keycloak (8443)
-server {
-    listen              8443 ssl;
-    if ($scheme != "https") {
-        return 301 https://$host$request_uri;
-    }
-    http2 on;
-    server_name         airavata.host;
-    ssl_certificate     /vault/server.crt;
-    ssl_certificate_key /vault/server.key;
-    location / {
-        proxy_pass         http://keycloak:18080;
-        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  $scheme;
-        proxy_set_header   X-Forwarded-Port   $server_port;
-        proxy_redirect     default;
-    }
-}
-
-# jupyterhub (20000)
-server {
-    listen              20000 ssl;
-    if ($scheme != "https") {
-        return 301 https://$host$request_uri;
-    }
-    http2 on;
-    server_name         airavata.host;
-    ssl_certificate     /vault/server.crt;
-    ssl_certificate_key /vault/server.key;
-    location / {
-        proxy_pass         http://jupyterhub:20000;
-        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  $scheme;
-        proxy_set_header   X-Forwarded-Port   $server_port;
-        proxy_redirect     default;
-    }
-}
diff --git a/.devcontainer/proxy/nginx.conf b/.devcontainer/proxy/nginx.conf
deleted file mode 100644
index b9536d0aaa6..00000000000
--- a/.devcontainer/proxy/nginx.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-worker_processes auto;
-error_log  /var/log/nginx/error.log warn;
-pid        /var/run/nginx.pid;
-
-events {
-    worker_connections 1024;
-}
-
-http {
-    include /etc/nginx/conf.d/http.conf;
-}
-
-stream {
-    include /etc/nginx/conf.d/stream.conf;
-}
\ No newline at end of file
diff --git a/.devcontainer/proxy/stream.conf b/.devcontainer/proxy/stream.conf
deleted file mode 100644
index 782fbfc51d0..00000000000
--- a/.devcontainer/proxy/stream.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Thrift server (9930 -> 8930)
-server {
-    listen 9930 ssl;               # accept TLS on port 9930
-    proxy_pass 192.168.100.9:8930; # forward decrypted traffic
-
-    # point to your cert+key
-    ssl_certificate     /vault/server.crt;
-    ssl_certificate_key /vault/server.key;
-
-    # (optional) enforce modern TLS only
-    ssl_protocols       TLSv1.2 TLSv1.3;
-    ssl_ciphers         HIGH:!aNULL:!MD5;
-    ssl_prefer_server_ciphers on;
-
-    # tuning
-    proxy_connect_timeout 5s;
-    proxy_timeout         5s;
-}
diff --git a/airavata-api/modules/distribution/src/main/resources/conf/db/README.md b/airavata-api/modules/distribution/src/main/resources/conf/db/README.md
new file mode 100644
index 00000000000..c6219cfe1c8
--- /dev/null
+++ b/airavata-api/modules/distribution/src/main/resources/conf/db/README.md
@@ -0,0 +1,40 @@
+# Database Setup
+
+## Automated Deployments
+
+For docker-compose, Ansible, and Kubernetes, the canonical init script is
+`conf/init-db/01-create-databases.sql` at the repo root. It creates the
+`airavata` database with dev credentials.
+
+## Manual Setup
+
+1. **Create databases and users** (run as MySQL/MariaDB admin):
+   ```bash
+   mysql -u root -p < create-database.sql
+   ```
+   Edit `create-database.sql` to set passwords before running.
+
+2. **Configure connection** in `application.properties`:
+   ```properties
+   spring.datasource.url=jdbc:mariadb://localhost:3306/airavata
+   spring.datasource.username=airavata
+   spring.datasource.password=YOUR_PASSWORD
+   ```
+
+3. **Run migrations**: Flyway runs automatically on first startup, or run:
+   ```bash
+   airavata init
+   ```
+
+## Files
+
+| File | Purpose |
+|------|---------|
+| `create-database.sql` | Manual/reference setup (creates airavata DB) |
+| `migration/airavata/V1__Baseline_schema.sql` | Flyway baseline migration (all tables) |
+| `conf/init-db/01-create-databases.sql` (repo root) | Canonical init for automated deployments |
+
+## Requirements
+
+- MySQL 5.7+ or MariaDB 10.2+
+- UTF-8 (utf8mb4) supported
diff --git a/modules/registry-db-migrator/src/main/resources/db-scripts/0.7/migrate_mysql.sql b/airavata-api/modules/distribution/src/main/resources/conf/db/create-database.sql
similarity index 53%
rename from modules/registry-db-migrator/src/main/resources/db-scripts/0.7/migrate_mysql.sql
rename to airavata-api/modules/distribution/src/main/resources/conf/db/create-database.sql
index 6b47ed55aa8..08b38b098a5 100644
--- a/modules/registry-db-migrator/src/main/resources/db-scripts/0.7/migrate_mysql.sql
+++ b/airavata-api/modules/distribution/src/main/resources/conf/db/create-database.sql
@@ -1,5 +1,4 @@
 /*
- *
  * 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
@@ -17,24 +16,25 @@
  * specific language governing permissions and limitations
  * under the License.
  *
+ * Apache Airavata - Database Setup Script (manual / reference)
+ *
+ * For automated deployments (docker-compose, Ansible, K8s), use the canonical
+ * init script at: conf/init-db/01-create-databases.sql
+ *
+ * This file is for manual one-off setup. Run as a MySQL/MariaDB admin before
+ * first deployment. Replace credentials with values for your environment.
+ *
+ * Prerequisites: MySQL 5.7+ or MariaDB 10.2+
+ *
+ * Usage: mysql -u root -p < create-database.sql
  */
 
-CREATE TABLE community_user
-(
-  GATEWAY_NAME 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_NAME, COMMUNITY_USER_NAME, TOKEN_ID)
-);
+-- Airavata database
+CREATE DATABASE IF NOT EXISTS airavata
+  CHARACTER SET utf8mb4
+  COLLATE utf8mb4_unicode_ci;
 
+CREATE USER IF NOT EXISTS 'airavata'@'%' IDENTIFIED BY 'CHANGE_ME_IN_PRODUCTION';
+GRANT ALL PRIVILEGES ON airavata.* TO 'airavata'@'%';
 
-CREATE TABLE credentials
-(
-  GATEWAY_ID VARCHAR(256) NOT NULL,
-  TOKEN_ID VARCHAR(256) NOT NULL,
-  CREDENTIAL TEXT NOT NULL,
-  PORTAL_USER_ID VARCHAR(256) NOT NULL,
-  TIME_PERSISTED TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-  PRIMARY KEY (GATEWAY_ID, TOKEN_ID)
-);
\ No newline at end of file
+FLUSH PRIVILEGES;
diff --git a/airavata-api/modules/distribution/src/main/resources/conf/db/migration/airavata/V1__Baseline_schema.sql b/airavata-api/modules/distribution/src/main/resources/conf/db/migration/airavata/V1__Baseline_schema.sql
new file mode 100644
index 00000000000..9f675233225
--- /dev/null
+++ b/airavata-api/modules/distribution/src/main/resources/conf/db/migration/airavata/V1__Baseline_schema.sql
@@ -0,0 +1,1720 @@
+/*
+ * 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.
+ *
+ * Apache Airavata - Unified Database Schema (V1 Baseline)
+ *
+ * Generated from JPA @Entity annotations in the codebase.
+ * All persistence units share a single 'airavata' database.
+ *
+ * Requires: MariaDB 10.2+ or MySQL 5.7+
+ */
+
+-- ============================================================================
+-- 1. EXPERIMENT CATALOG
+-- ============================================================================
+
+CREATE TABLE IF NOT EXISTS GATEWAY (
+    GATEWAY_ID                          VARCHAR(255) NOT NULL,
+    GATEWAY_NAME                        VARCHAR(255),
+    DOMAIN                              VARCHAR(255),
+    EMAIL_ADDRESS                       VARCHAR(255),
+    GATEWAY_APPROVAL_STATUS             VARCHAR(255),
+    GATEWAY_ACRONYM                     VARCHAR(255),
+    GATEWAY_URL                         VARCHAR(255),
+    GATEWAY_PUBLIC_ABSTRACT             VARCHAR(255),
+    GATEWAY_REVIEW_PROPOSAL_DESCRIPTION VARCHAR(255),
+    GATEWAY_ADMIN_FIRST_NAME            VARCHAR(255),
+    GATEWAY_ADMIN_LAST_NAME             VARCHAR(255),
+    GATEWAY_ADMIN_EMAIL                 VARCHAR(255),
+    IDENTITY_SERVER_USERNAME            VARCHAR(255),
+    IDENTITY_SERVER_PASSWORD_TOKEN      VARCHAR(255),
+    DECLINED_REASON                     VARCHAR(255),
+    OAUTH_CLIENT_ID                     VARCHAR(255),
+    OAUTH_CLIENT_SECRET                 VARCHAR(255),
+    REQUEST_CREATION_TIME               TIMESTAMP NULL,
+    REQUESTER_USERNAME                  VARCHAR(255),
+    PRIMARY KEY (GATEWAY_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS USERS (
+    USER_NAME                   VARCHAR(255) NOT NULL,
+    GATEWAY_ID                  VARCHAR(255) NOT NULL,
+    AIRAVATA_INTERNAL_USER_ID   VARCHAR(255),
+    PASSWORD                    VARCHAR(255),
+    PRIMARY KEY (USER_NAME, GATEWAY_ID),
+    CONSTRAINT FK_USERS_GATEWAY FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY (GATEWAY_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS GATEWAY_WORKER (
+    GATEWAY_ID  VARCHAR(255) NOT NULL,
+    USER_NAME   VARCHAR(255) NOT NULL,
+    PRIMARY KEY (GATEWAY_ID, USER_NAME)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS GATEWAY_USAGE_REPORTING_COMMAND (
+    GATEWAY_ID          VARCHAR(255) NOT NULL,
+    COMPUTE_RESOURCE_ID VARCHAR(255) NOT NULL,
+    COMMAND             LONGTEXT,
+    PRIMARY KEY (GATEWAY_ID, COMPUTE_RESOURCE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS NOTIFICATION (
+    NOTIFICATION_ID      VARCHAR(255) NOT NULL,
+    GATEWAY_ID           VARCHAR(255),
+    TITLE                VARCHAR(255),
+    NOTIFICATION_MESSAGE VARCHAR(4096),
+    CREATION_DATE        TIMESTAMP NULL,
+    PUBLISHED_DATE       TIMESTAMP NULL,
+    EXPIRATION_DATE      TIMESTAMP NULL,
+    PRIORITY             VARCHAR(255),
+    PRIMARY KEY (NOTIFICATION_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS PROJECT (
+    PROJECT_ID      VARCHAR(255) NOT NULL,
+    USER_NAME       VARCHAR(255),
+    GATEWAY_ID      VARCHAR(255),
+    PROJECT_NAME    VARCHAR(255),
+    DESCRIPTION     VARCHAR(255),
+    CREATION_TIME   TIMESTAMP NULL,
+    PRIMARY KEY (PROJECT_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS PROJECT_USER (
+    PROJECT_ID  VARCHAR(255) NOT NULL,
+    USER_NAME   VARCHAR(255) NOT NULL,
+    PRIMARY KEY (PROJECT_ID, USER_NAME),
+    CONSTRAINT FK_PROJECT_USER_USER FOREIGN KEY (USER_NAME) REFERENCES USERS (USER_NAME)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS QUEUE_STATUS (
+    HOST_NAME       VARCHAR(255) NOT NULL,
+    QUEUE_NAME      VARCHAR(255) NOT NULL,
+    CREATED_TIME    BIGINT NOT NULL,
+    QUEUE_UP        TINYINT(1) NOT NULL DEFAULT 0,
+    RUNNING_JOBS    TINYINT(1) NOT NULL DEFAULT 0,
+    QUEUED_JOBS     INT NOT NULL DEFAULT 0,
+    PRIMARY KEY (HOST_NAME, QUEUE_NAME, CREATED_TIME)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS EXPERIMENT (
+    EXPERIMENT_ID             VARCHAR(255) NOT NULL,
+    PROJECT_ID                VARCHAR(255),
+    GATEWAY_ID                VARCHAR(255),
+    EXPERIMENT_TYPE           VARCHAR(255),
+    CLEANUP_STRATEGY          VARCHAR(255),
+    USER_NAME                 VARCHAR(255),
+    EXPERIMENT_NAME           VARCHAR(255),
+    CREATION_TIME             TIMESTAMP NULL,
+    DESCRIPTION               VARCHAR(255),
+    EXECUTION_ID              VARCHAR(255),
+    GATEWAY_EXECUTION_ID      VARCHAR(255),
+    GATEWAY_INSTANCE_ID       VARCHAR(255),
+    ENABLE_EMAIL_NOTIFICATION TINYINT(1) NOT NULL DEFAULT 0,
+    EMAIL_ADDRESSES           LONGTEXT,
+    PRIMARY KEY (EXPERIMENT_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS EXPERIMENT_SUMMARY (
+    EXPERIMENT_ID        VARCHAR(255) NOT NULL,
+    PROJECT_ID           VARCHAR(255),
+    GATEWAY_ID           VARCHAR(255),
+    CREATION_TIME        TIMESTAMP NULL,
+    USER_NAME            VARCHAR(255),
+    EXPERIMENT_NAME      VARCHAR(255),
+    DESCRIPTION          VARCHAR(255),
+    EXECUTION_ID         VARCHAR(255),
+    STATE                VARCHAR(255),
+    RESOURCE_HOST_ID     VARCHAR(255),
+    TIME_OF_STATE_CHANGE TIMESTAMP NULL,
+    PRIMARY KEY (EXPERIMENT_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS EXPERIMENT_INPUT (
+    EXPERIMENT_ID             VARCHAR(255) NOT NULL,
+    INPUT_NAME                VARCHAR(255) NOT NULL,
+    INPUT_VALUE               LONGTEXT,
+    DATA_TYPE                 VARCHAR(255),
+    APPLICATION_ARGUMENT      VARCHAR(255),
+    STANDARD_INPUT            TINYINT(1) NOT NULL DEFAULT 0,
+    USER_FRIENDLY_DESCRIPTION LONGTEXT,
+    METADATA                  VARCHAR(4096),
+    INPUT_ORDER               INT NOT NULL DEFAULT 0,
+    IS_REQUIRED               TINYINT(1) NOT NULL DEFAULT 0,
+    REQUIRED_TO_ADDED_TO_CMD  TINYINT(1) NOT NULL DEFAULT 0,
+    DATA_STAGED               TINYINT(1) NOT NULL DEFAULT 0,
+    STORAGE_RESOURCE_ID       VARCHAR(255),
+    IS_READ_ONLY              TINYINT(1) NOT NULL DEFAULT 0,
+    OVERRIDE_FILENAME         VARCHAR(255),
+    PRIMARY KEY (EXPERIMENT_ID, INPUT_NAME),
+    CONSTRAINT FK_EXP_INPUT_EXPERIMENT FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT (EXPERIMENT_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS EXPERIMENT_OUTPUT (
+    EXPERIMENT_ID            VARCHAR(255) NOT NULL,
+    OUTPUT_NAME              VARCHAR(255) NOT NULL,
+    OUTPUT_VALUE             LONGTEXT,
+    DATA_TYPE                VARCHAR(255),
+    APPLICATION_ARGUMENT     VARCHAR(255),
+    IS_REQUIRED              TINYINT(1) NOT NULL DEFAULT 0,
+    REQUIRED_TO_ADDED_TO_CMD TINYINT(1) NOT NULL DEFAULT 0,
+    DATA_MOVEMENT            TINYINT(1) NOT NULL DEFAULT 0,
+    LOCATION                 VARCHAR(255),
+    SEARCH_QUERY             VARCHAR(255),
+    OUTPUT_STREAMING         TINYINT(1) NOT NULL DEFAULT 0,
+    STORAGE_RESOURCE_ID      VARCHAR(255),
+    METADATA                 VARCHAR(4096),
+    PRIMARY KEY (EXPERIMENT_ID, OUTPUT_NAME),
+    CONSTRAINT FK_EXP_OUTPUT_EXPERIMENT FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT (EXPERIMENT_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS EXPERIMENT_STATUS (
+    STATUS_ID            VARCHAR(255) NOT NULL,
+    EXPERIMENT_ID        VARCHAR(255) NOT NULL,
+    STATE                VARCHAR(255),
+    TIME_OF_STATE_CHANGE TIMESTAMP NULL,
+    REASON               LONGTEXT,
+    PRIMARY KEY (STATUS_ID, EXPERIMENT_ID),
+    CONSTRAINT FK_EXP_STATUS_EXPERIMENT FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT (EXPERIMENT_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS EXPERIMENT_ERROR (
+    ERROR_ID                 VARCHAR(255) NOT NULL,
+    EXPERIMENT_ID            VARCHAR(255) NOT NULL,
+    CREATION_TIME            TIMESTAMP NULL,
+    ACTUAL_ERROR_MESSAGE     LONGTEXT,
+    USER_FRIENDLY_MESSAGE    LONGTEXT,
+    TRANSIENT_OR_PERSISTENT  TINYINT(1) NOT NULL DEFAULT 0,
+    ROOT_CAUSE_ERROR_ID_LIST LONGTEXT,
+    PRIMARY KEY (ERROR_ID, EXPERIMENT_ID),
+    CONSTRAINT FK_EXP_ERROR_EXPERIMENT FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT (EXPERIMENT_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS USER_CONFIGURATION_DATA (
+    EXPERIMENT_ID                      VARCHAR(255) NOT NULL,
+    AIRAVATA_AUTO_SCHEDULE             TINYINT(1) NOT NULL DEFAULT 0,
+    OVERRIDE_MANUAL_SCHEDULED_PARAMS   TINYINT(1) NOT NULL DEFAULT 0,
+    SHARE_EXPERIMENT_PUBLICALLY        TINYINT(1) NOT NULL DEFAULT 0,
+    THROTTLE_RESOURCES                 TINYINT(1) NOT NULL DEFAULT 0,
+    USER_DN                            VARCHAR(255),
+    GENERATE_CERT                      TINYINT(1) NOT NULL DEFAULT 0,
+    RESOURCE_HOST_ID                   VARCHAR(255),
+    TOTAL_CPU_COUNT                    INT NOT NULL DEFAULT 0,
+    NODE_COUNT                         INT NOT NULL DEFAULT 0,
+    NUMBER_OF_THREADS                  INT NOT NULL DEFAULT 0,
+    QUEUE_NAME                         VARCHAR(255),
+    WALL_TIME_LIMIT                    INT NOT NULL DEFAULT 0,
+    TOTAL_PHYSICAL_MEMORY              INT NOT NULL DEFAULT 0,
+    STATIC_WORKING_DIR                 VARCHAR(255),
+    OVERRIDE_LOGIN_USER_NAME           VARCHAR(255),
+    OVERRIDE_SCRATCH_LOCATION          VARCHAR(255),
+    OVERRIDE_ALLOCATION_PROJECT_NUMBER VARCHAR(255),
+    INPUT_STORAGE_RESOURCE_ID          VARCHAR(255),
+    OUTPUT_STORAGE_RESOURCE_ID         VARCHAR(255),
+    EXPERIMENT_DATA_DIR                VARCHAR(512),
+    GROUP_RESOURCE_PROFILE_ID          VARCHAR(255),
+    IS_USE_USER_CR_PREF                TINYINT(1) NOT NULL DEFAULT 0,
+    PRIMARY KEY (EXPERIMENT_ID),
+    CONSTRAINT FK_USER_CONF_EXPERIMENT FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT (EXPERIMENT_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS COMPUTE_RESOURCE_SCHEDULING (
+    EXPERIMENT_ID                      VARCHAR(255) NOT NULL,
+    RESOURCE_HOST_ID                   VARCHAR(255) NOT NULL,
+    QUEUE_NAME                         VARCHAR(255) NOT NULL,
+    TOTAL_CPU_COUNT                    INT NOT NULL DEFAULT 0,
+    NODE_COUNT                         INT NOT NULL DEFAULT 0,
+    NUMBER_OF_THREADS                  INT NOT NULL DEFAULT 0,
+    WALL_TIME_LIMIT                    INT NOT NULL DEFAULT 0,
+    PARALLEL_GROUP_COUNT               INT NOT NULL DEFAULT 0,
+    TOTAL_PHYSICAL_MEMORY              INT NOT NULL DEFAULT 0,
+    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),
+    CONSTRAINT FK_COMP_SCHED_USER_CONF FOREIGN KEY (EXPERIMENT_ID) REFERENCES USER_CONFIGURATION_DATA (EXPERIMENT_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS PROCESS (
+    PROCESS_ID                 VARCHAR(255) NOT NULL,
+    EXPERIMENT_ID              VARCHAR(255) NOT NULL,
+    CREATION_TIME              TIMESTAMP NULL,
+    LAST_UPDATE_TIME           TIMESTAMP NULL,
+    PROCESS_DETAIL             LONGTEXT,
+    APPLICATION_INTERFACE_ID   VARCHAR(255),
+    APPLICATION_DEPLOYMENT_ID  VARCHAR(255),
+    COMPUTE_RESOURCE_ID        VARCHAR(255),
+    TASK_DAG                   LONGTEXT,
+    GATEWAY_EXECUTION_ID       VARCHAR(255),
+    ENABLE_EMAIL_NOTIFICATION  TINYINT(1) NOT NULL DEFAULT 0,
+    EMAIL_ADDRESSES            LONGTEXT,
+    INPUT_STORAGE_RESOURCE_ID  VARCHAR(255),
+    OUTPUT_STORAGE_RESOURCE_ID VARCHAR(255),
+    USER_DN                    VARCHAR(255),
+    GENERATE_CERT              TINYINT(1) NOT NULL DEFAULT 0,
+    EXPERIMENT_DATA_DIR        VARCHAR(512),
+    USERNAME                   VARCHAR(255),
+    GROUP_RESOURCE_PROFILE_ID  VARCHAR(255),
+    USE_USER_CR_PREF           TINYINT(1) NOT NULL DEFAULT 0,
+    PRIMARY KEY (PROCESS_ID),
+    CONSTRAINT FK_PROCESS_EXPERIMENT FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT (EXPERIMENT_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS PROCESS_STATUS (
+    STATUS_ID            VARCHAR(255) NOT NULL,
+    PROCESS_ID           VARCHAR(255) NOT NULL,
+    STATE                VARCHAR(255),
+    TIME_OF_STATE_CHANGE TIMESTAMP NULL,
+    REASON               LONGTEXT,
+    PRIMARY KEY (STATUS_ID, PROCESS_ID),
+    CONSTRAINT FK_PROC_STATUS_PROCESS FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS (PROCESS_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS PROCESS_ERROR (
+    ERROR_ID                 VARCHAR(255) NOT NULL,
+    PROCESS_ID               VARCHAR(255) NOT NULL,
+    CREATION_TIME            TIMESTAMP NULL,
+    ACTUAL_ERROR_MESSAGE     LONGTEXT,
+    USER_FRIENDLY_MESSAGE    LONGTEXT,
+    TRANSIENT_OR_PERSISTENT  TINYINT(1) NOT NULL DEFAULT 0,
+    ROOT_CAUSE_ERROR_ID_LIST LONGTEXT,
+    PRIMARY KEY (ERROR_ID, PROCESS_ID),
+    CONSTRAINT FK_PROC_ERROR_PROCESS FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS (PROCESS_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS PROCESS_INPUT (
+    PROCESS_ID                VARCHAR(255) NOT NULL,
+    INPUT_NAME                VARCHAR(255) NOT NULL,
+    INPUT_VALUE               LONGTEXT,
+    DATA_TYPE                 VARCHAR(255),
+    APPLICATION_ARGUMENT      VARCHAR(255),
+    STANDARD_INPUT            TINYINT(1) NOT NULL DEFAULT 0,
+    USER_FRIENDLY_DESCRIPTION LONGTEXT,
+    METADATA                  VARCHAR(4096),
+    INPUT_ORDER               INT NOT NULL DEFAULT 0,
+    IS_REQUIRED               TINYINT(1) NOT NULL DEFAULT 0,
+    REQUIRED_TO_ADDED_TO_CMD  TINYINT(1) NOT NULL DEFAULT 0,
+    DATA_STAGED               TINYINT(1) NOT NULL DEFAULT 0,
+    STORAGE_RESOURCE_ID       VARCHAR(255),
+    IS_READ_ONLY              TINYINT(1) NOT NULL DEFAULT 0,
+    OVERRIDE_FILENAME         VARCHAR(255),
+    PRIMARY KEY (PROCESS_ID, INPUT_NAME),
+    CONSTRAINT FK_PROC_INPUT_PROCESS FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS (PROCESS_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS PROCESS_OUTPUT (
+    PROCESS_ID               VARCHAR(255) NOT NULL,
+    OUTPUT_NAME              VARCHAR(255) NOT NULL,
+    OUTPUT_VALUE             LONGTEXT,
+    DATA_TYPE                VARCHAR(255),
+    APPLICATION_ARGUMENT     VARCHAR(255),
+    IS_REQUIRED              TINYINT(1) NOT NULL DEFAULT 0,
+    REQUIRED_TO_ADDED_TO_CMD TINYINT(1) NOT NULL DEFAULT 0,
+    DATA_MOVEMENT            TINYINT(1) NOT NULL DEFAULT 0,
+    LOCATION                 VARCHAR(255),
+    SEARCH_QUERY             VARCHAR(255),
+    OUTPUT_STREAMING         TINYINT(1) NOT NULL DEFAULT 0,
+    STORAGE_RESOURCE_ID      VARCHAR(255),
+    METADATA                 VARCHAR(4096),
+    PRIMARY KEY (PROCESS_ID, OUTPUT_NAME),
+    CONSTRAINT FK_PROC_OUTPUT_PROCESS FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS (PROCESS_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS PROCESS_RESOURCE_SCHEDULE (
+    PROCESS_ID                         VARCHAR(255) NOT NULL,
+    RESOURCE_HOST_ID                   VARCHAR(255),
+    TOTAL_CPU_COUNT                    INT NOT NULL DEFAULT 0,
+    NODE_COUNT                         INT NOT NULL DEFAULT 0,
+    NUMBER_OF_THREADS                  INT NOT NULL DEFAULT 0,
+    QUEUE_NAME                         VARCHAR(255),
+    WALL_TIME_LIMIT                    INT NOT NULL DEFAULT 0,
+    TOTAL_PHYSICAL_MEMORY              INT NOT NULL DEFAULT 0,
+    STATIC_WORKING_DIR                 VARCHAR(255),
+    OVERRIDE_LOGIN_USER_NAME           VARCHAR(255),
+    OVERRIDE_SCRATCH_LOCATION          VARCHAR(255),
+    OVERRIDE_ALLOCATION_PROJECT_NUMBER VARCHAR(255),
+    PRIMARY KEY (PROCESS_ID),
+    CONSTRAINT FK_PROC_RESCHED_PROCESS FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS (PROCESS_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS PROCESS_WORKFLOW (
+    PROCESS_ID    VARCHAR(255) NOT NULL,
+    WORKFLOW_ID   VARCHAR(255) NOT NULL,
+    CREATION_TIME TIMESTAMP NULL,
+    TYPE          VARCHAR(255),
+    PRIMARY KEY (PROCESS_ID, WORKFLOW_ID),
+    CONSTRAINT FK_PROC_WORKFLOW_PROCESS FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS (PROCESS_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS TASK (
+    TASK_ID           VARCHAR(255) NOT NULL,
+    TASK_TYPE         VARCHAR(255),
+    PARENT_PROCESS_ID VARCHAR(255) NOT NULL,
+    CREATION_TIME     TIMESTAMP NULL,
+    LAST_UPDATE_TIME  TIMESTAMP NULL,
+    TASK_DETAIL       LONGTEXT,
+    SUB_TASK_MODEL    LONGBLOB,
+    PRIMARY KEY (TASK_ID),
+    CONSTRAINT FK_TASK_PROCESS FOREIGN KEY (PARENT_PROCESS_ID) REFERENCES PROCESS (PROCESS_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS TASK_STATUS (
+    STATUS_ID            VARCHAR(255) NOT NULL,
+    TASK_ID              VARCHAR(255) NOT NULL,
+    STATE                VARCHAR(255),
+    TIME_OF_STATE_CHANGE TIMESTAMP NULL,
+    REASON               LONGTEXT,
+    PRIMARY KEY (STATUS_ID, TASK_ID),
+    CONSTRAINT FK_TASK_STATUS_TASK FOREIGN KEY (TASK_ID) REFERENCES TASK (TASK_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS TASK_ERROR (
+    ERROR_ID                 VARCHAR(255) NOT NULL,
+    TASK_ID                  VARCHAR(255) NOT NULL,
+    CREATION_TIME            TIMESTAMP NULL,
+    ACTUAL_ERROR_MESSAGE     LONGTEXT,
+    USER_FRIENDLY_MESSAGE    LONGTEXT,
+    TRANSIENT_OR_PERSISTENT  TINYINT(1) NOT NULL DEFAULT 0,
+    ROOT_CAUSE_ERROR_ID_LIST LONGTEXT,
+    PRIMARY KEY (ERROR_ID, TASK_ID),
+    CONSTRAINT FK_TASK_ERROR_TASK FOREIGN KEY (TASK_ID) REFERENCES TASK (TASK_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS JOB (
+    JOB_ID                    VARCHAR(255) NOT NULL,
+    TASK_ID                   VARCHAR(255) NOT NULL,
+    PROCESS_ID                VARCHAR(255),
+    JOB_DESCRIPTION           LONGTEXT,
+    CREATION_TIME             TIMESTAMP NULL,
+    COMPUTE_RESOURCE_CONSUMED VARCHAR(255),
+    JOB_NAME                  VARCHAR(255),
+    WORKING_DIR               VARCHAR(255),
+    STD_OUT                   LONGTEXT,
+    STD_ERR                   LONGTEXT,
+    EXIT_CODE                 INT NOT NULL DEFAULT 0,
+    PRIMARY KEY (JOB_ID, TASK_ID),
+    CONSTRAINT FK_JOB_TASK FOREIGN KEY (TASK_ID) REFERENCES TASK (TASK_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS JOB_STATUS (
+    STATUS_ID            VARCHAR(255) NOT NULL,
+    JOB_ID               VARCHAR(255) NOT NULL,
+    TASK_ID              VARCHAR(255) NOT NULL,
+    STATE                VARCHAR(255),
+    TIME_OF_STATE_CHANGE TIMESTAMP NULL,
+    REASON               LONGTEXT,
+    PRIMARY KEY (STATUS_ID, JOB_ID, TASK_ID),
+    CONSTRAINT FK_JOB_STATUS_JOB FOREIGN KEY (JOB_ID, TASK_ID) REFERENCES JOB (JOB_ID, TASK_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- ============================================================================
+-- 2. APPLICATION CATALOG
+-- ============================================================================
+
+CREATE TABLE IF NOT EXISTS 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)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS GATEWAY_PROFILE (
+    GATEWAY_ID                     VARCHAR(255) NOT NULL,
+    CREATION_TIME                  TIMESTAMP NULL,
+    CS_TOKEN                       VARCHAR(255),
+    IDENTITY_SERVER_PWD_CRED_TOKEN VARCHAR(255),
+    IDENTITY_SERVER_TENANT         VARCHAR(255),
+    UPDATE_TIME                    TIMESTAMP NULL,
+    PRIMARY KEY (GATEWAY_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS GROUP_RESOURCE_PROFILE (
+    GROUP_RESOURCE_PROFILE_ID      VARCHAR(255) NOT NULL,
+    GATEWAY_ID                     VARCHAR(255),
+    GROUP_RESOURCE_PROFILE_NAME    VARCHAR(255),
+    CREATION_TIME                  BIGINT,
+    UPDATE_TIME                    BIGINT,
+    DEFAULT_CREDENTIAL_STORE_TOKEN VARCHAR(255),
+    PRIMARY KEY (GROUP_RESOURCE_PROFILE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS COMPUTE_RESOURCE (
+    RESOURCE_ID                   VARCHAR(255) NOT NULL,
+    CREATION_TIME                 TIMESTAMP NULL,
+    ENABLED                       SMALLINT,
+    GATEWAY_USAGE_EXECUTABLE      VARCHAR(255),
+    GATEWAY_USAGE_MODULE_LOAD_CMD VARCHAR(255),
+    GATEWAY_USAGE_REPORTING       TINYINT(1),
+    HOST_NAME                     VARCHAR(255),
+    MAX_MEMORY_NODE               INT,
+    RESOURCE_DESCRIPTION          VARCHAR(255),
+    UPDATE_TIME                   TIMESTAMP NULL,
+    CPUS_PER_NODE                 INT,
+    DEFAULT_NODE_COUNT            INT,
+    DEFAULT_CPU_COUNT             INT,
+    DEFAULT_WALLTIME              INT,
+    PRIMARY KEY (RESOURCE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS HOST_ALIAS (
+    RESOURCE_ID VARCHAR(255) NOT NULL,
+    ALIAS       VARCHAR(255),
+    CONSTRAINT FK_HOST_ALIAS_RESOURCE FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE (RESOURCE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS HOST_IPADDRESS (
+    RESOURCE_ID VARCHAR(255) NOT NULL,
+    IP_ADDRESS  VARCHAR(255),
+    CONSTRAINT FK_HOST_IPADDRESS_RESOURCE FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE (RESOURCE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS COMPUTE_RESOURCE_FILE_SYSTEM (
+    COMPUTE_RESOURCE_ID VARCHAR(255) NOT NULL,
+    FILE_SYSTEM         VARCHAR(255) NOT NULL,
+    PATH                VARCHAR(255),
+    PRIMARY KEY (COMPUTE_RESOURCE_ID, FILE_SYSTEM),
+    CONSTRAINT FK_CRFS_RESOURCE FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE (RESOURCE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS RESOURCE_JOB_MANAGER (
+    RESOURCE_JOB_MANAGER_ID   VARCHAR(255) NOT NULL,
+    CREATION_TIME              TIMESTAMP NOT NULL,
+    JOB_MANAGER_BIN_PATH      VARCHAR(255),
+    PUSH_MONITORING_ENDPOINT   VARCHAR(255),
+    RESOURCE_JOB_MANAGER_TYPE  VARCHAR(255),
+    UPDATE_TIME                TIMESTAMP NULL,
+    PRIMARY KEY (RESOURCE_JOB_MANAGER_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS 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),
+    CONSTRAINT FK_JMC_RJM FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER (RESOURCE_JOB_MANAGER_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS 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),
+    CONSTRAINT FK_PC_RJM FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER (RESOURCE_JOB_MANAGER_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS BATCH_QUEUE (
+    COMPUTE_RESOURCE_ID   VARCHAR(255) NOT NULL,
+    QUEUE_NAME            VARCHAR(255) NOT NULL,
+    MAX_JOB_IN_QUEUE      INT,
+    MAX_MEMORY            INT,
+    MAX_NODES             INT,
+    MAX_PROCESSORS        INT,
+    MAX_RUNTIME           INT,
+    QUEUE_DESCRIPTION     VARCHAR(255),
+    CPU_PER_NODE          INT,
+    DEFAULT_NODE_COUNT    INT,
+    DEFAULT_CPU_COUNT     INT,
+    DEFAULT_WALLTIME      INT,
+    QUEUE_SPECIFIC_MACROS VARCHAR(255),
+    IS_DEFAULT_QUEUE      TINYINT(1),
+    PRIMARY KEY (COMPUTE_RESOURCE_ID, QUEUE_NAME),
+    CONSTRAINT FK_BQ_RESOURCE FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE (RESOURCE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS JOB_SUBMISSION_INTERFACE (
+    COMPUTE_RESOURCE_ID         VARCHAR(255) NOT NULL,
+    JOB_SUBMISSION_INTERFACE_ID VARCHAR(255) NOT NULL,
+    CREATION_TIME               TIMESTAMP NULL,
+    JOB_SUBMISSION_PROTOCOL     VARCHAR(255),
+    PRIORITY_ORDER              INT,
+    UPDATE_TIME                 TIMESTAMP NULL,
+    PRIMARY KEY (COMPUTE_RESOURCE_ID, JOB_SUBMISSION_INTERFACE_ID),
+    CONSTRAINT FK_JSI_RESOURCE FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE (RESOURCE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS DATA_MOVEMENT_INTERFACE (
+    COMPUTE_RESOURCE_ID        VARCHAR(255) NOT NULL,
+    DATA_MOVEMENT_INTERFACE_ID VARCHAR(255) NOT NULL,
+    CREATION_TIME              TIMESTAMP NULL,
+    DATA_MOVEMENT_PROTOCOL     VARCHAR(255),
+    PRIORITY_ORDER             INT,
+    UPDATE_TIME                TIMESTAMP NULL,
+    PRIMARY KEY (COMPUTE_RESOURCE_ID, DATA_MOVEMENT_INTERFACE_ID),
+    CONSTRAINT FK_DMI_RESOURCE FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE (RESOURCE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS SSH_JOB_SUBMISSION (
+    JOB_SUBMISSION_INTERFACE_ID VARCHAR(255) NOT NULL,
+    RESOURCE_JOB_MANAGER_ID    VARCHAR(255) NOT NULL,
+    ALTERNATIVE_SSH_HOSTNAME   VARCHAR(255),
+    CREATION_TIME              TIMESTAMP NOT NULL,
+    MONITOR_MODE               VARCHAR(255),
+    SECURITY_PROTOCOL          VARCHAR(255),
+    SSH_PORT                   INT,
+    UPDATE_TIME                TIMESTAMP NULL,
+    PRIMARY KEY (JOB_SUBMISSION_INTERFACE_ID),
+    CONSTRAINT FK_SJS_RJM FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER (RESOURCE_JOB_MANAGER_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS LOCAL_SUBMISSION (
+    JOB_SUBMISSION_INTERFACE_ID VARCHAR(255) NOT NULL,
+    CREATION_TIME               TIMESTAMP NULL,
+    UPDATE_TIME                 TIMESTAMP NULL,
+    RESOURCE_JOB_MANAGER_ID    VARCHAR(255),
+    SECURITY_PROTOCOL          VARCHAR(255),
+    PRIMARY KEY (JOB_SUBMISSION_INTERFACE_ID),
+    CONSTRAINT FK_LS_RJM FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER (RESOURCE_JOB_MANAGER_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS GLOBUS_SUBMISSION (
+    SUBMISSION_ID        VARCHAR(255) NOT NULL,
+    RESOURCE_JOB_MANAGER VARCHAR(255),
+    SECURITY_PROTOCAL    VARCHAR(255),
+    PRIMARY KEY (SUBMISSION_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS GLOBUS_GK_ENDPOINT (
+    SUBMISSION_ID VARCHAR(255) NOT NULL,
+    ENDPOINT      VARCHAR(255) NOT NULL,
+    PRIMARY KEY (SUBMISSION_ID, ENDPOINT)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS GSISSH_SUBMISSION (
+    SUBMISSION_ID        VARCHAR(255) NOT NULL,
+    INSTALLED_PATH       VARCHAR(255),
+    MONITOR_MODE         VARCHAR(255),
+    RESOURCE_JOB_MANAGER VARCHAR(255),
+    SSH_PORT             INT,
+    PRIMARY KEY (SUBMISSION_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS GSISSH_EXPORT (
+    SUBMISSION_ID VARCHAR(255) NOT NULL,
+    EXPORT        VARCHAR(255) NOT NULL,
+    PRIMARY KEY (SUBMISSION_ID, EXPORT)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS GSISSH_POSTJOBCOMMAND (
+    SUBMISSION_ID VARCHAR(255) NOT NULL,
+    COMMAND       VARCHAR(255) NOT NULL,
+    PRIMARY KEY (SUBMISSION_ID, COMMAND)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS GSISSH_PREJOBCOMMAND (
+    SUBMISSION_ID VARCHAR(255) NOT NULL,
+    COMMAND       VARCHAR(255) NOT NULL,
+    PRIMARY KEY (SUBMISSION_ID, COMMAND)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS UNICORE_SUBMISSION (
+    SUBMISSION_ID        VARCHAR(255) NOT NULL,
+    SECURITY_PROTOCAL    VARCHAR(255),
+    UNICORE_ENDPOINT_URL VARCHAR(255),
+    PRIMARY KEY (SUBMISSION_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS CLOUD_JOB_SUBMISSION (
+    JOB_SUBMISSION_INTERFACE_ID VARCHAR(255) NOT NULL,
+    SECURITY_PROTOCOL           VARCHAR(255),
+    NODE_ID                     VARCHAR(255),
+    EXECUTABLE_TYPE             VARCHAR(255),
+    PROVIDER_NAME               VARCHAR(255),
+    USER_ACCOUNT_NAME           VARCHAR(255),
+    PRIMARY KEY (JOB_SUBMISSION_INTERFACE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS GRIDFTP_DATA_MOVEMENT (
+    DATA_MOVEMENT_INTERFACE_ID VARCHAR(255) NOT NULL,
+    CREATION_TIME              TIMESTAMP NULL,
+    SECURITY_PROTOCOL          VARCHAR(255),
+    UPDATE_TIME                TIMESTAMP NULL,
+    PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS GRIDFTP_ENDPOINT (
+    DATA_MOVEMENT_INTERFACE_ID VARCHAR(255) NOT NULL,
+    ENDPOINT                   VARCHAR(255) NOT NULL,
+    CREATION_TIME              TIMESTAMP NULL,
+    UPDATE_TIME                TIMESTAMP NULL,
+    PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID, ENDPOINT),
+    CONSTRAINT FK_GE_DMI FOREIGN KEY (DATA_MOVEMENT_INTERFACE_ID) REFERENCES GRIDFTP_DATA_MOVEMENT (DATA_MOVEMENT_INTERFACE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS SCP_DATA_MOVEMENT (
+    DATA_MOVEMENT_INTERFACE_ID VARCHAR(255) NOT NULL,
+    ALTERNATIVE_SCP_HOSTNAME   VARCHAR(255),
+    CREATION_TIME              TIMESTAMP NULL,
+    QUEUE_DESCRIPTION          VARCHAR(255),
+    SECURITY_PROTOCOL          VARCHAR(255),
+    SSH_PORT                   INT,
+    UPDATE_TIME                TIMESTAMP NULL,
+    PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS LOCAL_DATA_MOVEMENT (
+    DATA_MOVEMENT_INTERFACE_ID VARCHAR(255) NOT NULL,
+    PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS UNICORE_DATAMOVEMENT (
+    DATAMOVEMENT_ID      VARCHAR(255) NOT NULL,
+    SECURITY_PROTOCAL    VARCHAR(255),
+    UNICORE_ENDPOINT_URL VARCHAR(255),
+    PRIMARY KEY (DATAMOVEMENT_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS STORAGE_RESOURCE (
+    STORAGE_RESOURCE_ID VARCHAR(255) NOT NULL,
+    CREATION_TIME       TIMESTAMP NULL,
+    DESCRIPTION         VARCHAR(255),
+    ENABLED             TINYINT(1),
+    HOST_NAME           VARCHAR(255),
+    UPDATE_TIME         TIMESTAMP NULL,
+    PRIMARY KEY (STORAGE_RESOURCE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS STORAGE_INTERFACE (
+    STORAGE_RESOURCE_ID        VARCHAR(255) NOT NULL,
+    DATA_MOVEMENT_INTERFACE_ID VARCHAR(255) NOT NULL,
+    CREATION_TIME              TIMESTAMP NULL,
+    DATA_MOVEMENT_PROTOCOL     VARCHAR(255),
+    PRIORITY_ORDER             INT,
+    UPDATE_TIME                TIMESTAMP NULL,
+    PRIMARY KEY (STORAGE_RESOURCE_ID, DATA_MOVEMENT_INTERFACE_ID),
+    CONSTRAINT FK_SI_SR FOREIGN KEY (STORAGE_RESOURCE_ID) REFERENCES STORAGE_RESOURCE (STORAGE_RESOURCE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS COMPUTE_RESOURCE_PREFERENCE (
+    GATEWAY_ID                              VARCHAR(255) NOT NULL,
+    RESOURCE_ID                             VARCHAR(255) NOT NULL,
+    ALLOCATION_PROJECT_NUMBER               VARCHAR(255),
+    LOGIN_USERNAME                          VARCHAR(255),
+    OVERRIDE_BY_AIRAVATA                    TINYINT(1),
+    PREFERED_BATCH_QUEUE                    VARCHAR(255),
+    PREFERED_DATA_MOVE_PROTOCOL             VARCHAR(255),
+    PREFERED_JOB_SUB_PROTOCOL               VARCHAR(255),
+    QUALITY_OF_SERVICE                      VARCHAR(255),
+    RESERVATION                             VARCHAR(255),
+    RESERVATION_END_TIME                    TIMESTAMP NULL,
+    RESERVATION_START_TIME                  TIMESTAMP NULL,
+    RESOURCE_CS_TOKEN                       VARCHAR(255),
+    SCRATCH_LOCATION                        VARCHAR(255),
+    USAGE_REPORTING_GATEWAY_ID              VARCHAR(255),
+    SSH_ACCOUNT_PROVISIONER                 VARCHAR(255),
+    SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO VARCHAR(255),
+    PRIMARY KEY (GATEWAY_ID, RESOURCE_ID),
+    CONSTRAINT FK_CRP_GP FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY_PROFILE (GATEWAY_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS 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),
+    CONSTRAINT FK_SAPC_CRP FOREIGN KEY (GATEWAY_ID, RESOURCE_ID)
+        REFERENCES COMPUTE_RESOURCE_PREFERENCE (GATEWAY_ID, RESOURCE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS STORAGE_PREFERENCE (
+    GATEWAY_ID          VARCHAR(255) NOT NULL,
+    STORAGE_RESOURCE_ID VARCHAR(255) NOT NULL,
+    FS_ROOT_LOCATION    VARCHAR(255),
+    LOGIN_USERNAME      VARCHAR(255),
+    RESOURCE_CS_TOKEN   VARCHAR(255),
+    PRIMARY KEY (GATEWAY_ID, STORAGE_RESOURCE_ID),
+    CONSTRAINT FK_SP_GP FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY_PROFILE (GATEWAY_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS GROUP_COMPUTE_RESOURCE_PREFERENCE (
+    RESOURCE_ID                 VARCHAR(255) NOT NULL,
+    GROUP_RESOURCE_PROFILE_ID   VARCHAR(255) NOT NULL,
+    RESOURCE_TYPE               VARCHAR(31) NOT NULL,
+    LOGIN_USERNAME              VARCHAR(255),
+    SCRATCH_LOCATION            VARCHAR(255),
+    OVERRIDE_BY_AIRAVATA        SMALLINT,
+    PREFERED_DATA_MOVE_PROTOCOL VARCHAR(255),
+    PREFERED_JOB_SUB_PROTOCOL   VARCHAR(255),
+    RESOURCE_CS_TOKEN           VARCHAR(255),
+    PRIMARY KEY (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID),
+    CONSTRAINT FK_GCRP_GRP FOREIGN KEY (GROUP_RESOURCE_PROFILE_ID)
+        REFERENCES GROUP_RESOURCE_PROFILE (GROUP_RESOURCE_PROFILE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS SLURM_GROUP_COMPUTE_RESOURCE_PREFERENCE (
+    RESOURCE_ID                             VARCHAR(255) NOT NULL,
+    GROUP_RESOURCE_PROFILE_ID               VARCHAR(255) NOT NULL,
+    ALLOCATION_PROJECT_NUMBER               VARCHAR(255),
+    PREFERED_BATCH_QUEUE                    VARCHAR(255),
+    QUALITY_OF_SERVICE                      VARCHAR(255),
+    USAGE_REPORTING_GATEWAY_ID              VARCHAR(255),
+    SSH_ACCOUNT_PROVISIONER                 VARCHAR(255),
+    SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO VARCHAR(255),
+    PRIMARY KEY (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID),
+    CONSTRAINT FK_SGCRP_GCRP FOREIGN KEY (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID)
+        REFERENCES GROUP_COMPUTE_RESOURCE_PREFERENCE (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS AWS_GROUP_COMPUTE_RESOURCE_PREFERENCE (
+    RESOURCE_ID               VARCHAR(255) NOT NULL,
+    GROUP_RESOURCE_PROFILE_ID VARCHAR(255) NOT NULL,
+    AWS_REGION                VARCHAR(255) NOT NULL,
+    PREFERRED_AMI_ID          VARCHAR(255) NOT NULL,
+    PREFERRED_INSTANCE_TYPE   VARCHAR(255) NOT NULL,
+    PRIMARY KEY (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID),
+    CONSTRAINT FK_AGCRP_GCRP FOREIGN KEY (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID)
+        REFERENCES GROUP_COMPUTE_RESOURCE_PREFERENCE (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS 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, GROUP_RESOURCE_PROFILE_ID, CONFIG_NAME),
+    CONSTRAINT FK_GSAPC_GCRP FOREIGN KEY (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID)
+        REFERENCES GROUP_COMPUTE_RESOURCE_PREFERENCE (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS COMPUTE_RESOURCE_RESERVATION (
+    RESERVATION_ID            VARCHAR(255) NOT NULL,
+    RESERVATION_NAME          VARCHAR(255) NOT NULL,
+    START_TIME                TIMESTAMP NOT NULL,
+    END_TIME                  TIMESTAMP NOT NULL,
+    RESOURCE_ID               VARCHAR(255) NOT NULL,
+    GROUP_RESOURCE_PROFILE_ID VARCHAR(255) NOT NULL,
+    PRIMARY KEY (RESERVATION_ID),
+    CONSTRAINT FK_CRR_GCRP FOREIGN KEY (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID)
+        REFERENCES GROUP_COMPUTE_RESOURCE_PREFERENCE (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS COMPUTE_RESOURCE_RESERVATION_QUEUE (
+    RESERVATION_ID VARCHAR(255) NOT NULL,
+    QUEUE_NAME     VARCHAR(255) NOT NULL,
+    CONSTRAINT FK_CRRQ_CRR FOREIGN KEY (RESERVATION_ID) REFERENCES COMPUTE_RESOURCE_RESERVATION (RESERVATION_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS COMPUTE_RESOURCE_POLICY (
+    RESOURCE_POLICY_ID        VARCHAR(255) NOT NULL,
+    COMPUTE_RESOURCE_ID       VARCHAR(255),
+    GROUP_RESOURCE_PROFILE_ID VARCHAR(255) NOT NULL,
+    PRIMARY KEY (RESOURCE_POLICY_ID),
+    CONSTRAINT FK_CRP2_GRP FOREIGN KEY (GROUP_RESOURCE_PROFILE_ID)
+        REFERENCES GROUP_RESOURCE_PROFILE (GROUP_RESOURCE_PROFILE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS COMPUTE_RESOURCE_POLICY_QUEUES (
+    RESOURCE_POLICY_ID VARCHAR(255) NOT NULL,
+    QUEUE_NAME         VARCHAR(255),
+    CONSTRAINT FK_CRPQ_CRP FOREIGN KEY (RESOURCE_POLICY_ID) REFERENCES COMPUTE_RESOURCE_POLICY (RESOURCE_POLICY_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS BATCH_QUEUE_RESOURCE_POLICY (
+    RESOURCE_POLICY_ID        VARCHAR(255) NOT NULL,
+    COMPUTE_RESOURCE_ID       VARCHAR(255),
+    GROUP_RESOURCE_PROFILE_ID VARCHAR(255) NOT NULL,
+    QUEUE_NAME                VARCHAR(255),
+    MAX_ALLOWED_NODES         INT,
+    MAX_ALLOWED_CORES         INT,
+    MAX_ALLOWED_WALLTIME      INT,
+    PRIMARY KEY (RESOURCE_POLICY_ID),
+    CONSTRAINT FK_BQRP_GRP FOREIGN KEY (GROUP_RESOURCE_PROFILE_ID)
+        REFERENCES GROUP_RESOURCE_PROFILE (GROUP_RESOURCE_PROFILE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS APPLICATION_MODULE (
+    MODULE_ID      VARCHAR(255) NOT NULL,
+    CREATION_TIME  TIMESTAMP NOT NULL,
+    GATEWAY_ID     VARCHAR(255) NOT NULL,
+    MODULE_DESC    VARCHAR(255),
+    MODULE_NAME    VARCHAR(255),
+    MODULE_VERSION VARCHAR(255),
+    UPDATE_TIME    TIMESTAMP NOT NULL,
+    PRIMARY KEY (MODULE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS APPLICATION_INTERFACE (
+    INTERFACE_ID              VARCHAR(255) NOT NULL,
+    APPLICATION_DESCRIPTION   VARCHAR(255),
+    APPLICATION_NAME          VARCHAR(255),
+    ARCHIVE_WORKING_DIRECTORY TINYINT(1),
+    CREATION_TIME             TIMESTAMP NOT NULL,
+    GATEWAY_ID                VARCHAR(255) NOT NULL,
+    UPDATE_TIME               TIMESTAMP NOT NULL,
+    HAS_OPTIONAL_FILE_INPUTS  TINYINT(1),
+    CLEAN_AFTER_STAGED        TINYINT(1),
+    PRIMARY KEY (INTERFACE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS APP_MODULE_MAPPING (
+    INTERFACE_ID VARCHAR(255) NOT NULL,
+    MODULE_ID    VARCHAR(255) NOT NULL,
+    PRIMARY KEY (INTERFACE_ID, MODULE_ID),
+    CONSTRAINT FK_AMM_AI FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE (INTERFACE_ID),
+    CONSTRAINT FK_AMM_AM FOREIGN KEY (MODULE_ID) REFERENCES APPLICATION_MODULE (MODULE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS APPLICATION_INPUT (
+    INTERFACE_ID            VARCHAR(255) NOT NULL,
+    INPUT_KEY               VARCHAR(255) NOT NULL,
+    APP_ARGUMENT            VARCHAR(255),
+    DATA_STAGED             TINYINT(1),
+    DATA_TYPE               VARCHAR(255),
+    INPUT_ORDER             INT,
+    INPUT_VALUE             VARCHAR(255),
+    IS_REQUIRED             TINYINT(1),
+    METADATA                VARCHAR(4096),
+    REQUIRED_TO_COMMANDLINE TINYINT(1),
+    STANDARD_INPUT          TINYINT(1),
+    USER_FRIENDLY_DESC      LONGTEXT,
+    IS_READ_ONLY            TINYINT(1),
+    OVERRIDE_FILENAME       VARCHAR(255),
+    PRIMARY KEY (INTERFACE_ID, INPUT_KEY),
+    CONSTRAINT FK_AI_AIF FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE (INTERFACE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS APPLICATION_OUTPUT (
+    INTERFACE_ID            VARCHAR(255) NOT NULL,
+    OUTPUT_KEY              VARCHAR(255) NOT NULL,
+    APP_ARGUMENT            VARCHAR(255),
+    DATA_MOVEMENT           TINYINT(1),
+    DATA_NAME_LOCATION      VARCHAR(255),
+    DATA_TYPE               VARCHAR(255),
+    IS_REQUIRED             TINYINT(1),
+    OUTPUT_STREAMING        TINYINT(1),
+    OUTPUT_VALUE            VARCHAR(255),
+    REQUIRED_TO_COMMANDLINE TINYINT(1),
+    SEARCH_QUERY            VARCHAR(255),
+    METADATA                VARCHAR(4096),
+    PRIMARY KEY (INTERFACE_ID, OUTPUT_KEY),
+    CONSTRAINT FK_AO_AIF FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE (INTERFACE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS APPLICATION_DEPLOYMENT (
+    DEPLOYMENT_ID       VARCHAR(255) NOT NULL,
+    APPLICATION_DESC    VARCHAR(255),
+    CREATION_TIME       TIMESTAMP NOT NULL,
+    ENV_MODULE_LOAD_CMD VARCHAR(255),
+    EXECUTABLE_PATH     VARCHAR(255),
+    GATEWAY_ID          VARCHAR(255) NOT NULL,
+    parallelism         VARCHAR(255),
+    UPDATE_TIME         TIMESTAMP NOT NULL,
+    COMPUTE_HOSTID      VARCHAR(255),
+    APP_MODULE_ID       VARCHAR(255),
+    DEFAULT_NODE_COUNT  INT,
+    DEFAULT_CPU_COUNT   INT,
+    DEFAULT_WALLTIME    INT,
+    DEFAULT_QUEUE_NAME  VARCHAR(255),
+    EDITABLE_BY_USER    TINYINT(1),
+    PRIMARY KEY (DEPLOYMENT_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS MODULE_LOAD_CMD (
+    APP_DEPLOYMENT_ID VARCHAR(255) NOT NULL,
+    CMD               VARCHAR(255) NOT NULL,
+    COMMAND_ORDER     INT,
+    PRIMARY KEY (APP_DEPLOYMENT_ID, CMD),
+    CONSTRAINT FK_MLC_AD FOREIGN KEY (APP_DEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT (DEPLOYMENT_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS APP_ENVIRONMENT (
+    DEPLOYMENT_ID VARCHAR(255) NOT NULL,
+    NAME          VARCHAR(255) NOT NULL,
+    VALUE         VARCHAR(255),
+    ENV_ORDER     INT,
+    PRIMARY KEY (DEPLOYMENT_ID, NAME),
+    CONSTRAINT FK_AE_AD FOREIGN KEY (DEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT (DEPLOYMENT_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS LIBRARY_PREPAND_PATH (
+    DEPLOYMENT_ID VARCHAR(255) NOT NULL,
+    NAME          VARCHAR(255) NOT NULL,
+    VALUE         VARCHAR(255),
+    PRIMARY KEY (DEPLOYMENT_ID, NAME),
+    CONSTRAINT FK_LPP_AD FOREIGN KEY (DEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT (DEPLOYMENT_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS LIBRARY_APEND_PATH (
+    DEPLOYMENT_ID VARCHAR(255) NOT NULL,
+    NAME          VARCHAR(255) NOT NULL,
+    VALUE         VARCHAR(255),
+    PRIMARY KEY (DEPLOYMENT_ID, NAME),
+    CONSTRAINT FK_LAP_AD FOREIGN KEY (DEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT (DEPLOYMENT_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS PREJOB_COMMAND (
+    APPDEPLOYMENT_ID VARCHAR(255) NOT NULL,
+    COMMAND          VARCHAR(255) NOT NULL,
+    COMMAND_ORDER    INT,
+    PRIMARY KEY (APPDEPLOYMENT_ID, COMMAND),
+    CONSTRAINT FK_PC2_AD FOREIGN KEY (APPDEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT (DEPLOYMENT_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS POSTJOB_COMMAND (
+    APPDEPLOYMENT_ID VARCHAR(255) NOT NULL,
+    COMMAND          VARCHAR(255) NOT NULL,
+    COMMAND_ORDER    INT,
+    PRIMARY KEY (APPDEPLOYMENT_ID, COMMAND),
+    CONSTRAINT FK_POC_AD FOREIGN KEY (APPDEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT (DEPLOYMENT_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS USER_RESOURCE_PROFILE (
+    USER_ID                        VARCHAR(255) NOT NULL,
+    GATEWAY_ID                     VARCHAR(255) NOT NULL,
+    CS_TOKEN                       VARCHAR(255),
+    IDENTITY_SERVER_PWD_CRED_TOKEN VARCHAR(255),
+    IDENTITY_SERVER_TENANT         VARCHAR(255),
+    CREATION_TIME                  TIMESTAMP NULL,
+    UPDATE_TIME                    TIMESTAMP NULL,
+    PRIMARY KEY (USER_ID, GATEWAY_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS USER_COMPUTE_RESOURCE_PREFERENCE (
+    RESOURCE_ID               VARCHAR(255) NOT NULL,
+    USER_ID                   VARCHAR(255) NOT NULL,
+    GATEWAY_ID                VARCHAR(255) NOT NULL,
+    PREFERED_BATCH_QUEUE      VARCHAR(255),
+    RESOURCE_CS_TOKEN         VARCHAR(255),
+    LOGIN_USERNAME            VARCHAR(255),
+    ALLOCATION_PROJECT_NUMBER VARCHAR(255),
+    QUALITY_OF_SERVICE        VARCHAR(255),
+    RESERVATION               VARCHAR(255),
+    RESERVATION_START_TIME    TIMESTAMP NULL,
+    RESERVATION_END_TIME      TIMESTAMP NULL,
+    SCRATCH_LOCATION          VARCHAR(255),
+    VALIDATED                 TINYINT(1),
+    PRIMARY KEY (RESOURCE_ID, USER_ID, GATEWAY_ID),
+    CONSTRAINT FK_UCRP_URP FOREIGN KEY (USER_ID, GATEWAY_ID)
+        REFERENCES USER_RESOURCE_PROFILE (USER_ID, GATEWAY_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS USER_STORAGE_PREFERENCE (
+    STORAGE_RESOURCE_ID VARCHAR(255) NOT NULL,
+    USER_ID             VARCHAR(255) NOT NULL,
+    GATEWAY_ID          VARCHAR(255) NOT NULL,
+    RESOURCE_CS_TOKEN   VARCHAR(255),
+    FS_ROOT_LOCATION    VARCHAR(255),
+    LOGIN_USERNAME      VARCHAR(255),
+    PRIMARY KEY (STORAGE_RESOURCE_ID, USER_ID, GATEWAY_ID),
+    CONSTRAINT FK_USP_URP FOREIGN KEY (USER_ID, GATEWAY_ID)
+        REFERENCES USER_RESOURCE_PROFILE (USER_ID, GATEWAY_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS PARSER (
+    PARSER_ID         VARCHAR(255) NOT NULL,
+    IMAGE_NAME        VARCHAR(255),
+    OUTPUT_DIR_PATH   VARCHAR(255),
+    INPUT_DIR_PATH    VARCHAR(255),
+    EXECUTION_COMMAND VARCHAR(255),
+    GATEWAY_ID        VARCHAR(255),
+    PRIMARY KEY (PARSER_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS PARSER_INPUT (
+    PARSER_INPUT_ID       VARCHAR(255) NOT NULL,
+    PARSER_INPUT_NAME     VARCHAR(255),
+    PARSER_INPUT_REQUIRED TINYINT(1),
+    PARSER_ID             VARCHAR(255),
+    INPUT_TYPE            VARCHAR(255),
+    PRIMARY KEY (PARSER_INPUT_ID),
+    CONSTRAINT FK_PI_P FOREIGN KEY (PARSER_ID) REFERENCES PARSER (PARSER_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS PARSER_OUTPUT (
+    PARSER_OUTPUT_ID       VARCHAR(255) NOT NULL,
+    PARSER_OUTPUT_NAME     VARCHAR(255),
+    PARSER_OUTPUT_REQUIRED TINYINT(1),
+    PARSER_ID              VARCHAR(255),
+    OUTPUT_TYPE            VARCHAR(255),
+    PRIMARY KEY (PARSER_OUTPUT_ID),
+    CONSTRAINT FK_PO_P FOREIGN KEY (PARSER_ID) REFERENCES PARSER (PARSER_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS PARSING_TEMPLATE (
+    PARSING_TEMPLATE_ID VARCHAR(255) NOT NULL,
+    APP_INTERFACE_ID    VARCHAR(255),
+    GATEWAY_ID          VARCHAR(255),
+    PRIMARY KEY (PARSING_TEMPLATE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS PARSING_TEMPLATE_INPUT (
+    PARSING_TEMPLATE_INPUT_ID VARCHAR(255) NOT NULL,
+    TARGET_PARSER_INPUT_ID    VARCHAR(255),
+    APPLICATION_OUTPUT_NAME   VARCHAR(255),
+    VALUE                     VARCHAR(255),
+    PARSING_TEMPLATE_ID       VARCHAR(255),
+    PRIMARY KEY (PARSING_TEMPLATE_INPUT_ID),
+    CONSTRAINT FK_PTI_PI FOREIGN KEY (TARGET_PARSER_INPUT_ID) REFERENCES PARSER_INPUT (PARSER_INPUT_ID),
+    CONSTRAINT FK_PTI_PT FOREIGN KEY (PARSING_TEMPLATE_ID) REFERENCES PARSING_TEMPLATE (PARSING_TEMPLATE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS PARSER_CONNECTOR (
+    PARSER_CONNECTOR_ID VARCHAR(255) NOT NULL,
+    PARENT_PARSER_ID    VARCHAR(255),
+    CHILD_PARSER_ID     VARCHAR(255),
+    PARSING_TEMPLATE_ID VARCHAR(255),
+    PRIMARY KEY (PARSER_CONNECTOR_ID),
+    CONSTRAINT FK_PC3_PP FOREIGN KEY (PARENT_PARSER_ID) REFERENCES PARSER (PARSER_ID),
+    CONSTRAINT FK_PC3_CP FOREIGN KEY (CHILD_PARSER_ID) REFERENCES PARSER (PARSER_ID),
+    CONSTRAINT FK_PC3_PT FOREIGN KEY (PARSING_TEMPLATE_ID) REFERENCES PARSING_TEMPLATE (PARSING_TEMPLATE_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS PARSER_CONNECTOR_INPUT (
+    PARSER_CONNECTOR_INPUT_ID VARCHAR(255) NOT NULL,
+    PARSER_INPUT_ID           VARCHAR(255),
+    PARSER_OUTPUT_ID          VARCHAR(255),
+    VALUE                     VARCHAR(255),
+    PARSER_CONNECTOR_ID       VARCHAR(255),
+    PRIMARY KEY (PARSER_CONNECTOR_INPUT_ID),
+    CONSTRAINT FK_PCI_PI FOREIGN KEY (PARSER_INPUT_ID) REFERENCES PARSER_INPUT (PARSER_INPUT_ID),
+    CONSTRAINT FK_PCI_PO FOREIGN KEY (PARSER_OUTPUT_ID) REFERENCES PARSER_OUTPUT (PARSER_OUTPUT_ID),
+    CONSTRAINT FK_PCI_PC FOREIGN KEY (PARSER_CONNECTOR_ID) REFERENCES PARSER_CONNECTOR (PARSER_CONNECTOR_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- ============================================================================
+-- 3. AIRAVATA WORKFLOW CATALOG
+-- ============================================================================
+
+CREATE TABLE IF NOT EXISTS AIRAVATA_WORKFLOW (
+    ID            VARCHAR(255) NOT NULL,
+    EXPERIMENT_ID VARCHAR(255),
+    DESCRIPTION   VARCHAR(255),
+    CREATED_AT    TIMESTAMP NULL,
+    UPDATED_AT    TIMESTAMP NULL,
+    PRIMARY KEY (ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS AIRAVATA_WORKFLOW_STATUS (
+    ID          VARCHAR(255) NOT NULL,
+    WORKFLOW_ID VARCHAR(255) NOT NULL,
+    STATE       VARCHAR(255),
+    DESCRIPTION VARCHAR(255),
+    UPDATED_AT  TIMESTAMP NULL,
+    PRIMARY KEY (ID, WORKFLOW_ID),
+    CONSTRAINT FK_AW_STATUS_WORKFLOW FOREIGN KEY (WORKFLOW_ID) REFERENCES AIRAVATA_WORKFLOW (ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS AIRAVATA_WORKFLOW_ERROR (
+    ERROR_ID                 VARCHAR(255) NOT NULL,
+    WORKFLOW_ID              VARCHAR(255) NOT NULL,
+    CREATION_TIME            TIMESTAMP NULL,
+    ACTUAL_ERROR_MESSAGE     LONGTEXT,
+    USER_FRIENDLY_MESSAGE    LONGTEXT,
+    TRANSIENT_OR_PERSISTENT  TINYINT(1) NOT NULL DEFAULT 0,
+    ROOT_CAUSE_ERROR_ID_LIST LONGTEXT,
+    PRIMARY KEY (ERROR_ID, WORKFLOW_ID),
+    CONSTRAINT FK_AW_ERROR_WORKFLOW FOREIGN KEY (WORKFLOW_ID) REFERENCES AIRAVATA_WORKFLOW (ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS WORKFLOW_DATA_BLOCK (
+    ID          VARCHAR(255) NOT NULL,
+    WORKFLOW_ID VARCHAR(255),
+    VALUE       VARCHAR(255),
+    DATA_TYPE   VARCHAR(255),
+    CREATED_AT  TIMESTAMP NULL,
+    UPDATED_AT  TIMESTAMP NULL,
+    PRIMARY KEY (ID),
+    CONSTRAINT FK_DATA_BLOCK_WORKFLOW FOREIGN KEY (WORKFLOW_ID) REFERENCES AIRAVATA_WORKFLOW (ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS WORKFLOW_HANDLER (
+    ID          VARCHAR(255) NOT NULL,
+    WORKFLOW_ID VARCHAR(255) NOT NULL,
+    TYPE        VARCHAR(255),
+    CREATED_AT  TIMESTAMP NULL,
+    UPDATED_AT  TIMESTAMP NULL,
+    PRIMARY KEY (ID, WORKFLOW_ID),
+    CONSTRAINT FK_HANDLER_WORKFLOW FOREIGN KEY (WORKFLOW_ID) REFERENCES AIRAVATA_WORKFLOW (ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS WORKFLOW_APPLICATION (
+    ID                       VARCHAR(255) NOT NULL,
+    WORKFLOW_ID              VARCHAR(255) NOT NULL,
+    PROCESS_ID               VARCHAR(255),
+    APPLICATION_INTERFACE_ID VARCHAR(255),
+    COMPUTE_RESOURCE_ID      VARCHAR(255),
+    QUEUE_NAME               VARCHAR(255),
+    NODE_COUNT               INT NOT NULL DEFAULT 0,
+    CORE_COUNT               INT NOT NULL DEFAULT 0,
+    WALL_TIME_LIMIT          INT NOT NULL DEFAULT 0,
+    PHYSICAL_MEMORY          INT NOT NULL DEFAULT 0,
+    CREATED_AT               TIMESTAMP NULL,
+    UPDATED_AT               TIMESTAMP NULL,
+    PRIMARY KEY (ID, WORKFLOW_ID),
+    CONSTRAINT FK_APPLICATION_WORKFLOW FOREIGN KEY (WORKFLOW_ID) REFERENCES AIRAVATA_WORKFLOW (ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS WORKFLOW_CONNECTION (
+    ID               VARCHAR(255) NOT NULL,
+    WORKFLOW_ID      VARCHAR(255) NOT NULL,
+    DATA_BLOCK_ID    VARCHAR(255),
+    FROM_TYPE        VARCHAR(255),
+    FROM_ID          VARCHAR(255),
+    FROM_OUTPUT_NAME VARCHAR(255),
+    TO_TYPE          VARCHAR(255),
+    TO_ID            VARCHAR(255),
+    TO_INPUT_NAME    VARCHAR(255),
+    CREATED_AT       TIMESTAMP NULL,
+    UPDATED_AT       TIMESTAMP NULL,
+    PRIMARY KEY (ID, WORKFLOW_ID),
+    CONSTRAINT FK_CONNECTION_WORKFLOW FOREIGN KEY (WORKFLOW_ID) REFERENCES AIRAVATA_WORKFLOW (ID),
+    CONSTRAINT FK_CONNECTION_DATA_BLOCK FOREIGN KEY (DATA_BLOCK_ID) REFERENCES WORKFLOW_DATA_BLOCK (ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS APPLICATION_STATUS (
+    ID             VARCHAR(255) NOT NULL,
+    APPLICATION_ID VARCHAR(255) NOT NULL,
+    STATE          VARCHAR(255),
+    DESCRIPTION    VARCHAR(255),
+    UPDATED_AT     TIMESTAMP NULL,
+    PRIMARY KEY (ID, APPLICATION_ID),
+    CONSTRAINT FK_APP_STATUS_APPLICATION FOREIGN KEY (APPLICATION_ID) REFERENCES WORKFLOW_APPLICATION (ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS APPLICATION_ERROR (
+    ERROR_ID                 VARCHAR(255) NOT NULL,
+    APPLICATION_ID           VARCHAR(255) NOT NULL,
+    CREATION_TIME            TIMESTAMP NULL,
+    ACTUAL_ERROR_MESSAGE     LONGTEXT,
+    USER_FRIENDLY_MESSAGE    LONGTEXT,
+    TRANSIENT_OR_PERSISTENT  TINYINT(1) NOT NULL DEFAULT 0,
+    ROOT_CAUSE_ERROR_ID_LIST LONGTEXT,
+    PRIMARY KEY (ERROR_ID, APPLICATION_ID),
+    CONSTRAINT FK_APP_ERROR_APPLICATION FOREIGN KEY (APPLICATION_ID) REFERENCES WORKFLOW_APPLICATION (ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS HANDLER_STATUS (
+    ID          VARCHAR(255) NOT NULL,
+    HANDLER_ID  VARCHAR(255) NOT NULL,
+    WORKFLOW_ID VARCHAR(255) NOT NULL,
+    STATE       VARCHAR(255),
+    DESCRIPTION VARCHAR(255),
+    UPDATED_AT  TIMESTAMP NULL,
+    PRIMARY KEY (ID, HANDLER_ID),
+    CONSTRAINT FK_HANDLER_STATUS_HANDLER FOREIGN KEY (HANDLER_ID, WORKFLOW_ID)
+        REFERENCES WORKFLOW_HANDLER (ID, WORKFLOW_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS HANDLER_ERROR (
+    ERROR_ID                 VARCHAR(255) NOT NULL,
+    HANDLER_ID               VARCHAR(255) NOT NULL,
+    WORKFLOW_ID              VARCHAR(255) NOT NULL,
+    CREATION_TIME            TIMESTAMP NULL,
+    ACTUAL_ERROR_MESSAGE     LONGTEXT,
+    USER_FRIENDLY_MESSAGE    LONGTEXT,
+    TRANSIENT_OR_PERSISTENT  TINYINT(1) NOT NULL DEFAULT 0,
+    ROOT_CAUSE_ERROR_ID_LIST LONGTEXT,
+    PRIMARY KEY (ERROR_ID, HANDLER_ID),
+    CONSTRAINT FK_HANDLER_ERROR_HANDLER FOREIGN KEY (HANDLER_ID, WORKFLOW_ID)
+        REFERENCES WORKFLOW_HANDLER (ID, WORKFLOW_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS HANDLER_INPUT (
+    HANDLER_ID                        VARCHAR(255) NOT NULL,
+    NAME                              VARCHAR(255) NOT NULL,
+    WORKFLOW_ID                       VARCHAR(255) NOT NULL,
+    VALUE                             LONGTEXT,
+    TYPE                              VARCHAR(255),
+    APPLICATION_ARGUMENT              VARCHAR(255),
+    STANDARD_INPUT                    TINYINT(1) NOT NULL DEFAULT 0,
+    USER_FRIENDLY_DESCRIPTION         VARCHAR(255),
+    METADATA                          VARCHAR(4096),
+    INPUT_ORDER                       INT NOT NULL DEFAULT 0,
+    IS_REQUIRED                       TINYINT(1) NOT NULL DEFAULT 0,
+    REQUIRED_TO_ADDED_TO_COMMAND_LINE TINYINT(1) NOT NULL DEFAULT 0,
+    DATA_STAGED                       TINYINT(1) NOT NULL DEFAULT 0,
+    STORAGE_RESOURCE_ID               VARCHAR(255),
+    IS_READ_ONLY                      TINYINT(1) NOT NULL DEFAULT 0,
+    PRIMARY KEY (HANDLER_ID, NAME),
+    CONSTRAINT FK_HANDLER_INPUT_HANDLER FOREIGN KEY (HANDLER_ID, WORKFLOW_ID)
+        REFERENCES WORKFLOW_HANDLER (ID, WORKFLOW_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS HANDLER_OUTPUT (
+    HANDLER_ID                        VARCHAR(255) NOT NULL,
+    NAME                              VARCHAR(255) NOT NULL,
+    WORKFLOW_ID                       VARCHAR(255) NOT NULL,
+    VALUE                             LONGTEXT,
+    TYPE                              VARCHAR(255),
+    APPLICATION_ARGUMENT              VARCHAR(255),
+    IS_REQUIRED                       TINYINT(1) NOT NULL DEFAULT 0,
+    REQUIRED_TO_ADDED_TO_COMMAND_LINE TINYINT(1) NOT NULL DEFAULT 0,
+    DATA_MOVEMENT                     TINYINT(1) NOT NULL DEFAULT 0,
+    LOCATION                          VARCHAR(255),
+    SEARCH_QUERY                      VARCHAR(255),
+    OUTPUT_STREAMING                  TINYINT(1) NOT NULL DEFAULT 0,
+    STORAGE_RESOURCE_ID               VARCHAR(255),
+    PRIMARY KEY (HANDLER_ID, NAME),
+    CONSTRAINT FK_HANDLER_OUTPUT_HANDLER FOREIGN KEY (HANDLER_ID, WORKFLOW_ID)
+        REFERENCES WORKFLOW_HANDLER (ID, WORKFLOW_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- ============================================================================
+-- 4. REPLICA CATALOG
+-- ============================================================================
+
+CREATE TABLE IF NOT EXISTS CONFIGURATION (
+    CONFIG_KEY VARCHAR(255) NOT NULL,
+    CONFIG_VAL VARCHAR(255) NOT NULL,
+    PRIMARY KEY (CONFIG_KEY, CONFIG_VAL)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS DATA_PRODUCT (
+    PRODUCT_URI        VARCHAR(255) NOT NULL,
+    GATEWAY_ID         VARCHAR(255),
+    PRODUCT_NAME       LONGTEXT,
+    PRODUCT_DESCRIPTION VARCHAR(255),
+    OWNER_NAME         VARCHAR(255),
+    PARENT_PRODUCT_URI VARCHAR(255),
+    PRODUCT_SIZE       INT NOT NULL DEFAULT 0,
+    CREATION_TIME      TIMESTAMP NULL,
+    LAST_MODIFIED_TIME TIMESTAMP NULL,
+    PRODUCT_TYPE       VARCHAR(255),
+    PRIMARY KEY (PRODUCT_URI)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS DATA_PRODUCT_METADATA (
+    PRODUCT_URI    VARCHAR(255) NOT NULL,
+    METADATA_KEY   VARCHAR(255) NOT NULL,
+    METADATA_VALUE VARCHAR(255),
+    PRIMARY KEY (PRODUCT_URI, METADATA_KEY),
+    CONSTRAINT FK_DATA_PRODUCT_METADATA_PRODUCT FOREIGN KEY (PRODUCT_URI) REFERENCES DATA_PRODUCT (PRODUCT_URI)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS DATA_REPLICA_LOCATION (
+    REPLICA_ID                VARCHAR(255) NOT NULL,
+    PRODUCT_URI               VARCHAR(255) NOT NULL,
+    REPLICA_NAME              LONGTEXT,
+    REPLICA_DESCRIPTION       VARCHAR(255),
+    STORAGE_RESOURCE_ID       VARCHAR(255),
+    FILE_PATH                 VARCHAR(255),
+    CREATION_TIME             TIMESTAMP NULL,
+    LAST_MODIFIED_TIME        TIMESTAMP NULL,
+    VALID_UNTIL_TIME          TIMESTAMP NULL,
+    REPLICA_LOCATION_CATEGORY VARCHAR(255),
+    REPLICA_PERSISTENT_TYPE   VARCHAR(255),
+    PRIMARY KEY (REPLICA_ID),
+    CONSTRAINT FK_DATA_REPLICA_PRODUCT FOREIGN KEY (PRODUCT_URI) REFERENCES DATA_PRODUCT (PRODUCT_URI)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS DATA_REPLICA_METADATA (
+    REPLICA_ID     VARCHAR(255) NOT NULL,
+    METADATA_KEY   VARCHAR(255) NOT NULL,
+    METADATA_VALUE VARCHAR(255),
+    PRIMARY KEY (REPLICA_ID, METADATA_KEY),
+    CONSTRAINT FK_DATA_REPLICA_METADATA_REPLICA FOREIGN KEY (REPLICA_ID) REFERENCES DATA_REPLICA_LOCATION (REPLICA_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- ============================================================================
+-- 5. SHARING REGISTRY
+-- ============================================================================
+
+CREATE TABLE IF NOT EXISTS DOMAIN (
+    DOMAIN_ID             VARCHAR(255) NOT NULL,
+    NAME                  VARCHAR(255),
+    DESCRIPTION           VARCHAR(255),
+    CREATED_TIME          BIGINT,
+    UPDATED_TIME          BIGINT,
+    INITIAL_USER_GROUP_ID VARCHAR(255),
+    PRIMARY KEY (DOMAIN_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS SHARING_USER (
+    USER_ID      VARCHAR(255) NOT NULL,
+    DOMAIN_ID    VARCHAR(255) NOT NULL,
+    USER_NAME    VARCHAR(255),
+    FIRST_NAME   VARCHAR(255),
+    LAST_NAME    VARCHAR(255),
+    EMAIL        VARCHAR(255),
+    ICON         LONGBLOB,
+    CREATED_TIME BIGINT,
+    UPDATED_TIME BIGINT,
+    PRIMARY KEY (USER_ID, DOMAIN_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS USER_GROUP (
+    GROUP_ID          VARCHAR(255) NOT NULL,
+    DOMAIN_ID         VARCHAR(255) NOT NULL,
+    NAME              VARCHAR(255),
+    DESCRIPTION       VARCHAR(255),
+    OWNER_ID          VARCHAR(255),
+    GROUP_TYPE        VARCHAR(255),
+    GROUP_CARDINALITY VARCHAR(255),
+    CREATED_TIME      BIGINT,
+    UPDATED_TIME      BIGINT,
+    PRIMARY KEY (GROUP_ID, DOMAIN_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS GROUP_ADMIN (
+    GROUP_ID  VARCHAR(255) NOT NULL,
+    DOMAIN_ID VARCHAR(255) NOT NULL,
+    ADMIN_ID  VARCHAR(255) NOT NULL,
+    PRIMARY KEY (GROUP_ID, DOMAIN_ID, ADMIN_ID),
+    CONSTRAINT FK_GROUP_ADMIN_USER_GROUP FOREIGN KEY (GROUP_ID, DOMAIN_ID)
+        REFERENCES USER_GROUP (GROUP_ID, DOMAIN_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS GROUP_MEMBERSHIP (
+    PARENT_ID    VARCHAR(255) NOT NULL,
+    CHILD_ID     VARCHAR(255) NOT NULL,
+    DOMAIN_ID    VARCHAR(255) NOT NULL,
+    CHILD_TYPE   VARCHAR(255),
+    CREATED_TIME BIGINT,
+    UPDATED_TIME BIGINT,
+    PRIMARY KEY (PARENT_ID, CHILD_ID, DOMAIN_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS ENTITY_TYPE (
+    ENTITY_TYPE_ID VARCHAR(255) NOT NULL,
+    DOMAIN_ID      VARCHAR(255) NOT NULL,
+    NAME           VARCHAR(255),
+    DESCRIPTION    VARCHAR(255),
+    CREATED_TIME   BIGINT,
+    UPDATED_TIME   BIGINT,
+    PRIMARY KEY (ENTITY_TYPE_ID, DOMAIN_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS PERMISSION_TYPE (
+    PERMISSION_TYPE_ID VARCHAR(255) NOT NULL,
+    DOMAIN_ID          VARCHAR(255) NOT NULL,
+    NAME               VARCHAR(255),
+    DESCRIPTION        VARCHAR(255),
+    CREATED_TIME       BIGINT,
+    UPDATED_TIME       BIGINT,
+    PRIMARY KEY (PERMISSION_TYPE_ID, DOMAIN_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS ENTITY (
+    ENTITY_ID                     VARCHAR(255) NOT NULL,
+    DOMAIN_ID                     VARCHAR(255) NOT NULL,
+    ENTITY_TYPE_ID                VARCHAR(255),
+    OWNER_ID                      VARCHAR(255),
+    PARENT_ENTITY_ID              VARCHAR(255),
+    NAME                          VARCHAR(255),
+    DESCRIPTION                   VARCHAR(255),
+    BINARY_DATA                   LONGBLOB,
+    FULL_TEXT                     VARCHAR(255),
+    ORIGINAL_ENTITY_CREATION_TIME BIGINT,
+    SHARED_COUNT                  BIGINT,
+    CREATED_TIME                  BIGINT,
+    UPDATED_TIME                  BIGINT,
+    PRIMARY KEY (ENTITY_ID, DOMAIN_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS SHARING (
+    PERMISSION_TYPE_ID  VARCHAR(152) NOT NULL,
+    ENTITY_ID           VARCHAR(152) NOT NULL,
+    GROUP_ID            VARCHAR(152) NOT NULL,
+    INHERITED_PARENT_ID VARCHAR(152) NOT NULL,
+    DOMAIN_ID           VARCHAR(152) NOT NULL,
+    SHARING_TYPE        VARCHAR(255),
+    CREATED_TIME        BIGINT,
+    UPDATED_TIME        BIGINT,
+    PRIMARY KEY (PERMISSION_TYPE_ID, ENTITY_ID, GROUP_ID, INHERITED_PARENT_ID, DOMAIN_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- ============================================================================
+-- 6. PROFILE SERVICE
+-- ============================================================================
+
+CREATE TABLE IF NOT EXISTS TENANT_GATEWAY (
+    AIRAVATA_INTERNAL_GATEWAY_ID        VARCHAR(255) NOT NULL,
+    GATEWAY_ID                          VARCHAR(255),
+    GATEWAY_NAME                        VARCHAR(255),
+    GATEWAY_DOMAIN                      VARCHAR(255),
+    EMAIL_ADDRESS                       VARCHAR(255),
+    GATEWAY_APPROVAL_STATUS             VARCHAR(255),
+    GATEWAY_ACRONYM                     VARCHAR(255),
+    GATEWAY_URL                         VARCHAR(255),
+    GATEWAY_PUBLIC_ABSTRACT             VARCHAR(255),
+    GATEWAY_REVIEW_PROPOSAL_DESCRIPTION VARCHAR(255),
+    GATEWAY_ADMIN_FIRST_NAME            VARCHAR(255),
+    GATEWAY_ADMIN_LAST_NAME             VARCHAR(255),
+    GATEWAY_ADMIN_EMAIL                 VARCHAR(255),
+    IDENTITY_SERVER_USERNAME            VARCHAR(255),
+    IDENTITY_SERVER_PASSWORD_TOKEN      VARCHAR(255),
+    DECLINED_REASON                     VARCHAR(255),
+    OAUTH_CLIENT_ID                     VARCHAR(255),
+    OAUTH_CLIENT_SECRET                 VARCHAR(255),
+    REQUEST_CREATION_TIME               BIGINT NOT NULL DEFAULT 0,
+    REQUESTER_USERNAME                  VARCHAR(255),
+    PRIMARY KEY (AIRAVATA_INTERNAL_GATEWAY_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS USER_PROFILE (
+    AIRAVATA_INTERNAL_USER_ID VARCHAR(255) NOT NULL,
+    USER_ID                   VARCHAR(255),
+    GATEWAY_ID                VARCHAR(255),
+    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             DATETIME NULL,
+    LAST_ACCESS_TIME          DATETIME NULL,
+    VALID_UNTIL               DATETIME NULL,
+    STATE                     VARCHAR(255),
+    COMMENTS                  LONGTEXT,
+    GPG_KEY                   LONGTEXT,
+    TIME_ZONE                 VARCHAR(255),
+    PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS USER_PROFILE_EMAIL (
+    AIRAVATA_INTERNAL_USER_ID VARCHAR(255) NOT NULL,
+    EMAIL                     VARCHAR(255),
+    CONSTRAINT FK_USER_PROFILE_EMAIL FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID)
+        REFERENCES USER_PROFILE (AIRAVATA_INTERNAL_USER_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS USER_PROFILE_PHONE (
+    AIRAVATA_INTERNAL_USER_ID VARCHAR(255) NOT NULL,
+    PHONE                     VARCHAR(255),
+    CONSTRAINT FK_USER_PROFILE_PHONE FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID)
+        REFERENCES USER_PROFILE (AIRAVATA_INTERNAL_USER_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS USER_PROFILE_NATIONALITY (
+    AIRAVATA_INTERNAL_USER_ID VARCHAR(255) NOT NULL,
+    NATIONALITY               VARCHAR(255),
+    CONSTRAINT FK_USER_PROFILE_NATIONALITY FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID)
+        REFERENCES USER_PROFILE (AIRAVATA_INTERNAL_USER_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS USER_PROFILE_LABELED_URI (
+    AIRAVATA_INTERNAL_USER_ID VARCHAR(255) NOT NULL,
+    LABELED_URI               VARCHAR(255),
+    CONSTRAINT FK_USER_PROFILE_LABELED_URI FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID)
+        REFERENCES USER_PROFILE (AIRAVATA_INTERNAL_USER_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS NSF_DEMOGRAPHIC (
+    AIRAVATA_INTERNAL_USER_ID VARCHAR(255) NOT NULL,
+    GENDER                    VARCHAR(255),
+    PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID),
+    CONSTRAINT FK_NSF_DEMOGRAPHIC_USER_PROFILE FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID)
+        REFERENCES USER_PROFILE (AIRAVATA_INTERNAL_USER_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS NSF_DEMOGRAPHIC_ETHNICITY (
+    AIRAVATA_INTERNAL_USER_ID VARCHAR(255) NOT NULL,
+    ETHNICITY                 VARCHAR(255),
+    CONSTRAINT FK_NSF_ETHNICITY FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID)
+        REFERENCES NSF_DEMOGRAPHIC (AIRAVATA_INTERNAL_USER_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS NSF_DEMOGRAPHIC_RACE (
+    AIRAVATA_INTERNAL_USER_ID VARCHAR(255) NOT NULL,
+    RACE                      VARCHAR(255),
+    CONSTRAINT FK_NSF_RACE FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID)
+        REFERENCES NSF_DEMOGRAPHIC (AIRAVATA_INTERNAL_USER_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS NSF_DEMOGRAPHIC_DISABILITY (
+    AIRAVATA_INTERNAL_USER_ID VARCHAR(255) NOT NULL,
+    DISABILITY                VARCHAR(255),
+    CONSTRAINT FK_NSF_DISABILITY FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID)
+        REFERENCES NSF_DEMOGRAPHIC (AIRAVATA_INTERNAL_USER_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS 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),
+    CONSTRAINT FK_CUSTOMIZED_DASHBOARD_USER_PROFILE FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID)
+        REFERENCES USER_PROFILE (AIRAVATA_INTERNAL_USER_ID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- ============================================================================
+-- 7. RESEARCH SERVICE
+-- ============================================================================
+
+CREATE TABLE IF NOT EXISTS resource (
+    id           VARCHAR(48) NOT NULL,
+    name         VARCHAR(255) NOT NULL,
+    description  TEXT NOT NULL,
+    header_image VARCHAR(255) NOT NULL,
+    status       VARCHAR(255) NOT NULL,
+    state        VARCHAR(255) NOT NULL,
+    privacy      VARCHAR(255) NOT NULL,
+    created_at   DATETIME(6) NOT NULL,
+    updated_at   DATETIME(6) NOT NULL,
+    PRIMARY KEY (id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS resource_authors (
+    resource_id VARCHAR(48) NOT NULL,
+    author_id   VARCHAR(255),
+    CONSTRAINT FK_resource_authors_resource FOREIGN KEY (resource_id) REFERENCES resource (id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS tag (
+    id    VARCHAR(48) NOT NULL,
+    value VARCHAR(255) NOT NULL,
+    PRIMARY KEY (id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS resource_tags (
+    resource_id VARCHAR(48) NOT NULL,
+    tag_id      VARCHAR(48) NOT NULL,
+    PRIMARY KEY (resource_id, tag_id),
+    CONSTRAINT FK_resource_tags_resource FOREIGN KEY (resource_id) REFERENCES resource (id),
+    CONSTRAINT FK_resource_tags_tag FOREIGN KEY (tag_id) REFERENCES tag (id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS repository_resource (
+    id            VARCHAR(48) NOT NULL,
+    repository_url VARCHAR(255) NOT NULL,
+    PRIMARY KEY (id),
+    CONSTRAINT FK_repository_resource_base FOREIGN KEY (id) REFERENCES resource (id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS dataset_resource (
+    id         VARCHAR(48) NOT NULL,
+    dataset_url VARCHAR(255) NOT NULL,
+    PRIMARY KEY (id),
+    CONSTRAINT FK_dataset_resource_base FOREIGN KEY (id) REFERENCES resource (id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS model_resource (
+    id                     VARCHAR(48) NOT NULL,
+    application_interface_id VARCHAR(255) NOT NULL,
+    version                VARCHAR(255) NOT NULL,
+    PRIMARY KEY (id),
+    CONSTRAINT FK_model_resource_base FOREIGN KEY (id) REFERENCES resource (id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS notebook_resource (
+    id           VARCHAR(48) NOT NULL,
+    notebook_path VARCHAR(255) NOT NULL,
+    PRIMARY KEY (id),
+    CONSTRAINT FK_notebook_resource_base FOREIGN KEY (id) REFERENCES resource (id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS resource_star (
+    id          VARCHAR(48) NOT NULL,
+    user_id     VARCHAR(255) NOT NULL,
+    resource_id VARCHAR(48) NOT NULL,
+    PRIMARY KEY (id),
+    CONSTRAINT FK_resource_star_resource FOREIGN KEY (resource_id) REFERENCES resource (id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS research_project (
+    id                     VARCHAR(48) NOT NULL,
+    name                   VARCHAR(255) NOT NULL,
+    owner_id               VARCHAR(255) NOT NULL,
+    repository_resource_id VARCHAR(48) NOT NULL,
+    created_at             DATETIME(6) NOT NULL,
+    updated_at             DATETIME(6) NOT NULL,
+    state                  VARCHAR(255) NOT NULL,
+    PRIMARY KEY (id),
+    CONSTRAINT FK_research_project_repository FOREIGN KEY (repository_resource_id) REFERENCES repository_resource (id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS project_dataset (
+    project_id          VARCHAR(48) NOT NULL,
+    dataset_resource_id VARCHAR(48) NOT NULL,
+    PRIMARY KEY (project_id, dataset_resource_id),
+    CONSTRAINT FK_project_dataset_project FOREIGN KEY (project_id) REFERENCES research_project (id),
+    CONSTRAINT FK_project_dataset_dataset FOREIGN KEY (dataset_resource_id) REFERENCES dataset_resource (id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS session (
+    id          VARCHAR(48) NOT NULL,
+    session_name VARCHAR(255) NOT NULL,
+    user_id      VARCHAR(255) NOT NULL,
+    project_id   VARCHAR(48) NOT NULL,
+    created_at   DATETIME(6) NOT NULL,
+    updated_at   DATETIME(6) NOT NULL,
+    status      VARCHAR(255) NOT NULL,
+    PRIMARY KEY (id),
+    CONSTRAINT FK_session_project FOREIGN KEY (project_id) REFERENCES research_project (id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- ============================================================================
+-- 8. AGENT SERVICE
+-- ============================================================================
+
+CREATE TABLE IF NOT EXISTS agent_deployment_info (
+    agent_deployment_info_id VARCHAR(255) NOT NULL,
+    user_frinedly_name       VARCHAR(255),
+    compute_resource_id      VARCHAR(255),
+    agent_application_id     VARCHAR(255),
+    PRIMARY KEY (agent_deployment_info_id),
+    UNIQUE KEY uq_agent_deployment_user_friendly_name (user_frinedly_name)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS agent_execution (
+    agent_execution_id     VARCHAR(255) NOT NULL,
+    agent_id               VARCHAR(255),
+    airavata_experiment_id VARCHAR(255),
+    PRIMARY KEY (agent_execution_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS agent_execution_status (
+    agent_execution_status_id              VARCHAR(255) NOT NULL,
+    agent_execution_agent_execution_id     VARCHAR(255),
+    updated_time                           BIGINT NOT NULL,
+    status                                 TINYINT,
+    additional_info                        VARCHAR(2000),
+    PRIMARY KEY (agent_execution_status_id),
+    CONSTRAINT FK_agent_exec_status_execution FOREIGN KEY (agent_execution_agent_execution_id)
+        REFERENCES agent_execution (agent_execution_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS plan (
+    plan_id    VARCHAR(255) NOT NULL,
+    user_id    VARCHAR(255) NOT NULL,
+    gateway_id VARCHAR(255) NOT NULL,
+    data       TEXT,
+    PRIMARY KEY (plan_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- ============================================================================
+-- END OF BASELINE SCHEMA
+-- ============================================================================
diff --git a/airavata-api/src/main/java/org/apache/airavata/common/utils/DBInitializer.java b/airavata-api/src/main/java/org/apache/airavata/common/utils/DBInitializer.java
index 86e8c0dd060..1df670c0224 100644
--- a/airavata-api/src/main/java/org/apache/airavata/common/utils/DBInitializer.java
+++ b/airavata-api/src/main/java/org/apache/airavata/common/utils/DBInitializer.java
@@ -19,54 +19,16 @@
 */
 package org.apache.airavata.common.utils;
 
-import java.sql.Connection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class DBInitializer {
     private static final Logger logger = LoggerFactory.getLogger(DBInitializer.class);
 
-    private JDBCConfig jdbcConfig;
-    private String initScriptPrefix;
-    private String checkTableName;
-
-    public DBInitializer(JDBCConfig jdbcConfig, String initScriptPrefix, String checkTableName) {
-        this.jdbcConfig = jdbcConfig;
-        this.initScriptPrefix = initScriptPrefix;
-        this.checkTableName = checkTableName;
-    }
-
     public static void initializeDB(DBInitConfig dbInitConfig) {
-
-        JDBCConfig jdbcConfig = dbInitConfig.getJDBCConfig();
-        DBInitializer dbInitializer =
-                new DBInitializer(jdbcConfig, dbInitConfig.getDBInitScriptPrefix(), dbInitConfig.getCheckTableName());
-        dbInitializer.initializeDB();
+        logger.info(
+                "Database initialization is now handled by schema migrations. Skipping legacy DB init for: {}",
+                dbInitConfig.getDBInitScriptPrefix());
         dbInitConfig.postInit();
     }
-
-    public void initializeDB() {
-        // Create connection
-        Connection conn = null;
-        try {
-            DBUtil dbUtil = new DBUtil(jdbcConfig);
-            conn = dbUtil.getConnection();
-            if (!DatabaseCreator.isDatabaseStructureCreated(checkTableName, conn)) {
-                DatabaseCreator.createRegistryDatabase(initScriptPrefix, conn);
-                logger.info("New Database created from " + initScriptPrefix + " !!!");
-            } else {
-                logger.info("Table " + checkTableName + " already exists. Skipping database init script "
-                        + initScriptPrefix);
-            }
-
-        } catch (Exception e) {
-            String message = "Failed to initialize database for " + initScriptPrefix;
-            logger.error(message, e);
-            throw new RuntimeException(message, e);
-        } finally {
-            if (conn != null) {
-                DBUtil.cleanup(conn);
-            }
-        }
-    }
 }
diff --git a/airavata-api/src/main/java/org/apache/airavata/common/utils/DatabaseCreator.java b/airavata-api/src/main/java/org/apache/airavata/common/utils/DatabaseCreator.java
deleted file mode 100644
index b6b5aafe983..00000000000
--- a/airavata-api/src/main/java/org/apache/airavata/common/utils/DatabaseCreator.java
+++ /dev/null
@@ -1,381 +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.
-*/
-package org.apache.airavata.common.utils;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.SQLWarning;
-import java.sql.Statement;
-import java.util.StringTokenizer;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * This class creates the database tables required for airavata with default configuration this
- * class creates derby database in server mode. User can specify required database in appropriate
- * properties files.
- */
-public class DatabaseCreator {
-    private static final Logger logger = LoggerFactory.getLogger(DatabaseCreator.class);
-
-    public enum DatabaseType {
-        derby("(?i).*derby.*"),
-        mysql("(?i).*(mysql|mariadb).*"),
-        other("");
-
-        private String pattern;
-
-        private DatabaseType(String matchingPattern) {
-            this.pattern = matchingPattern;
-        }
-
-        public String getMatchingPattern() {
-            return this.pattern;
-        }
-    }
-
-    private static DatabaseType[] supportedDatabase = new DatabaseType[] {DatabaseType.derby, DatabaseType.mysql};
-
-    private static Logger log = LoggerFactory.getLogger(DatabaseCreator.class);
-    private static final String delimiter = ";";
-
-    /**
-     * Creates database
-     *
-     * @throws Exception
-     */
-    public static void createRegistryDatabase(String prefix, Connection conn) throws Exception {
-        createDatabase(prefix, conn);
-    }
-
-    /**
-     * Checks whether database tables are created by using select * on given table name
-     *
-     * @param tableName
-     *            Table which should be existed
-     * @return <code>true</core> if checkSQL is success, else <code>false</code> .
-     */
-    public static boolean isDatabaseStructureCreated(String tableName, Connection conn) {
-        try {
-
-            log.debug("Running a query to test the database tables existence.");
-
-            // check whether the tables are already created with a query
-            Statement statement = null;
-            try {
-                statement = conn.createStatement();
-                ResultSet rs = statement.executeQuery("select * from " + tableName);
-                if (rs != null) {
-                    rs.close();
-                }
-            } finally {
-                try {
-                    if (statement != null) {
-                        statement.close();
-                    }
-                } catch (SQLException e) {
-                    return false;
-                }
-            }
-        } catch (SQLException e) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * executes given sql
-     *
-     * @param sql
-     * @throws Exception
-     */
-    private static void executeSQL(String sql, Connection conn) throws Exception {
-        // Check and ignore empty statements
-        if ("".equals(sql.trim())) {
-            return;
-        }
-
-        Statement statement = null;
-        try {
-            log.debug("SQL : " + sql);
-
-            boolean ret;
-            int updateCount = 0, updateCountTotal = 0;
-            statement = conn.createStatement();
-            ret = statement.execute(sql);
-            updateCount = statement.getUpdateCount();
-            do {
-                if (!ret) {
-                    if (updateCount != -1) {
-                        updateCountTotal += updateCount;
-                    }
-                }
-                ret = statement.getMoreResults();
-                if (ret) {
-                    updateCount = statement.getUpdateCount();
-                }
-            } while (ret);
-
-            log.debug(sql + " : " + updateCountTotal + " rows affected");
-
-            SQLWarning warning = conn.getWarnings();
-            while (warning != null) {
-                log.info(warning + " sql warning");
-                warning = warning.getNextWarning();
-            }
-            conn.clearWarnings();
-        } catch (SQLException e) {
-            if (e.getSQLState().equals("X0Y32")) {
-                // eliminating the table already exception for the derby
-                // database
-                log.info("Table Already Exists", e);
-            } else {
-                throw new Exception("Error occurred while executing : " + sql, e);
-            }
-        } finally {
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException e) {
-                    log.error("Error occurred while closing result set.", e);
-                }
-            }
-        }
-    }
-
-    /**
-     * computes relatational database type using database name
-     *
-     * @return DatabaseType
-     * @throws Exception
-     *
-     */
-    public static DatabaseType getDatabaseType(Connection conn) throws Exception {
-        try {
-            if (conn != null && (!conn.isClosed())) {
-                DatabaseMetaData metaData = conn.getMetaData();
-                String databaseProductName = metaData.getDatabaseProductName();
-                return checkType(databaseProductName);
-            }
-        } catch (SQLException e) {
-            String msg = "Failed to create Airavata database." + e.getMessage();
-            log.error(msg, e);
-            throw new Exception(msg, e);
-        }
-        return DatabaseType.other;
-    }
-
-    /**
-     * Overloaded method with String input
-     *
-     * @return DatabaseType
-     * @throws Exception
-     *
-     */
-    public static DatabaseType getDatabaseType(String dbUrl) throws Exception {
-        return checkType(dbUrl);
-    }
-
-    private static DatabaseType checkType(String text) throws Exception {
-        try {
-            if (text != null) {
-                for (DatabaseType type : supportedDatabase) {
-                    if (text.matches(type.getMatchingPattern())) return type;
-                }
-            }
-            String msg = "Unsupported database: " + text
-                    + ". Database will not be created automatically by the Airavata. "
-                    + "Please create the database using appropriate database scripts for " + "the database.";
-            throw new Exception(msg);
-
-        } catch (SQLException e) {
-            String msg = "Failed to create Airavatadatabase." + e.getMessage();
-            log.error(msg, e);
-            throw new Exception(msg, e);
-        }
-    }
-
-    /**
-     * Get scripts location which is prefix + "-" + databaseType + ".sql"
-     *
-     * @param prefix
-     * @param databaseType
-     * @return script location
-     */
-    private static String getScriptLocation(String prefix, DatabaseType databaseType) {
-        String scriptName = prefix + "-" + databaseType + ".sql";
-        log.debug("Loading database script from :" + scriptName);
-        return scriptName;
-    }
-
-    private static void createDatabase(String prefix, Connection conn) throws Exception {
-        Statement statement = null;
-        try {
-            conn.setAutoCommit(false);
-            statement = conn.createStatement();
-            executeSQLScript(getScriptLocation(prefix, DatabaseCreator.getDatabaseType(conn)), conn);
-            conn.commit();
-            log.debug("Tables are created successfully.");
-        } catch (SQLException e) {
-            String msg = "Failed to create database tables for Airavata resource store. " + e.getMessage();
-            log.error(msg, e);
-            conn.rollback();
-            throw new Exception(msg, e);
-        } finally {
-            conn.setAutoCommit(true);
-            try {
-                if (statement != null) {
-                    statement.close();
-                }
-            } catch (SQLException e) {
-                log.error("Failed to close statement.", e);
-            }
-        }
-    }
-
-    private static void executeSQLScript(String dbscriptName, Connection conn) throws Exception {
-        StringBuffer sql = new StringBuffer();
-        BufferedReader reader = null;
-
-        try {
-            InputStream is = DatabaseCreator.class.getClassLoader().getResourceAsStream(dbscriptName);
-            if (is == null) {
-                logger.info("Script file not found at " + dbscriptName + ". Uses default database script file");
-                DatabaseType databaseType = DatabaseCreator.getDatabaseType(conn);
-                is = DatabaseCreator.class
-                        .getClassLoader()
-                        .getResourceAsStream(getDBScriptFileName(databaseType, dbscriptName));
-            }
-            reader = new BufferedReader(new InputStreamReader(is));
-            String line;
-            while ((line = reader.readLine()) != null) {
-                line = line.trim();
-                if (line.startsWith("//")) {
-                    continue;
-                }
-                if (line.startsWith("--")) {
-                    continue;
-                }
-                StringTokenizer st = new StringTokenizer(line);
-                if (st.hasMoreTokens()) {
-                    String token = st.nextToken();
-                    if ("REM".equalsIgnoreCase(token)) {
-                        continue;
-                    }
-                }
-                sql.append(" ").append(line);
-
-                // SQL defines "--" as a comment to EOL
-                // and in Oracle it may contain a hint
-                // so we cannot just remove it, instead we must end it
-                if (line.indexOf("--") >= 0) {
-                    sql.append("\n");
-                }
-                if ((checkStringBufferEndsWith(sql, delimiter))) {
-                    executeSQL(sql.substring(0, sql.length() - delimiter.length()), conn);
-                    sql.replace(0, sql.length(), "");
-                }
-            }
-            // Catch any statements not followed by ;
-            if (sql.length() > 0) {
-                executeSQL(sql.toString(), conn);
-            }
-        } catch (IOException e) {
-            log.error("Error occurred while executing SQL script for creating Airavata database", e);
-            throw new Exception("Error occurred while executing SQL script for creating Airavata database", e);
-
-        } finally {
-            if (reader != null) {
-                reader.close();
-            }
-        }
-    }
-
-    /**
-     * Checks that a string buffer ends up with a given string. It may sound trivial with the existing JDK API but the
-     * various implementation among JDKs can make those methods extremely resource intensive and perform poorly due to
-     * massive memory allocation and copying. See
-     *
-     * @param buffer
-     *            the buffer to perform the check on
-     * @param suffix
-     *            the suffix
-     * @return <code>true</code> if the character sequence represented by the argument is a suffix of the character
-     *         sequence represented by the StringBuffer object; <code>false</code> otherwise. Note that the result will
-     *         be <code>true</code> if the argument is the empty string.
-     */
-    public static boolean checkStringBufferEndsWith(StringBuffer buffer, String suffix) {
-        if (suffix.length() > buffer.length()) {
-            return false;
-        }
-        // this loop is done on purpose to avoid memory allocation performance
-        // problems on various JDKs
-        // StringBuffer.lastIndexOf() was introduced in jdk 1.4 and
-        // implementation is ok though does allocation/copying
-        // StringBuffer.toString().endsWith() does massive memory
-        // allocation/copying on JDK 1.5
-        // See http://issues.apache.org/bugzilla/show_bug.cgi?id=37169
-        int endIndex = suffix.length() - 1;
-        int bufferIndex = buffer.length() - 1;
-        while (endIndex >= 0) {
-            if (buffer.charAt(bufferIndex) != suffix.charAt(endIndex)) {
-                return false;
-            }
-            bufferIndex--;
-            endIndex--;
-        }
-        return true;
-    }
-
-    /**
-     * Method will accept a filepath containing a database script (eg: /user/database_scripts/expcatalog.sql)
-     *  and return only the filename of the database script (eg: expcatalog.sql).
-     * @param databaseType
-     * @param scriptFilePath
-     * @return
-     */
-    private static String getDBScriptFileName(DatabaseType databaseType, String scriptFilePath) {
-        // pattern: {dir_name}/{scriptfile_name}-{dbtype}.sql".
-        // Eg: database_scripts/expcatalog-derby.sql
-        final String scriptFilePattern = "(\\w*)(-" + databaseType.toString() + ".sql)";
-        final Pattern pattern = Pattern.compile(scriptFilePattern);
-        final Matcher matcher = pattern.matcher(scriptFilePath);
-        String dbScriptFileName = null;
-        // find a match
-        if (matcher.find()) {
-            dbScriptFileName = matcher.group();
-        }
-        return dbScriptFileName;
-    }
-
-    //    public static void main(String[] args) throws Exception {
-    //        System.out.println(DatabaseCreator.getDBScriptFileName(DatabaseType.derby, "db/db/expcatalog-derby.sql"));
-    //        System.out.println(DatabaseCreator.getDBScriptFileName(DatabaseType.mysql, "/expcatalog-mysql.sql"));
-    //    }
-}
diff --git a/airavata-api/src/main/java/org/apache/airavata/common/utils/DatabaseTestCases.java b/airavata-api/src/main/java/org/apache/airavata/common/utils/DatabaseTestCases.java
deleted file mode 100644
index 03cb6132fdc..00000000000
--- a/airavata-api/src/main/java/org/apache/airavata/common/utils/DatabaseTestCases.java
+++ /dev/null
@@ -1,123 +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.
-*/
-package org.apache.airavata.common.utils;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * An abstraction for database specific test classes. This will create a database and provides methods to execute SQLs.
- */
-public class DatabaseTestCases {
-
-    private static final Logger logger = LoggerFactory.getLogger(DatabaseTestCases.class);
-
-    protected static String hostAddress = "localhost";
-    protected static int port = 20000;
-    protected static String userName = "admin";
-    protected static String password = "admin";
-    protected static String driver = "org.apache.derby.jdbc.ClientDriver";
-
-    public static String getHostAddress() {
-        return hostAddress;
-    }
-
-    public static int getPort() {
-        return port;
-    }
-
-    public static String getUserName() {
-        return userName;
-    }
-
-    public static String getPassword() {
-        return password;
-    }
-
-    public static String getDriver() {
-        return driver;
-    }
-
-    public static String getJDBCUrl() {
-        return new StringBuilder()
-                .append("jdbc:derby://")
-                .append(getHostAddress())
-                .append(":")
-                .append(getPort())
-                .append("/experiment_catalog;create=true;user=")
-                .append(getUserName())
-                .append(";password=")
-                .append(getPassword())
-                .toString();
-    }
-
-    public static void waitTillServerStarts() {
-        DBUtil dbUtil = null;
-
-        try {
-            dbUtil = new DBUtil(getJDBCUrl(), getUserName(), getPassword(), getDriver());
-        } catch (Exception e) {
-            // ignore
-        }
-
-        Connection connection = null;
-        try {
-            if (dbUtil != null) {
-                connection = dbUtil.getConnection();
-            }
-        } catch (Throwable e) {
-            // ignore
-        }
-
-        while (connection == null) {
-            try {
-                Thread.sleep(1000);
-                try {
-                    if (dbUtil != null) {
-                        connection = dbUtil.getConnection();
-                    }
-                } catch (SQLException e) {
-                    // ignore
-                }
-            } catch (InterruptedException e) {
-                // ignore
-            }
-        }
-    }
-
-    public static void executeSQL(String sql) throws Exception {
-        DBUtil dbUtil = new DBUtil(getJDBCUrl(), getUserName(), getPassword(), getDriver());
-        dbUtil.executeSQL(sql);
-    }
-
-    public DBUtil getDbUtil() throws Exception {
-        return new DBUtil(getJDBCUrl(), getUserName(), getPassword(), getDriver());
-    }
-
-    public Connection getConnection() throws Exception {
-
-        DBUtil dbUtil = getDbUtil();
-        Connection connection = dbUtil.getConnection();
-        connection.setAutoCommit(true);
-        return connection;
-    }
-}
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/adaptor/SSHJAgentAdaptor.java b/airavata-api/src/main/java/org/apache/airavata/helix/adaptor/SSHJAgentAdaptor.java
index 67161d073c1..fbbd3b34374 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/adaptor/SSHJAgentAdaptor.java
+++ b/airavata-api/src/main/java/org/apache/airavata/helix/adaptor/SSHJAgentAdaptor.java
@@ -277,7 +277,6 @@ public void createDirectory(String path, boolean recursive) throws AgentExceptio
         }
     }
 
-
     private void deleteDirectoryRecursively(SFTPClientWrapper sftpClient, String path) throws IOException {
         FileAttributes lstat = sftpClient.lstat(path);
         if (lstat.getMode().getType() == Type.DIRECTORY) {
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/aws/CreateEC2InstanceTask.java b/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/aws/CreateEC2InstanceTask.java
index 6989842286f..605653ea2ee 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/aws/CreateEC2InstanceTask.java
+++ b/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/aws/CreateEC2InstanceTask.java
@@ -158,10 +158,11 @@ private String createSecurityGroup(Ec2Client ec2) throws Exception {
                         .description("Airavata temporary security group for " + getProcessId())
                         .vpcId(vpcId));
 
-        ec2.authorizeSecurityGroupIngress(req -> req.groupId(sgRes.groupId()).ipPermissions(p -> p.ipProtocol("tcp")
-                .fromPort(22)
-                .toPort(22)
-                .ipRanges(r -> r.cidrIp("0.0.0.0/0")))); // TODO restrict the IP
+        ec2.authorizeSecurityGroupIngress(req -> req.groupId(sgRes.groupId())
+                .ipPermissions(p -> p.ipProtocol("tcp")
+                        .fromPort(22)
+                        .toPort(22)
+                        .ipRanges(r -> r.cidrIp("0.0.0.0/0")))); // TODO restrict the IP
 
         return sgRes.groupId();
     }
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/migration/MappingToolRunner.java b/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/migration/MappingToolRunner.java
deleted file mode 100644
index ed3606ebf18..00000000000
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/migration/MappingToolRunner.java
+++ /dev/null
@@ -1,65 +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.
-*/
-package org.apache.airavata.registry.core.utils.migration;
-
-import org.apache.airavata.common.utils.JDBCConfig;
-import org.apache.airavata.common.utils.JPAUtils;
-import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
-import org.apache.openjpa.jdbc.conf.JDBCConfigurationImpl;
-import org.apache.openjpa.jdbc.meta.MappingTool;
-import org.apache.openjpa.lib.util.Options;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class MappingToolRunner {
-
-    private static Logger logger = LoggerFactory.getLogger(MappingToolRunner.class);
-
-    public static void run(JDBCConfig jdbcConfig, String outputFile, String persistenceUnitName) {
-        run(jdbcConfig, outputFile, persistenceUnitName, MappingTool.ACTION_ADD);
-    }
-
-    // schemaAction is one of MappingTool's supported actions:
-    // http://openjpa.apache.org/builds/2.4.3/apache-openjpa/docs/ref_guide_mapping.html#ref_guide_mapping_mappingtool
-    public static void run(JDBCConfig jdbcConfig, String outputFile, String persistenceUnitName, String schemaAction) {
-
-        JDBCConfiguration jdbcConfiguration = new JDBCConfigurationImpl();
-        jdbcConfiguration.fromProperties(JPAUtils.createConnectionProperties(jdbcConfig));
-        jdbcConfiguration.setConnectionDriverName("org.apache.commons.dbcp2.BasicDataSource");
-
-        Options options = new Options();
-        options.put("sqlFile", outputFile);
-        // schemaAction "add" brings the schema up to date by adding missing schema elements
-        // schemaAction "build" creates the entire schema as if the database is empty
-        options.put("schemaAction", schemaAction);
-        options.put("foreignKeys", "true");
-        options.put("indexes", "true");
-        options.put("primaryKeys", "true");
-        // Specify persistence-unit name using it's anchor in the persistence.xml file
-        // http://openjpa.apache.org/builds/2.4.3/apache-openjpa/docs/ref_guide_conf_devtools.html
-        options.put("properties", "persistence.xml#" + persistenceUnitName);
-        try {
-            MappingTool.run(jdbcConfiguration, new String[] {}, options, null);
-        } catch (Exception mappingToolEx) {
-            logger.error("Failed to run MappingTool", mappingToolEx);
-            throw new RuntimeException("Failed to run MappingTool to generate migration script", mappingToolEx);
-        }
-    }
-}
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/migration/MigrationSchemaGenerator.java b/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/migration/MigrationSchemaGenerator.java
deleted file mode 100644
index 5364a3df8f5..00000000000
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/utils/migration/MigrationSchemaGenerator.java
+++ /dev/null
@@ -1,125 +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.
-*/
-package org.apache.airavata.registry.core.utils.migration;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import org.apache.airavata.common.utils.DBInitConfig;
-import org.apache.airavata.common.utils.DBInitializer;
-import org.apache.airavata.common.utils.JDBCConfig;
-import org.apache.airavata.registry.core.utils.AppCatalogDBInitConfig;
-import org.apache.airavata.registry.core.utils.ExpCatalogDBInitConfig;
-import org.apache.airavata.registry.core.utils.JPAUtil.AppCatalogJPAUtils;
-import org.apache.airavata.registry.core.utils.JPAUtil.ExpCatalogJPAUtils;
-import org.apache.airavata.registry.core.utils.JPAUtil.RepCatalogJPAUtils;
-import org.apache.airavata.registry.core.utils.ReplicaCatalogDBInitConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class MigrationSchemaGenerator {
-
-    private static final Logger logger = LoggerFactory.getLogger(MigrationSchemaGenerator.class);
-
-    private enum Database {
-        app_catalog(
-                new AppCatalogDBInitConfig().setDbInitScriptPrefix("appcatalog"),
-                AppCatalogJPAUtils.PERSISTENCE_UNIT_NAME),
-        experiment_catalog(
-                new ExpCatalogDBInitConfig().setDbInitScriptPrefix("expcatalog"),
-                ExpCatalogJPAUtils.PERSISTENCE_UNIT_NAME),
-        replica_catalog(
-                new ReplicaCatalogDBInitConfig().setDbInitScriptPrefix("replicacatalog"),
-                RepCatalogJPAUtils.PERSISTENCE_UNIT_NAME);
-
-        private final DBInitConfig dbInitConfig;
-        private final String persistenceUnitName;
-
-        Database(DBInitConfig dbInitConfig, String persistenceUnitName) {
-            this.dbInitConfig = dbInitConfig;
-            this.persistenceUnitName = persistenceUnitName;
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-
-        String schemaAction = args.length > 0 ? args[0] : "add";
-        try {
-            for (Database database : Database.values()) {
-
-                waitForDatabaseServer(database.dbInitConfig.getJDBCConfig(), 60);
-                try {
-                    logger.info("initializing database " + database.name());
-                    DBInitializer.initializeDB(database.dbInitConfig);
-                } catch (Exception e) {
-
-                    logger.error("Failed to initialize database " + database.name(), e);
-                } finally {
-                    String outputFile = "add".equals(schemaAction)
-                            ? database.name() + "-migration.sql"
-                            : database.name() + "-schema.sql";
-                    logger.info("creating database script: " + outputFile);
-                    MappingToolRunner.run(
-                            database.dbInitConfig.getJDBCConfig(),
-                            outputFile,
-                            database.persistenceUnitName,
-                            schemaAction);
-                }
-            }
-        } catch (Exception e) {
-            logger.error("Failed to create the databases", e);
-            throw e;
-        }
-    }
-
-    private static void waitForDatabaseServer(JDBCConfig jdbcConfig, int timeoutSeconds) {
-
-        long startTime = System.currentTimeMillis();
-        boolean connected = false;
-        while (!connected) {
-
-            if ((System.currentTimeMillis() - startTime) / 1000 > timeoutSeconds) {
-                throw new RuntimeException(
-                        "Failed to connect to database server after " + timeoutSeconds + " seconds!");
-            }
-            Connection conn = null;
-            try {
-                Class.forName(jdbcConfig.getDriver());
-                conn = DriverManager.getConnection(jdbcConfig.getURL(), jdbcConfig.getUser(), jdbcConfig.getPassword());
-                connected = conn.isValid(10);
-            } catch (Exception e) {
-                logger.debug("Failed to connect to database: " + e.getMessage() + ", waiting 1 second before retrying");
-                try {
-                    Thread.sleep(1000);
-                } catch (InterruptedException e1) {
-                    logger.warn("Thread sleep interrupted, ignoring");
-                }
-            } finally {
-                if (conn != null) {
-                    try {
-                        conn.close();
-                    } catch (SQLException e) {
-                        logger.warn("Failed to close connection, ignoring");
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java b/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java
index 23bb59950de..dfbdff25126 100644
--- a/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java
+++ b/airavata-api/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java
@@ -25,7 +25,7 @@
 import org.slf4j.LoggerFactory;
 
 @Entity
-@Table(name = "GATEWAY")
+@Table(name = "TENANT_GATEWAY")
 public class GatewayEntity {
     private static final Logger logger = LoggerFactory.getLogger(GatewayEntity.class);
     private String airavataInternalGatewayId;
diff --git a/airavata-api/src/main/resources/airavata-server.properties b/airavata-api/src/main/resources/airavata-server.properties
index 8b61b1a7e73..f1b5b3b1a05 100644
--- a/airavata-api/src/main/resources/airavata-server.properties
+++ b/airavata-api/src/main/resources/airavata-server.properties
@@ -20,27 +20,27 @@
 airavata.config.dir=.
 
 api.server.monitoring.enabled=true
-api.server.monitoring.host=0.0.0.0
+api.server.monitoring.host=airavata.localhost
 api.server.monitoring.port=9097
-apiserver.host=0.0.0.0
+apiserver.host=airavata.localhost
 apiserver.port=8930
 apiserver.class=org.apache.airavata.api.server.AiravataAPIServer
 
 appcatalog.jdbc.driver=org.mariadb.jdbc.Driver
 appcatalog.jdbc.password=123456
-appcatalog.jdbc.url=jdbc:mariadb://airavata.host:13306/app_catalog
+appcatalog.jdbc.url=jdbc:mariadb://airavata.localhost:13306/airavata
 appcatalog.jdbc.user=airavata
-appcatalog.validationQuery=SELECT 1 from CONFIGURATION
+appcatalog.validationQuery=SELECT 1
 
 cluster.status.monitoring.enable=false
 cluster.status.monitoring.repeat.time=18000
 
 credential.store.jdbc.driver=org.mariadb.jdbc.Driver
 credential.store.jdbc.password=123456
-credential.store.jdbc.url=jdbc:mariadb://airavata.host:13306/credential_store
+credential.store.jdbc.url=jdbc:mariadb://airavata.localhost:13306/airavata
 credential.store.jdbc.user=airavata
-credential.store.jdbc.validationQuery=SELECT 1 from CONFIGURATION
-credential.store.server.host=localhost
+credential.store.jdbc.validationQuery=SELECT 1
+credential.store.server.host=airavata.localhost
 credential.store.server.port=8960
 credential.store.class=org.apache.airavata.credential.store.server.CredentialStoreServer
 
@@ -78,7 +78,7 @@ host.scheduler=org.apache.airavata.orchestrator.core.schedule.DefaultHostSchedul
 
 iam.server.super.admin.password=admin
 iam.server.super.admin.username=admin
-iam.server.url=http://airavata.host:18080
+iam.server.url=http://airavata.localhost:18080
 
 in.memory.cache.size=1000
 
@@ -90,10 +90,10 @@ job.monitor.broker.consumer.group=MonitoringConsumer
 
 job.notification.emailids=
 job.notification.enable=true
-job.status.publish.endpoint=http://airavata.host:8082/topics/helix-airavata-mq
+job.status.publish.endpoint=http://airavata.localhost:8082/topics/helix-airavata-mq
 job.validators=org.apache.airavata.orchestrator.core.validator.impl.BatchQueueValidator,org.apache.airavata.orchestrator.core.validator.impl.ExperimentStatusValidator
 
-kafka.broker.url=airavata.host:9092
+kafka.broker.url=airavata.localhost:9092
 
 data.parser.broker.consumer.group=ParsingConsumer
 data.parser.topic=parsing-data
@@ -102,7 +102,7 @@ local.data.location=/tmp
 
 metaschedluer.job.scanning.enable=false
 
-orchestrator.server.host=airavata.host
+orchestrator.server.host=airavata.localhost
 orchestrator.server.min.threads=50
 orchestrator.server.port=8940
 orchestrator=org.apache.airavata.orchestrator.server.OrchestratorServer
@@ -110,32 +110,32 @@ orchestrator=org.apache.airavata.orchestrator.server.OrchestratorServer
 data.parser.storage.resource.id=CHANGE_ME
 
 participant.monitoring.enabled=true
-participant.monitoring.host=airavata.host
+participant.monitoring.host=airavata.localhost
 participant.monitoring.port=9096
 
 post.workflow.manager.loadbalance.clusters=false
 post.workflow.manager.monitoring.enabled=true
-post.workflow.manager.monitoring.host=airavata.host
+post.workflow.manager.monitoring.host=airavata.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=airavata.host
+pre.workflow.manager.monitoring.host=airavata.localhost
 pre.workflow.manager.monitoring.port=9093
 pre.workflow.manager.name=AiravataPreWM
 
 profile_service.class=org.apache.airavata.service.profile.server.ProfileServiceServer
 profile.service.jdbc.driver=org.mariadb.jdbc.Driver
 profile.service.jdbc.password=123456
-profile.service.jdbc.url=jdbc:mariadb://airavata.host:13306/profile_service
+profile.service.jdbc.url=jdbc:mariadb://airavata.localhost:13306/airavata
 profile.service.jdbc.user=airavata
-profile.service.server.host=airavata.host
+profile.service.server.host=airavata.localhost
 profile.service.server.port=8962
 profile.service.validationQuery=SELECT 1
 
 # RabbitMQ Settings
-rabbitmq.broker.url=amqp://guest:guest@airavata.host:5672/develop
+rabbitmq.broker.url=amqp://airavata:airavata@airavata.localhost:5672
 rabbitmq.experiment.exchange.name=experiment_exchange
 rabbitmq.process.exchange.name=process_exchange
 rabbitmq.status.exchange.name=status_exchange
@@ -147,28 +147,28 @@ realtime.monitor.broker.topic=helix-airavata-mq
 
 registry.jdbc.driver=org.mariadb.jdbc.Driver
 registry.jdbc.password=123456
-registry.jdbc.url=jdbc:mariadb://airavata.host:13306/experiment_catalog
+registry.jdbc.url=jdbc:mariadb://airavata.localhost:13306/airavata
 registry.jdbc.user=airavata
 
-regserver.server.host=localhost
+regserver.server.host=airavata.localhost
 regserver.server.min.threads=50
 regserver.server.port=8970
 regserver=org.apache.airavata.registry.api.service.RegistryAPIServer
 
 replicacatalog.jdbc.driver=org.mariadb.jdbc.Driver
 replicacatalog.jdbc.password=123456
-replicacatalog.jdbc.url=jdbc:mariadb://airavata.host:13306/replica_catalog
+replicacatalog.jdbc.url=jdbc:mariadb://airavata.localhost:13306/airavata
 replicacatalog.jdbc.user=airavata
-replicacatalog.validationQuery=SELECT 1 from CONFIGURATION
+replicacatalog.validationQuery=SELECT 1
 
 sharing_server=org.apache.airavata.sharing.registry.server.SharingRegistryServer
-sharing.registry.server.host=0.0.0.0
+sharing.registry.server.host=airavata.localhost
 sharing.registry.server.port=7878
 sharingcatalog.jdbc.driver=org.mariadb.jdbc.Driver
 sharingcatalog.jdbc.password=123456
-sharingcatalog.jdbc.url=jdbc:mariadb://airavata.host:13306/sharing_catalog
+sharingcatalog.jdbc.url=jdbc:mariadb://airavata.localhost:13306/airavata
 sharingcatalog.jdbc.user=airavata
-sharingcatalog.validationQuery=SELECT 1 from CONFIGURATION
+sharingcatalog.validationQuery=SELECT 1
 
 super.tenant.gatewayId=default
 
@@ -187,13 +187,13 @@ authz.cache.enabled=true
 authz.cache.manager.class=org.apache.airavata.service.security.authzcache.DefaultAuthzCacheManager
 security.manager.class=org.apache.airavata.service.security.KeyCloakSecurityManager
 
-validationQuery=SELECT 1 from CONFIGURATION
+validationQuery=SELECT 1
 
 workflowcatalog.jdbc.driver=org.mariadb.jdbc.Driver
 workflowcatalog.jdbc.password=123456
-workflowcatalog.jdbc.url=jdbc:mariadb://airavata.host:13306/workflow_catalog
+workflowcatalog.jdbc.url=jdbc:mariadb://airavata.localhost:13306/airavata
 workflowcatalog.jdbc.user=airavata
-workflowcatalog.validationQuery=SELECT 1 from CONFIGURATION
+workflowcatalog.validationQuery=SELECT 1
 
-zookeeper.server.connection=airavata.host:2181
+zookeeper.server.connection=airavata.localhost:2181
 StrictHostKeyChecking=no
\ No newline at end of file
diff --git a/airavata-api/src/main/resources/database_scripts/airavataworkflowcatalog-derby.sql b/airavata-api/src/main/resources/database_scripts/airavataworkflowcatalog-derby.sql
deleted file mode 100644
index bce4bd97340..00000000000
--- a/airavata-api/src/main/resources/database_scripts/airavataworkflowcatalog-derby.sql
+++ /dev/null
@@ -1,212 +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 AIRAVATA_WORKFLOW
-(
-        ID VARCHAR (255) NOT NULL,
-        EXPERIMENT_ID varchar(255),
-        DESCRIPTION VARCHAR (255),
-        CREATED_AT timestamp DEFAULT CURRENT_TIMESTAMP,
-        UPDATED_AT timestamp,
-        PRIMARY KEY (ID)
-);
-
-CREATE TABLE AIRAVATA_WORKFLOW_ERROR
-(
-        ID VARCHAR (255) NOT NULL,
-        WORKFLOW_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 (ID, WORKFLOW_ID),
-        FOREIGN KEY (WORKFLOW_ID) REFERENCES AIRAVATA_WORKFLOW(ID) ON DELETE CASCADE
-);
-
-CREATE TABLE AIRAVATA_WORKFLOW_STATUS
-(
-        ID VARCHAR (255) NOT NULL,
-        WORKFLOW_ID VARCHAR (255) NOT NULL,
-        STATE VARCHAR (255) NOT NULL,
-        DESCRIPTION VARCHAR (255),
-        UPDATED_AT timestamp DEFAULT CURRENT_TIMESTAMP,
-        PRIMARY KEY (ID, WORKFLOW_ID),
-        FOREIGN KEY (WORKFLOW_ID) REFERENCES AIRAVATA_WORKFLOW(ID) ON DELETE CASCADE
-);
-
-CREATE TABLE WORKFLOW_APPLICATION
-(
-        ID VARCHAR (255) NOT NULL,
-        WORKFLOW_ID VARCHAR (255) NOT NULL,
-        EXPERIMENT_ID varchar(255),
-        APPLICATION_INTERFACE_ID VARCHAR (255),
-        COMPUTE_RESOURCE_ID VARCHAR (255),
-        QUEUE_NAME VARCHAR (255),
-        NODE_COUNT INTEGER,
-        CORE_COUNT INTEGER,
-        WALL_TIME_LIMIT INTEGER,
-        PHYSICAL_MEMORY INTEGER,
-        CREATED_AT timestamp DEFAULT CURRENT_TIMESTAMP,
-        UPDATED_AT timestamp,
-        PRIMARY KEY (ID, WORKFLOW_ID),
-        FOREIGN KEY (WORKFLOW_ID) REFERENCES AIRAVATA_WORKFLOW(ID) ON DELETE CASCADE
-);
-
-CREATE TABLE APPLICATION_ERROR
-(
-        ID VARCHAR (255) NOT NULL,
-        WORKFLOW_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 (ID, WORKFLOW_ID),
-        FOREIGN KEY (WORKFLOW_ID) REFERENCES AIRAVATA_WORKFLOW(ID) ON DELETE CASCADE
-);
-
-CREATE TABLE APPLICATION_STATUS
-(
-        ID VARCHAR (255) NOT NULL,
-        WORKFLOW_ID VARCHAR (255) NOT NULL,
-        STATE VARCHAR (255) NOT NULL,
-        DESCRIPTION VARCHAR (255),
-        UPDATED_AT timestamp DEFAULT CURRENT_TIMESTAMP,
-        PRIMARY KEY (ID, WORKFLOW_ID),
-        FOREIGN KEY (WORKFLOW_ID) REFERENCES AIRAVATA_WORKFLOW(ID) ON DELETE CASCADE
-);
-
-CREATE TABLE WORKFLOW_HANDLER
-(
-        ID VARCHAR (255) NOT NULL,
-        WORKFLOW_ID VARCHAR (255) NOT NULL,
-        TYPE VARCHAR (255),
-        CREATED_AT timestamp DEFAULT CURRENT_TIMESTAMP,
-        UPDATED_AT timestamp,
-        PRIMARY KEY (ID, WORKFLOW_ID),
-        FOREIGN KEY (WORKFLOW_ID) REFERENCES AIRAVATA_WORKFLOW(ID) ON DELETE CASCADE
-);
-
-CREATE TABLE HANDLER_ERROR
-(
-        ERROR_ID VARCHAR (255) NOT NULL,
-        HANDLER_ID VARCHAR (255) NOT NULL,
-        WORKFLOW_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, HANDLER_ID),
-        FOREIGN KEY (WORKFLOW_ID) REFERENCES AIRAVATA_WORKFLOW(ID) ON DELETE CASCADE,
-        FOREIGN KEY (HANDLER_ID, WORKFLOW_ID) REFERENCES WORKFLOW_HANDLER(ID, WORKFLOW_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE HANDLER_INPUT (
-        HANDLER_ID VARCHAR(255) NOT NULL,
-        NAME VARCHAR(255) NOT NULL,
-        APPLICATION_ARGUMENT VARCHAR(255),
-        DATA_STAGED SMALLINT,
-        INPUT_ORDER INTEGER,
-        IS_READ_ONLY SMALLINT,
-        IS_REQUIRED SMALLINT,
-        METADATA VARCHAR(4096),
-        REQUIRED_TO_ADDED_TO_COMMAND_LINE SMALLINT,
-        STANDARD_INPUT SMALLINT,
-        STORAGE_RESOURCE_ID VARCHAR(255),
-        TYPE VARCHAR(20),
-        USER_FRIENDLY_DESCRIPTION VARCHAR(255),
-        VALUE CLOB,
-        WORKFLOW_ID VARCHAR(255),
-        PRIMARY KEY (HANDLER_ID, NAME),
-        FOREIGN KEY (HANDLER_ID, WORKFLOW_ID) REFERENCES WORKFLOW_HANDLER(ID, WORKFLOW_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE HANDLER_OUTPUT (HANDLER_ID VARCHAR(255) NOT NULL,
-        NAME VARCHAR(255) NOT NULL,
-        APPLICATION_ARGUMENT VARCHAR(255),
-        DATA_MOVEMENT SMALLINT,
-        IS_REQUIRED SMALLINT,
-        LOCATION VARCHAR(255),
-        OUTPUT_STREAMING SMALLINT,
-        REQUIRED_TO_ADDED_TO_COMMAND_LINE SMALLINT,
-        SEARCH_QUERY VARCHAR(255),
-        STORAGE_RESOURCE_ID VARCHAR(255),
-        TYPE VARCHAR(20),
-        VALUE CLOB,
-        WORKFLOW_ID VARCHAR(255),
-        PRIMARY KEY (HANDLER_ID, NAME),
-        FOREIGN KEY (HANDLER_ID, WORKFLOW_ID) REFERENCES WORKFLOW_HANDLER(ID, WORKFLOW_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE HANDLER_STATUS
-(
-        ID VARCHAR (255) NOT NULL,
-        HANDLER_ID VARCHAR (255) NOT NULL,
-        WORKFLOW_ID VARCHAR (255) NOT NULL,
-        STATE VARCHAR (255) NOT NULL,
-        DESCRIPTION VARCHAR (255),
-        UPDATED_AT timestamp DEFAULT CURRENT_TIMESTAMP,
-        PRIMARY KEY (HANDLER_ID, ID),
-        FOREIGN KEY (HANDLER_ID, WORKFLOW_ID) REFERENCES WORKFLOW_HANDLER(ID, WORKFLOW_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE WORKFLOW_DATA_BLOCK
-(
-        ID VARCHAR (255) NOT NULL,
-        WORKFLOW_ID VARCHAR (255) NOT NULL,
-        VALUE VARCHAR (255),
-        DATA_TYPE VARCHAR (255),
-        CREATED_AT timestamp DEFAULT CURRENT_TIMESTAMP,
-        UPDATED_AT timestamp,
-        PRIMARY KEY (ID),
-        FOREIGN KEY (WORKFLOW_ID) REFERENCES AIRAVATA_WORKFLOW(ID) ON DELETE CASCADE
-);
-
-CREATE TABLE WORKFLOW_CONNECTION
-(
-        ID VARCHAR (255) NOT NULL,
-        WORKFLOW_ID VARCHAR (255) NOT NULL,
-        DATA_BLOCK_ID VARCHAR (255),
-        FROM_TYPE VARCHAR (255),
-        FROM_ID VARCHAR (255),
-        FROM_OUTPUT_NAME VARCHAR (255),
-        TO_TYPE VARCHAR (255),
-        TO_ID VARCHAR (255),
-        TO_INPUT_NAME VARCHAR (255),
-        CREATED_AT timestamp DEFAULT CURRENT_TIMESTAMP,
-        UPDATED_AT timestamp,
-        PRIMARY KEY (ID, WORKFLOW_ID),
-        FOREIGN KEY (WORKFLOW_ID) REFERENCES AIRAVATA_WORKFLOW(ID) ON DELETE CASCADE,
-        FOREIGN KEY (DATA_BLOCK_ID) REFERENCES WORKFLOW_DATA_BLOCK(ID) ON DELETE CASCADE
-);
-
-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('airavata.workflow.version', '0.17', CURRENT_TIMESTAMP ,'SYSTEM');
diff --git a/airavata-api/src/main/resources/database_scripts/appcatalog-mysql.sql b/airavata-api/src/main/resources/database_scripts/appcatalog-mysql.sql
deleted file mode 100644
index 3b59393c863..00000000000
--- a/airavata-api/src/main/resources/database_scripts/appcatalog-mysql.sql
+++ /dev/null
@@ -1,763 +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 NOW(),
-          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 TINYINT(1),
-          GATEWAY_USAGE_MODULE_LOAD_CMD VARCHAR(500),
-          GATEWAY_USAGE_EXECUTABLE VARCHAR(255),
-          PRIMARY KEY (RESOURCE_ID)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE GLOBUS_SUBMISSION
-(
-         SUBMISSION_ID VARCHAR(255),
-         RESOURCE_JOB_MANAGER VARCHAR(255),
-         SECURITY_PROTOCAL VARCHAR(255),
-         PRIMARY KEY(SUBMISSION_ID)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE UNICORE_SUBMISSION
-(
-         SUBMISSION_ID VARCHAR(255),
-         SECURITY_PROTOCAL VARCHAR(255),
-         UNICORE_ENDPOINT_URL VARCHAR(255),
-         PRIMARY KEY(SUBMISSION_ID)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE UNICORE_DATAMOVEMENT
-(
-         DATAMOVEMENT_ID VARCHAR(255),
-         SECURITY_PROTOCAL VARCHAR(255),
-         UNICORE_ENDPOINT_URL VARCHAR(255),
-         PRIMARY KEY(DATAMOVEMENT_ID)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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 NOW(),
-        UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-        PRIMARY KEY (RESOURCE_JOB_MANAGER_ID)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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 NOW(),
-        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)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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 NOW(),
-        UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ,
-        PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE GRIDFTP_DATA_MOVEMENT
-(
-        DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
-        SECURITY_PROTOCOL VARCHAR (255) NOT NULL,
-        CREATION_TIME TIMESTAMP DEFAULT NOW(),
-        UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ,
-        PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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 NOW(),
-        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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
---CREATE TABLE JOB_SUBMISSION_PROTOCOL
---(
---         RESOURCE_ID VARCHAR(255),
---         SUBMISSION_ID VARCHAR(255),
---         JOB_TYPE VARCHAR(255),
---         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),
---         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 NOW() NOT NULL,
-         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' NOT NULL,
-         PRIMARY KEY(MODULE_ID)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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 NOW() 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 TINYINT(1),
-         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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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 TINYINT(1),
-         CLEAN_AFTER_STAGED SMALLINT DEFAULT 0,
-         CREATION_TIME TIMESTAMP DEFAULT NOW() NOT NULL,
-         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' NOT NULL,
-         PRIMARY KEY(INTERFACE_ID)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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 TEXT,
-         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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE GATEWAY_PROFILE
-(
-         GATEWAY_ID VARCHAR(255),
-	       CREATION_TIME TIMESTAMP DEFAULT NOW(),
-         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)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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 TINYINT(1),
-        PRIMARY KEY (COMPUTE_RESOURCE_ID,QUEUE_NAME),
-        FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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 NOW(),
-        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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
- 
-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 NOW(),
-        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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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 NOW(),
-        UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-        PRIMARY KEY (STORAGE_RESOURCE_ID)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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 NOW(),
-        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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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 NOW(),
-        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)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE LOCAL_DATA_MOVEMENT
-(
-        DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
-        PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE USER_RESOURCE_PROFILE (
-  USER_ID varchar(255) NOT NULL,
-  CREATION_TIME datetime 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 datetime DEFAULT NULL,
-  PRIMARY KEY (USER_ID,GATEWAY_ID)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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 datetime DEFAULT NULL,
-  RESERVATION_START_TIME datetime DEFAULT NULL,
-  SCRATCH_LOCATION varchar(255) DEFAULT NULL,
-  VALIDATED TINYINT(1) DEFAULT 0,
-  PRIMARY KEY (RESOURCE_ID,USER_ID,GATEWAY_ID)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE GROUP_COMPUTE_RESOURCE_PREFERENCE
-(
-        RESOURCE_ID VARCHAR(255) NOT NULL,
-        GROUP_RESOURCE_PROFILE_ID varchar(255) NOT NULL,
-        RESOURCE_TYPE VARCHAR(255) NOT NULL,
-        OVERRIDE_BY_AIRAVATA SMALLINT,
-        PREFERED_JOB_SUB_PROTOCOL VARCHAR(255),
-        PREFERED_DATA_MOVE_PROTOCOL VARCHAR(255),
-        SCRATCH_LOCATION VARCHAR(255),
-        LOGIN_USERNAME VARCHAR(255),
-        RESOURCE_CS_TOKEN VARCHAR(255),
-        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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE SLURM_GROUP_COMPUTE_RESOURCE_PREFERENCE
-(
-        RESOURCE_ID VARCHAR(255) NOT NULL,
-        GROUP_RESOURCE_PROFILE_ID VARCHAR(255) NOT NULL,
-        PREFERED_BATCH_QUEUE VARCHAR(255) DEFAULT NULL,
-        ALLOCATION_PROJECT_NUMBER VARCHAR(255) DEFAULT NULL,
-        USAGE_REPORTING_GATEWAY_ID VARCHAR(255) DEFAULT NULL,
-        QUALITY_OF_SERVICE VARCHAR(255) DEFAULT NULL,
-        RESERVATION VARCHAR(255) DEFAULT NULL,
-        RESERVATION_START_TIME TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-        RESERVATION_END_TIME TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00',
-        SSH_ACCOUNT_PROVISIONER VARCHAR(255) DEFAULT NULL,
-        SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO TEXT DEFAULT NULL,
-        PRIMARY KEY (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID),
-        CONSTRAINT FK_SLURM_PREF_TO_BASE FOREIGN KEY (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID)
-                REFERENCES GROUP_COMPUTE_RESOURCE_PREFERENCE (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID)
-                ON DELETE CASCADE
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE AWS_GROUP_COMPUTE_RESOURCE_PREFERENCE
-(
-        RESOURCE_ID VARCHAR(255) NOT NULL,
-        GROUP_RESOURCE_PROFILE_ID VARCHAR(255) NOT NULL,
-        AWS_REGION VARCHAR(255) NOT NULL,
-        PREFERRED_AMI_ID VARCHAR(255) NOT NULL,
-        PREFERRED_INSTANCE_TYPE VARCHAR(255) NOT NULL,
-        PRIMARY KEY (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID),
-        CONSTRAINT FK_AWS_PREF_TO_BASE FOREIGN KEY (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID)
-                REFERENCES GROUP_COMPUTE_RESOURCE_PREFERENCE (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID)
-                ON DELETE CASCADE
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-CREATE TABLE COMPUTE_RESOURCE_RESERVATION_QUEUE (RESERVATION_ID VARCHAR(255), QUEUE_NAME VARCHAR(255) NOT NULL
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-CREATE INDEX I_CMPTN_Q_RESERVATION_ID ON COMPUTE_RESOURCE_RESERVATION_QUEUE (RESERVATION_ID);
-ALTER TABLE COMPUTE_RESOURCE_RESERVATION ADD CONSTRAINT FK_COMPUTE_RESOURCE_RESERVATION 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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE PARSER_OUTPUT
-(
-        PARSER_OUTPUT_ID VARCHAR(255) NOT NULL,
-        PARSER_OUTPUT_NAME VARCHAR(255) NOT NULL,
-        PARSER_OUTPUT_REQUIRED TINYINT(1) 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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE PARSER_INPUT
-(
-        PARSER_INPUT_ID VARCHAR(255) NOT NULL,
-        PARSER_INPUT_NAME VARCHAR(255) NOT NULL,
-        PARSER_INPUT_REQUIRED TINYINT(1) 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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE CONFIGURATION
-(
-          CONFIG_KEY VARCHAR(255),
-          CONFIG_VAL VARCHAR(255),
-          PRIMARY KEY(CONFIG_KEY, CONFIG_VAL)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL) VALUES('app_catalog_version', '0.16');
-
diff --git a/airavata-api/src/main/resources/database_scripts/credstore-mysql.sql b/airavata-api/src/main/resources/database_scripts/credstore-mysql.sql
deleted file mode 100644
index faaa0a051a1..00000000000
--- a/airavata-api/src/main/resources/database_scripts/credstore-mysql.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-CREATE TABLE COMMUNITY_USER (
-  GATEWAY_ID           VARCHAR(100) NOT NULL,
-  COMMUNITY_USER_NAME  VARCHAR(100) NOT NULL,
-  TOKEN_ID             VARCHAR(100) NOT NULL,
-  COMMUNITY_USER_EMAIL VARCHAR(256) NOT NULL,
-  PRIMARY KEY (GATEWAY_ID, COMMUNITY_USER_NAME, TOKEN_ID)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE CREDENTIALS (
-  GATEWAY_ID     VARCHAR(100) NOT NULL,
-  TOKEN_ID       VARCHAR(100) 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)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE CONFIGURATION (
-  CONFIG_KEY VARCHAR(255),
-  CONFIG_VAL VARCHAR(255),
-  PRIMARY KEY (CONFIG_KEY, CONFIG_VAL)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL) VALUES ('credential_store_version', '0.16');
-
diff --git a/airavata-api/src/main/resources/database_scripts/expcatalog-mysql.sql b/airavata-api/src/main/resources/database_scripts/expcatalog-mysql.sql
deleted file mode 100644
index 4cf623c641c..00000000000
--- a/airavata-api/src/main/resources/database_scripts/expcatalog-mysql.sql
+++ /dev/null
@@ -1,446 +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)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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 NOW(),
-        PRIMARY KEY (PROJECT_ID),
-        FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID) ON DELETE CASCADE
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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 NOW(),
-        DESCRIPTION varchar(255),
-        EXECUTION_ID varchar(255),
-        GATEWAY_EXECUTION_ID varchar(255),
-        GATEWAY_INSTANCE_ID varchar(255),
-        ENABLE_EMAIL_NOTIFICATION tinyint(1),
-        EMAIL_ADDRESSES text,
-        PRIMARY KEY (EXPERIMENT_ID),
-        FOREIGN KEY (PROJECT_ID) REFERENCES PROJECT(PROJECT_ID) ON DELETE CASCADE
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-
-CREATE TABLE EXPERIMENT_INPUT
-(
-        EXPERIMENT_ID varchar(255) NOT NULL,
-        INPUT_NAME varchar(255),
-        INPUT_VALUE text,
-        DATA_TYPE varchar(255),
-        APPLICATION_ARGUMENT varchar(255),
-        STANDARD_INPUT tinyint(1),
-        USER_FRIENDLY_DESCRIPTION TEXT,
-        METADATA varchar(4096),
-        INPUT_ORDER int(11),
-        IS_REQUIRED tinyint(1),
-        REQUIRED_TO_ADDED_TO_CMD tinyint(1),
-        DATA_STAGED tinyint(1),
-        STORAGE_RESOURCE_ID varchar(255),
-        IS_READ_ONLY tinyint(1),
-        OVERRIDE_FILENAME VARCHAR(255),
-        PRIMARY KEY(EXPERIMENT_ID,INPUT_NAME),
-        FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE EXPERIMENT_OUTPUT
-(
-        EXPERIMENT_ID varchar(255) NOT NULL,
-        OUTPUT_NAME varchar(255),
-        OUTPUT_VALUE text,
-        DATA_TYPE varchar(255),
-        APPLICATION_ARGUMENT varchar(255),
-        IS_REQUIRED tinyint(1),
-        REQUIRED_TO_ADDED_TO_CMD tinyint(1),
-        DATA_MOVEMENT tinyint(1),
-        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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-
-CREATE TABLE EXPERIMENT_STATUS (
-        STATUS_ID varchar(255),
-        EXPERIMENT_ID varchar(255) NOT NULL,
-        STATE varchar(255),
-        TIME_OF_STATE_CHANGE TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6),
-        REASON LONGTEXT,
-        PRIMARY KEY (STATUS_ID, EXPERIMENT_ID),
-        FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-
-CREATE TABLE EXPERIMENT_ERROR (
-        ERROR_ID varchar(255),
-        EXPERIMENT_ID varchar(255) NOT NULL,
-        CREATION_TIME timestamp DEFAULT NOW(),
-        ACTUAL_ERROR_MESSAGE text,
-        USER_FRIENDLY_MESSAGE text,
-        TRANSIENT_OR_PERSISTENT tinyint(1),
-        ROOT_CAUSE_ERROR_ID_LIST text,
-        PRIMARY KEY (ERROR_ID, EXPERIMENT_ID),
-        FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE USER_CONFIGURATION_DATA (
-        EXPERIMENT_ID varchar(255) NOT NULL,
-        AIRAVATA_AUTO_SCHEDULE tinyint(1),
-        OVERRIDE_MANUAL_SCHEDULED_PARAMS tinyint(1),
-        SHARE_EXPERIMENT_PUBLICALLY tinyint(1),
-        THROTTLE_RESOURCES tinyint(1),
-        USER_DN varchar(255),
-        GENERATE_CERT tinyint(1),
-        RESOURCE_HOST_ID varchar(255),
-        TOTAL_CPU_COUNT int(11),
-        NODE_COUNT int(11),
-        NUMBER_OF_THREADS int(11),
-        QUEUE_NAME varchar(255),
-        WALL_TIME_LIMIT int(11),
-        TOTAL_PHYSICAL_MEMORY int(11),
-        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 TINYINT(1),
-        PRIMARY KEY (EXPERIMENT_ID),
-        FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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,
-       STATIC_WORKING_DIR varchar(255),
-       OVERRIDE_LOGIN_USER_NAME varchar(255),
-       OVERRIDE_SCRATCH_LOCATION varchar(255),
-       OVERRIDE_ALLOCATION_PROJECT_NUMBER varchar(255),
-       PARALLEL_GROUP_COUNT INT,
-       PRIMARY KEY (EXPERIMENT_ID,RESOURCE_HOST_ID,QUEUE_NAME),
-       FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-
-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 1;
-
-
-CREATE TABLE PROCESS (
-        PROCESS_ID varchar(255),
-        EXPERIMENT_ID varchar(255) NOT NULL,
-        CREATION_TIME  TIMESTAMP DEFAULT NOW(),
-        LAST_UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-        PROCESS_DETAIL text,
-        APPLICATION_INTERFACE_ID varchar(255),
-        TASK_DAG TEXT,
-        APPLICATION_DEPLOYMENT_ID varchar(255),
-        COMPUTE_RESOURCE_ID varchar(255),
-        GATEWAY_EXECUTION_ID varchar(255),
-        ENABLE_EMAIL_NOTIFICATION BOOLEAN,
-        EMAIL_ADDRESSES TEXT,
-        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 TINYINT(1),
-        PRIMARY KEY (PROCESS_ID),
-        FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE PROCESS_INPUT
-(
-        PROCESS_ID varchar(255) NOT NULL,
-        INPUT_NAME varchar(255),
-        INPUT_VALUE text,
-        DATA_TYPE varchar(255),
-        APPLICATION_ARGUMENT varchar(255),
-        STANDARD_INPUT tinyint(1),
-        USER_FRIENDLY_DESCRIPTION TEXT,
-        METADATA varchar(4096),
-        INPUT_ORDER int(11),
-        IS_REQUIRED tinyint(1),
-        REQUIRED_TO_ADDED_TO_CMD tinyint(1),
-        DATA_STAGED tinyint(1),
-        STORAGE_RESOURCE_ID varchar(255),
-        IS_READ_ONLY tinyint(1),
-        OVERRIDE_FILENAME VARCHAR(255),
-        PRIMARY KEY(PROCESS_ID,INPUT_NAME),
-        FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE PROCESS_OUTPUT
-(
-        PROCESS_ID varchar(255) NOT NULL,
-        OUTPUT_NAME varchar(255),
-        OUTPUT_VALUE LONGTEXT,
-        DATA_TYPE varchar(255),
-        APPLICATION_ARGUMENT varchar(255),
-        IS_REQUIRED tinyint(1),
-        REQUIRED_TO_ADDED_TO_CMD tinyint(1),
-        DATA_MOVEMENT tinyint(1),
-        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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-
-CREATE TABLE PROCESS_STATUS (
-        STATUS_ID varchar(255),
-        PROCESS_ID varchar(255) NOT NULL,
-        STATE varchar(255),
-        TIME_OF_STATE_CHANGE TIMESTAMP(6) DEFAULT NOW(6) ON UPDATE NOW(6),
-        REASON LONGTEXT,
-        PRIMARY KEY (STATUS_ID, PROCESS_ID),
-        FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-
-CREATE TABLE PROCESS_ERROR (
-        ERROR_ID varchar(255),
-        PROCESS_ID varchar(255) NOT NULL,
-        CREATION_TIME timestamp DEFAULT NOW(),
-        ACTUAL_ERROR_MESSAGE text,
-        USER_FRIENDLY_MESSAGE text,
-        TRANSIENT_OR_PERSISTENT tinyint(1),
-        ROOT_CAUSE_ERROR_ID_LIST text,
-        PRIMARY KEY (ERROR_ID, PROCESS_ID),
-        FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE PROCESS_RESOURCE_SCHEDULE (
-        PROCESS_ID varchar(255) NOT NULL,
-        RESOURCE_HOST_ID varchar(255),
-        TOTAL_CPU_COUNT int(11),
-        NODE_COUNT int(11),
-        NUMBER_OF_THREADS int(11),
-        QUEUE_NAME varchar(255),
-        WALL_TIME_LIMIT int(11),
-        TOTAL_PHYSICAL_MEMORY int(11),
-        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
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE TASK (
-  TASK_ID varchar(255),
-  TASK_TYPE varchar(255),
-  PARENT_PROCESS_ID varchar(255) NOT NULL,
-  CREATION_TIME timestamp DEFAULT NOW(),
-  LAST_UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-  TASK_DETAIL text,
-  SUB_TASK_MODEL BLOB,
-  MAX_RETRY int(11) NOT NULL DEFAULT '3',
-  CURRENT_RETRY int(11) NOT NULL DEFAULT '0',
-  PRIMARY KEY (TASK_ID),
-  FOREIGN KEY (PARENT_PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE TASK_STATUS (
-        STATUS_ID varchar(255),
-        TASK_ID varchar(255) NOT NULL,
-        STATE varchar(255),
-        TIME_OF_STATE_CHANGE TIMESTAMP(6) DEFAULT NOW(6) ON UPDATE NOW(6),
-        REASON LONGTEXT,
-        PRIMARY KEY (STATUS_ID, TASK_ID),
-        FOREIGN KEY (TASK_ID) REFERENCES TASK(TASK_ID) ON DELETE CASCADE
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-
-CREATE TABLE TASK_ERROR (
-        ERROR_ID varchar(255),
-        TASK_ID varchar(255) NOT NULL,
-        CREATION_TIME timestamp DEFAULT NOW(),
-        ACTUAL_ERROR_MESSAGE text,
-        USER_FRIENDLY_MESSAGE text,
-        TRANSIENT_OR_PERSISTENT tinyint(1),
-        ROOT_CAUSE_ERROR_ID_LIST text,
-        PRIMARY KEY (ERROR_ID, TASK_ID),
-        FOREIGN KEY (TASK_ID) REFERENCES TASK(TASK_ID) ON DELETE CASCADE
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE JOB (
-        JOB_ID varchar(255),
-        TASK_ID varchar(255) NOT NULL,
-        PROCESS_ID varchar(255),
-        JOB_DESCRIPTION LONGTEXT NOT NULL,
-        CREATION_TIME timestamp DEFAULT NOW(),
-        COMPUTE_RESOURCE_CONSUMED varchar(255),
-        JOB_NAME varchar(255),
-        WORKING_DIR varchar(255),
-        STD_OUT LONGTEXT,
-        STD_ERR LONGTEXT,
-        EXIT_CODE INT(11),
-        PRIMARY KEY (JOB_ID, TASK_ID),
-        FOREIGN KEY (TASK_ID) REFERENCES TASK(TASK_ID) ON DELETE CASCADE
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-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(6) DEFAULT NOW(6) ON UPDATE NOW(6),
-        REASON LONGTEXT,
-        PRIMARY KEY (STATUS_ID, JOB_ID, TASK_ID),
-        FOREIGN KEY (JOB_ID, TASK_ID) REFERENCES JOB(JOB_ID, TASK_ID) ON DELETE CASCADE
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE QUEUE_STATUS(
-        HOST_NAME VARCHAR(255) NOT NULL,
-        QUEUE_NAME VARCHAR(255) NOT NULL,
-        CREATED_TIME BIGINT(20) NOT NULL,
-        QUEUE_UP     TINYINT(1),
-        RUNNING_JOBS INT(11),
-        QUEUED_JOBS INT(11),
-        PRIMARY KEY (HOST_NAME, QUEUE_NAME, CREATED_TIME)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE CONFIGURATION
-(
-        CONFIG_KEY VARCHAR(255),
-        CONFIG_VAL VARCHAR(255),
-        EXPIRE_DATE TIMESTAMP DEFAULT NOW() ON UPDATE NOW(),
-        CATEGORY_ID VARCHAR (255),
-        PRIMARY KEY(CONFIG_KEY, CONFIG_VAL, CATEGORY_ID)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL, EXPIRE_DATE, CATEGORY_ID) VALUES('registry.version', '0.16', NOW() ,'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 NOW(),
-  PRIMARY KEY (PROCESS_ID, WORKFLOW_ID),
-  FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE GATEWAY_USAGE_REPORTING_COMMAND (
-  GATEWAY_ID VARCHAR(255) NOT NULL,
-  COMPUTE_RESOURCE_ID VARCHAR(255) NOT NULL,
-  COMMAND LONGTEXT NOT NULL,
-  PRIMARY KEY (GATEWAY_ID, COMPUTE_RESOURCE_ID)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
diff --git a/airavata-api/src/main/resources/database_scripts/replicacatalog-mysql.sql b/airavata-api/src/main/resources/database_scripts/replicacatalog-mysql.sql
deleted file mode 100644
index 99731e0a9c1..00000000000
--- a/airavata-api/src/main/resources/database_scripts/replicacatalog-mysql.sql
+++ /dev/null
@@ -1,77 +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 TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin,
-        PRODUCT_DESCRIPTION VARCHAR (255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin,
-        OWNER_NAME VARCHAR (255),
-        PARENT_PRODUCT_URI VARCHAR (255),
-        PRODUCT_SIZE INT,
-        CREATION_TIME TIMESTAMP NULL DEFAULT '0000-00-00 00:00:00',
-        LAST_MODIFIED_TIME TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-        PRODUCT_TYPE VARCHAR(10),
-        PRIMARY KEY (PRODUCT_URI),
-        FOREIGN KEY (PARENT_PRODUCT_URI) REFERENCES DATA_PRODUCT (PRODUCT_URI) ON DELETE CASCADE
-) ENGINE = InnoDB DEFAULT CHARSET = latin1;
-
-CREATE TABLE DATA_REPLICA_LOCATION (
-        REPLICA_ID VARCHAR (255),
-        PRODUCT_URI VARCHAR (255) NOT NULL,
-        REPLICA_NAME TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin,
-        REPLICA_DESCRIPTION VARCHAR (255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin,
-        STORAGE_RESOURCE_ID VARCHAR (255),
-        FILE_PATH VARCHAR (1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin,
-        CREATION_TIME TIMESTAMP NULL DEFAULT '0000-00-00 00:00:00',
-        LAST_MODIFIED_TIME TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-        VALID_UNTIL_TIME TIMESTAMP NULL 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
-) ENGINE = InnoDB DEFAULT CHARSET = latin1;
-
-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
-) ENGINE = InnoDB DEFAULT CHARSET = latin1;
-
-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
-) ENGINE = InnoDB DEFAULT CHARSET = latin1;
-
-CREATE TABLE CONFIGURATION (
-        CONFIG_KEY VARCHAR(255),
-        CONFIG_VAL VARCHAR(255),
-        PRIMARY KEY(CONFIG_KEY, CONFIG_VAL)
-) ENGINE = InnoDB DEFAULT CHARSET = latin1;
-
-INSERT INTO
-        CONFIGURATION (CONFIG_KEY, CONFIG_VAL)
-VALUES
-        ('data_catalog_version', '0.16');
diff --git a/airavata-api/src/main/resources/database_scripts/sharing-registry-mysql.sql b/airavata-api/src/main/resources/database_scripts/sharing-registry-mysql.sql
deleted file mode 100644
index 87b55d974a9..00000000000
--- a/airavata-api/src/main/resources/database_scripts/sharing-registry-mysql.sql
+++ /dev/null
@@ -1,149 +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)
-)ENGINE=InnoDB DEFAULT CHARACTER SET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARACTER SET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARACTER SET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARACTER SET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARACTER SET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARACTER SET=latin1;
-
-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
-)ENGINE=InnoDB DEFAULT CHARACTER SET=latin1;
-
-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 TEXT,
-  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
-)ENGINE=InnoDB DEFAULT CHARACTER SET=latin1;
-
-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),
-  CONSTRAINT `SHARING_PERMISSION_TYPE_ID_DOMAIN_ID_FK` FOREIGN KEY (PERMISSION_TYPE_ID, DOMAIN_ID) REFERENCES PERMISSION_TYPE(PERMISSION_TYPE_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION,
-  CONSTRAINT `SHARING_ENTITY_ID_DOMAIN_ID_FK` FOREIGN KEY (ENTITY_ID, DOMAIN_ID) REFERENCES ENTITY(ENTITY_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION,
-  CONSTRAINT `SHARING_INHERITED_PARENT_ID_DOMAIN_ID_FK` FOREIGN KEY (INHERITED_PARENT_ID, DOMAIN_ID) REFERENCES ENTITY(ENTITY_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION,
-  CONSTRAINT `SHARING_GROUP_ID_DOMAIN_ID_FK` FOREIGN KEY (GROUP_ID, DOMAIN_ID) REFERENCES USER_GROUP(GROUP_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION
-)ENGINE=InnoDB DEFAULT CHARACTER SET=latin1;
-
-CREATE TABLE CONFIGURATION
-(
-  CONFIG_KEY VARCHAR(255) NOT NULL,
-  CONFIG_VALUE VARCHAR(255) NOT NULL,
-  PRIMARY KEY(CONFIG_KEY, CONFIG_VALUE)
-)ENGINE=InnoDB DEFAULT CHARACTER SET=latin1;
-
-INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VALUE) VALUES('sharing_reg_version', '0.17');
-
-ALTER TABLE DOMAIN ADD CONSTRAINT `DOMAIN_INITIAL_USER_GROUP_ID_FK` 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/database_scripts/user-profile-catalog-mysql.sql b/airavata-api/src/main/resources/database_scripts/user-profile-catalog-mysql.sql
deleted file mode 100644
index bcc37afdb95..00000000000
--- a/airavata-api/src/main/resources/database_scripts/user-profile-catalog-mysql.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)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS 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 DATETIME,
-    STATE VARCHAR (255),
-    COMMENTS TEXT,
-    GPG_KEY TEXT,
-    TIME_ZONE VARCHAR (255),
-    PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS 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
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS 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
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS 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
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS 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
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS 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
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS 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
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS 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
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS 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
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS 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
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE CONFIGURATION
-(
-        CONFIG_KEY VARCHAR(255) NOT NULL,
-        CONFIG_VAL VARCHAR(255) NOT NULL,
-        PRIMARY KEY(CONFIG_KEY, CONFIG_VAL)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL) VALUES('user_profile_catalog_version', '0.17');
diff --git a/airavata-api/src/main/resources/database_scripts/workflowcatalog-mysql.sql b/airavata-api/src/main/resources/database_scripts/workflowcatalog-mysql.sql
deleted file mode 100644
index a4d43bbf25c..00000000000
--- a/airavata-api/src/main/resources/database_scripts/workflowcatalog-mysql.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 LONGTEXT,
-        IMAGE BLOB,
-        CREATION_TIME timestamp DEFAULT NOW(),
-        UPDATE_TIME TIMESTAMP DEFAULT NOW() ON UPDATE NOW(),
-        PRIMARY KEY (TEMPLATE_ID)
-);
-
-CREATE TABLE WORKFLOW_INPUT
-(
-         TEMPLATE_ID VARCHAR(255) NOT NULL,
-         INPUT_KEY VARCHAR(255),
-         INPUT_VALUE VARCHAR(255),
-         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 LONGTEXT,
-         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 NOW() ON UPDATE NOW(),
-        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 NOW() ON UPDATE NOW(),
-        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 NOW() ON UPDATE NOW(),
-        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 NOW() ON UPDATE NOW(),
-        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 NOW() ON UPDATE NOW(),
-        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/airavata-api/src/main/resources/migrations-util/derby/airavata-server.properties b/airavata-api/src/main/resources/migrations-util/derby/airavata-server.properties
deleted file mode 100644
index 006bd2d7d33..00000000000
--- a/airavata-api/src/main/resources/migrations-util/derby/airavata-server.properties
+++ /dev/null
@@ -1,72 +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.
-#
-
-###########################################################################
-#
-#  Properties file for creating database migrations
-#
-###########################################################################
-
-###########################################################################
-#  API Server Registry Configuration
-###########################################################################
-
-#for derby [AiravataJPARegistry]
-registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-registry.jdbc.url=jdbc:derby:experiment_catalog;create=true;user=airavata;password=airavata
-registry.jdbc.user=airavata
-registry.jdbc.password=airavata
-validationQuery=SELECT 1 from CONFIGURATION
-
-# Properties for default user mode
-default.registry.user=admin
-default.registry.gateway=php_reference_gateway
-default.registry.oauth.client.id=client_id
-default.registry.oauth.client.secret=client_secret
-
-###########################################################################
-#  Application Catalog DB Configuration
-###########################################################################
-#for derby [AiravataJPARegistry]
-appcatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-appcatalog.jdbc.url=jdbc:derby:app_catalog;create=true;user=airavata;password=airavata
-appcatalog.jdbc.user=airavata
-appcatalog.jdbc.password=airavata
-appcatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-##########################################################################
-#  Replica Catalog DB Configuration
-###########################################################################
-#for derby [AiravataJPARegistry]
-replicacatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-replicacatalog.jdbc.url=jdbc:derby:replica_catalog;create=true;user=airavata;password=airavata
-replicacatalog.jdbc.user=airavata
-replicacatalog.jdbc.password=airavata
-replicacatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-###########################################################################
-#  Workflow Catalog DB Configuration
-###########################################################################
-#for derby [AiravataJPARegistry]
-workflowcatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-workflowcatalog.jdbc.url=jdbc:derby:workflow_catalog;create=true;user=airavata;password=airavata
-workflowcatalog.jdbc.user=airavata
-workflowcatalog.jdbc.password=airavata
-workflowcatalog.validationQuery=SELECT 1 from CONFIGURATION
diff --git a/airavata-api/src/main/resources/migrations-util/mysql/airavata-server.properties b/airavata-api/src/main/resources/migrations-util/mysql/airavata-server.properties
deleted file mode 100644
index ed79857f8d7..00000000000
--- a/airavata-api/src/main/resources/migrations-util/mysql/airavata-server.properties
+++ /dev/null
@@ -1,63 +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.
-#
-
-###########################################################################
-#
-#  Properties file for creating database migrations
-#
-###########################################################################
-
-###########################################################################
-#  API Server Registry Configuration
-###########################################################################
-
-#for derby [AiravataJPARegistry]
-registry.jdbc.driver=org.mariadb.jdbc.Driver
-registry.jdbc.url=jdbc:mariadb://airavata.host:13306/experiment_catalog
-registry.jdbc.user=airavata
-registry.jdbc.password=123456
-validationQuery=SELECT 1 from CONFIGURATION
-
-# Properties for default user mode
-default.registry.user=admin
-default.registry.gateway=php_reference_gateway
-default.registry.oauth.client.id=client_id
-default.registry.oauth.client.secret=client_secret
-
-###########################################################################
-#  Application Catalog DB Configuration
-###########################################################################
-#for derby [AiravataJPARegistry]
-appcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-appcatalog.jdbc.url=jdbc:mariadb://airavata.host:13306/app_catalog
-appcatalog.jdbc.user=airavata
-appcatalog.jdbc.password=123456
-appcatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-##########################################################################
-#  Replica Catalog DB Configuration
-###########################################################################
-#for derby [AiravataJPARegistry]
-replicacatalog.jdbc.driver=org.mariadb.jdbc.Driver
-replicacatalog.jdbc.url=jdbc:mariadb://airavata.host:13306/replica_catalog
-replicacatalog.jdbc.user=airavata
-replicacatalog.jdbc.password=123456
-replicacatalog.validationQuery=SELECT 1 from CONFIGURATION
diff --git a/airavata-api/src/main/resources/migrations-util/mysql/docker-compose.yml b/airavata-api/src/main/resources/migrations-util/mysql/docker-compose.yml
deleted file mode 100644
index c1478edbe65..00000000000
--- a/airavata-api/src/main/resources/migrations-util/mysql/docker-compose.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-version: '3'
-services:
-  db:
-    image: mariadb:10.4.13
-    environment:
-      - MYSQL_ROOT_PASSWORD=123456
-      - MYSQL_USER=airavata
-      - MYSQL_PASSWORD=123456
-    volumes:
-      - ./docker-entrypoint-initdb.d/:/docker-entrypoint-initdb.d
-    ports:
-        - "13306:3306"
-    command: ['mysqld', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci', '--sql_mode=']
-# Connect to database with:
-# $ docker run --network mysql_default -it --rm mariadb:10 mysql -h mysql_db_1 -u airavata -p123456
diff --git a/airavata-api/src/main/resources/migrations-util/mysql/docker-entrypoint-initdb.d/create_databases.sql b/airavata-api/src/main/resources/migrations-util/mysql/docker-entrypoint-initdb.d/create_databases.sql
deleted file mode 100644
index 9b9a9bd56f1..00000000000
--- a/airavata-api/src/main/resources/migrations-util/mysql/docker-entrypoint-initdb.d/create_databases.sql
+++ /dev/null
@@ -1,27 +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 database app_catalog;
-grant all privileges on app_catalog.* to 'airavata'@'%' with grant option;
-create database experiment_catalog;
-grant all privileges on experiment_catalog.* to 'airavata'@'%' with grant option;
-create database replica_catalog;
-grant all privileges on replica_catalog.* to 'airavata'@'%' with grant option;
diff --git a/airavata-api/src/test/java/org/apache/airavata/helix/SFTPDeleteDirTest.java b/airavata-api/src/test/java/org/apache/airavata/helix/SFTPDeleteDirTest.java
index a1de29ecc93..16f75cf53fd 100644
--- a/airavata-api/src/test/java/org/apache/airavata/helix/SFTPDeleteDirTest.java
+++ b/airavata-api/src/test/java/org/apache/airavata/helix/SFTPDeleteDirTest.java
@@ -1,5 +1,30 @@
+/**
+*
+* 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.
+*/
 package org.apache.airavata.helix;
 
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
 import org.apache.airavata.helix.adaptor.SSHJAgentAdaptor;
 import org.apache.sshd.common.file.virtualfs.VirtualFileSystemFactory;
 import org.apache.sshd.server.SshServer;
@@ -11,14 +36,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Collections;
-import java.util.List;
-
 public class SFTPDeleteDirTest {
 
     private SshServer sshd;
@@ -26,47 +43,48 @@ public class SFTPDeleteDirTest {
     private Path sftpRootDir;
     private int sftpPort = 52122;
 
-    private String privateKey = "-----BEGIN OPENSSH PRIVATE KEY-----\n" +
-            "b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABCHHZONdz\n" +
-            "yrWLbnw4nyEw3BAAAAGAAAAAEAAAGXAAAAB3NzaC1yc2EAAAADAQABAAABgQCxhKaGaUlU\n" +
-            "Znlr6OtFQ7hjVceZsWLBaIWB5NUwp45IoWLm7Hnor+Y8J/SwLBgdUSsjxkMUQMMbJdY/rP\n" +
-            "Gwc8aW0K1JMjSNhv03dBxvXHdY+NSd24WjSezD89l6v78lGhVQ5g3rI4eTFsfPy2WSxZw1\n" +
-            "Fo0UUDVzzBtLuvC9ZCWd3nsT8Ox4LnZWLHrrRxGX2eCotEEO6CT1+wmk4szIkeDDmX79Tb\n" +
-            "KatcN2vv7H6WjsoGH1bhc1QwS2/hmOdBwqGfm+sE0BI3VgMJ1NVDQrnt0IXlMtLH9Feg1y\n" +
-            "tdagCzaHulQ9lHn1wBzSARP/NqYzu2vNwpWSSJeafClHpA8yF/9FW9gOi4k+Oo949b+Xd1\n" +
-            "NHqjt+7lnlsepm0IsgfJ9Gr/0sweYfUSsTfGZGMstSRMu8V+bD1BaVqXQKZ80XoCm0NMnR\n" +
-            "Chm109wXtt5+0atDmIFiy1Byr8QjwjqsIap1j93R/8R3L3mhUmLruSl7IPKPhjShEIL253\n" +
-            "GpoHiSENae9e0AAAWgEaos8m239pnUDpWU3N9VtUvg3XVh9WC1YwL9wg1rnl+uW3ygA4Xq\n" +
-            "VvGUEc5Xx5AR3buKaYGI7+Tb4RAwQL8HkQS78mDtmSiNKJbxmUWkLIWERBe/OZGO/HYPSl\n" +
-            "WS3nkXogcYy5Q/9Fy4U35Trg82yq/kaSjIneJAGLz0ShbQNgWBtnpzK8eHqceoMFYQsvZ+\n" +
-            "eaK3JWTwQPgXinj2E37OU5N0y5ncZ8yQ5bKEbOBZ62uYdZFnIgQhz9oNVS8ShIVZtBC0h4\n" +
-            "ytl45Tdsd4H8cy2RMzzvvLtsfnvA6EOzj5exSNrtsbjZMFvK7f1oatKkm71IknvieGr0nh\n" +
-            "qvmR+qc15wwnmmFus9MFpqxsOKdPzkeSvBjhe9Oj5Qc9g9ecNHuSuS7MTRcx6UFmB9tvo+\n" +
-            "iLW0uEzIguQSyaAo1VBNgbr+wz11TaB+rhi2krdUc59skS6/mrah7gJr0kGAJowLR+YGjN\n" +
-            "/UTJpaEhMWkktuAznY56qs7AlHqKzcNq+258LpIOQJzN9/gw9IB2rz0PNnA+NqDCHttQLw\n" +
-            "0dZe/oPHJQ6vI/5ykakSas5GJZOph5udSz05ndM5kRoMOGHhi8WeYA0vFBed3BH+lkZ59K\n" +
-            "z+vjf4sGmOb0ptW95QA9ZeMN899QvuCYOgnuyCPguVL3SsRkQ9AXmOrLT4oPTSUOY3t7vv\n" +
-            "GI5WN5ZN9zYtT21bOMqYi+cHlIhnaqz+GjRpEfGaqJFPLcj1tVznHbi+2HHCG0M+NTjw9G\n" +
-            "JRjAjqOfkJZ0/7KmfBT7lGWNPPNgXtYPDdYRHHiIeDMLu4s2gBbqn8pmIdG14K4IqLl7uC\n" +
-            "payMNJxmQ75oRFpv3Vtf31FlpnsT762iS0e7P0CwBxVZyjdCYet9IVjw6MJC62svnTDznn\n" +
-            "0ZxPdz78acoXlBkH67zDH69LyPGZlZ9e7HeKrMbOTU5mnUfSiHc3mk8PYEuphnKXFd8Zzi\n" +
-            "bc/SfaxLbf19MsuqlM+gqKR9hVqDn6Ri9JAmHJBgFNc5hdLSKucunNFFamCslCXRkB3TNl\n" +
-            "pbPxSLMJ9UDTcrRnzgi5zyQxSe3K8tspqhXQ6ek5Z2sZ+zZuFzcKzgUcd8fpYxC9lZvJ1b\n" +
-            "pS8OCuGUI6KHHmGJmNKBTbxvp0B4EjRIy3lDJDBMap/GN9GsgqscrvYPIfqlnVR7GXN+qj\n" +
-            "MgOsue1jtVzG1SBAmBxcctEFLzBsr4k/fNNTXPt/mPKeO3w59zt1OSPyNx63NbNmo/uWO1\n" +
-            "8P24MBcO5crhlYa5ptb6Fvi1/j6Yrg1NYDPutRopcZNemEFPkR4dqW5AhJwT8L8hqZmmhs\n" +
-            "DH97qNiqkqyVmrRIygnVMdYqXsn/uV8yEb5mgRw8C6fJ7OZsvwsSfy052tBKJhj/63Ay/S\n" +
-            "wJ+HxQ/8vthvEkXsaJWiQ2RwatZIoVpOhYEpKwSDuBHMKrnMiCow13+pAq9Gf/CbXUd/Ko\n" +
-            "xNQ8RZ8lkreUDjJJhTXRRcpufJChL6zQj9bat6E9QBq4l1XjGDhAqgfvQT/1fDataZW3vW\n" +
-            "skze0s7diqtYIWNlx2+4vGxL38pSCSqtOWjHS6Rbjf37ERKQMH57z4w3aEiahtBcgKTWBy\n" +
-            "n4UD18TfLGd2i7jtENLxOcWBFzRxtIbFnKGiktLcp0XILs/lOhtRF+K2abiif26rDx++jI\n" +
-            "4iQCet6ltdeQJLekjmNh4/9Y4hCf5yx9lKuGbzGeZPI66ClbY+R2l29ZXUNUxZmVKM4BDw\n" +
-            "2LqMlVLcM1Nzg6ftQ09Dku1ApX/uKeOaf0I0DPaBwVD+iTGCeZWuOg5b1LZUuxxYT4ZB6F\n" +
-            "hoZ8/1mt5gTzo4XdZCmJ7jCOqEc75JV2NEfcIwpy6TOZPVMMWFYT88OgkF86Vxx8GR0FQU\n" +
-            "CLSDGVZjFU7kv1eKpDJ0oETyGBELC1PPMpm90nxCkzCx7uQw\n" +
-            "-----END OPENSSH PRIVATE KEY-----\n";
-
-    private String publicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxhKaGaUlUZnlr6OtFQ7hjVceZsWLBaIWB5NUwp45IoWLm7Hnor+Y8J/SwLBgdUSsjxkMUQMMbJdY/rPGwc8aW0K1JMjSNhv03dBxvXHdY+NSd24WjSezD89l6v78lGhVQ5g3rI4eTFsfPy2WSxZw1Fo0UUDVzzBtLuvC9ZCWd3nsT8Ox4LnZWLHrrRxGX2eCotEEO6CT1+wmk4szIkeDDmX79TbKatcN2vv7H6WjsoGH1bhc1QwS2/hmOdBwqGfm+sE0BI3VgMJ1NVDQrnt0IXlMtLH9Feg1ytdagCzaHulQ9lHn1wBzSARP/NqYzu2vNwpWSSJeafClHpA8yF/9FW9gOi4k+Oo949b+Xd1NHqjt+7lnlsepm0IsgfJ9Gr/0sweYfUSsTfGZGMstSRMu8V+bD1BaVqXQKZ80XoCm0NMnRChm109wXtt5+0atDmIFiy1Byr8QjwjqsIap1j93R/8R3L3mhUmLruSl7IPKPhjShEIL253GpoHiSENae9e0= dwannipu@Dimuthus-MacBook-Pro.local";
+    private String privateKey = "-----BEGIN OPENSSH PRIVATE KEY-----\n"
+            + "b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABCHHZONdz\n"
+            + "yrWLbnw4nyEw3BAAAAGAAAAAEAAAGXAAAAB3NzaC1yc2EAAAADAQABAAABgQCxhKaGaUlU\n"
+            + "Znlr6OtFQ7hjVceZsWLBaIWB5NUwp45IoWLm7Hnor+Y8J/SwLBgdUSsjxkMUQMMbJdY/rP\n"
+            + "Gwc8aW0K1JMjSNhv03dBxvXHdY+NSd24WjSezD89l6v78lGhVQ5g3rI4eTFsfPy2WSxZw1\n"
+            + "Fo0UUDVzzBtLuvC9ZCWd3nsT8Ox4LnZWLHrrRxGX2eCotEEO6CT1+wmk4szIkeDDmX79Tb\n"
+            + "KatcN2vv7H6WjsoGH1bhc1QwS2/hmOdBwqGfm+sE0BI3VgMJ1NVDQrnt0IXlMtLH9Feg1y\n"
+            + "tdagCzaHulQ9lHn1wBzSARP/NqYzu2vNwpWSSJeafClHpA8yF/9FW9gOi4k+Oo949b+Xd1\n"
+            + "NHqjt+7lnlsepm0IsgfJ9Gr/0sweYfUSsTfGZGMstSRMu8V+bD1BaVqXQKZ80XoCm0NMnR\n"
+            + "Chm109wXtt5+0atDmIFiy1Byr8QjwjqsIap1j93R/8R3L3mhUmLruSl7IPKPhjShEIL253\n"
+            + "GpoHiSENae9e0AAAWgEaos8m239pnUDpWU3N9VtUvg3XVh9WC1YwL9wg1rnl+uW3ygA4Xq\n"
+            + "VvGUEc5Xx5AR3buKaYGI7+Tb4RAwQL8HkQS78mDtmSiNKJbxmUWkLIWERBe/OZGO/HYPSl\n"
+            + "WS3nkXogcYy5Q/9Fy4U35Trg82yq/kaSjIneJAGLz0ShbQNgWBtnpzK8eHqceoMFYQsvZ+\n"
+            + "eaK3JWTwQPgXinj2E37OU5N0y5ncZ8yQ5bKEbOBZ62uYdZFnIgQhz9oNVS8ShIVZtBC0h4\n"
+            + "ytl45Tdsd4H8cy2RMzzvvLtsfnvA6EOzj5exSNrtsbjZMFvK7f1oatKkm71IknvieGr0nh\n"
+            + "qvmR+qc15wwnmmFus9MFpqxsOKdPzkeSvBjhe9Oj5Qc9g9ecNHuSuS7MTRcx6UFmB9tvo+\n"
+            + "iLW0uEzIguQSyaAo1VBNgbr+wz11TaB+rhi2krdUc59skS6/mrah7gJr0kGAJowLR+YGjN\n"
+            + "/UTJpaEhMWkktuAznY56qs7AlHqKzcNq+258LpIOQJzN9/gw9IB2rz0PNnA+NqDCHttQLw\n"
+            + "0dZe/oPHJQ6vI/5ykakSas5GJZOph5udSz05ndM5kRoMOGHhi8WeYA0vFBed3BH+lkZ59K\n"
+            + "z+vjf4sGmOb0ptW95QA9ZeMN899QvuCYOgnuyCPguVL3SsRkQ9AXmOrLT4oPTSUOY3t7vv\n"
+            + "GI5WN5ZN9zYtT21bOMqYi+cHlIhnaqz+GjRpEfGaqJFPLcj1tVznHbi+2HHCG0M+NTjw9G\n"
+            + "JRjAjqOfkJZ0/7KmfBT7lGWNPPNgXtYPDdYRHHiIeDMLu4s2gBbqn8pmIdG14K4IqLl7uC\n"
+            + "payMNJxmQ75oRFpv3Vtf31FlpnsT762iS0e7P0CwBxVZyjdCYet9IVjw6MJC62svnTDznn\n"
+            + "0ZxPdz78acoXlBkH67zDH69LyPGZlZ9e7HeKrMbOTU5mnUfSiHc3mk8PYEuphnKXFd8Zzi\n"
+            + "bc/SfaxLbf19MsuqlM+gqKR9hVqDn6Ri9JAmHJBgFNc5hdLSKucunNFFamCslCXRkB3TNl\n"
+            + "pbPxSLMJ9UDTcrRnzgi5zyQxSe3K8tspqhXQ6ek5Z2sZ+zZuFzcKzgUcd8fpYxC9lZvJ1b\n"
+            + "pS8OCuGUI6KHHmGJmNKBTbxvp0B4EjRIy3lDJDBMap/GN9GsgqscrvYPIfqlnVR7GXN+qj\n"
+            + "MgOsue1jtVzG1SBAmBxcctEFLzBsr4k/fNNTXPt/mPKeO3w59zt1OSPyNx63NbNmo/uWO1\n"
+            + "8P24MBcO5crhlYa5ptb6Fvi1/j6Yrg1NYDPutRopcZNemEFPkR4dqW5AhJwT8L8hqZmmhs\n"
+            + "DH97qNiqkqyVmrRIygnVMdYqXsn/uV8yEb5mgRw8C6fJ7OZsvwsSfy052tBKJhj/63Ay/S\n"
+            + "wJ+HxQ/8vthvEkXsaJWiQ2RwatZIoVpOhYEpKwSDuBHMKrnMiCow13+pAq9Gf/CbXUd/Ko\n"
+            + "xNQ8RZ8lkreUDjJJhTXRRcpufJChL6zQj9bat6E9QBq4l1XjGDhAqgfvQT/1fDataZW3vW\n"
+            + "skze0s7diqtYIWNlx2+4vGxL38pSCSqtOWjHS6Rbjf37ERKQMH57z4w3aEiahtBcgKTWBy\n"
+            + "n4UD18TfLGd2i7jtENLxOcWBFzRxtIbFnKGiktLcp0XILs/lOhtRF+K2abiif26rDx++jI\n"
+            + "4iQCet6ltdeQJLekjmNh4/9Y4hCf5yx9lKuGbzGeZPI66ClbY+R2l29ZXUNUxZmVKM4BDw\n"
+            + "2LqMlVLcM1Nzg6ftQ09Dku1ApX/uKeOaf0I0DPaBwVD+iTGCeZWuOg5b1LZUuxxYT4ZB6F\n"
+            + "hoZ8/1mt5gTzo4XdZCmJ7jCOqEc75JV2NEfcIwpy6TOZPVMMWFYT88OgkF86Vxx8GR0FQU\n"
+            + "CLSDGVZjFU7kv1eKpDJ0oETyGBELC1PPMpm90nxCkzCx7uQw\n"
+            + "-----END OPENSSH PRIVATE KEY-----\n";
+
+    private String publicKey =
+            "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxhKaGaUlUZnlr6OtFQ7hjVceZsWLBaIWB5NUwp45IoWLm7Hnor+Y8J/SwLBgdUSsjxkMUQMMbJdY/rPGwc8aW0K1JMjSNhv03dBxvXHdY+NSd24WjSezD89l6v78lGhVQ5g3rI4eTFsfPy2WSxZw1Fo0UUDVzzBtLuvC9ZCWd3nsT8Ox4LnZWLHrrRxGX2eCotEEO6CT1+wmk4szIkeDDmX79TbKatcN2vv7H6WjsoGH1bhc1QwS2/hmOdBwqGfm+sE0BI3VgMJ1NVDQrnt0IXlMtLH9Feg1ytdagCzaHulQ9lHn1wBzSARP/NqYzu2vNwpWSSJeafClHpA8yF/9FW9gOi4k+Oo949b+Xd1NHqjt+7lnlsepm0IsgfJ9Gr/0sweYfUSsTfGZGMstSRMu8V+bD1BaVqXQKZ80XoCm0NMnRChm109wXtt5+0atDmIFiy1Byr8QjwjqsIap1j93R/8R3L3mhUmLruSl7IPKPhjShEIL253GpoHiSENae9e0= dwannipu@Dimuthus-MacBook-Pro.local";
     private String passphrase = "airavata";
 
     @BeforeEach
@@ -86,9 +104,7 @@ void setUp() throws Exception {
         sshd.setKeyPairProvider(new SimpleGeneratorHostKeyProvider());
 
         // SFTP subsystem
-        sshd.setSubsystemFactories(
-                Collections.singletonList(new SftpSubsystemFactory.Builder().build())
-        );
+        sshd.setSubsystemFactories(Collections.singletonList(new SftpSubsystemFactory.Builder().build()));
 
         // Virtual root
         sshd.setFileSystemFactory(new VirtualFileSystemFactory(sftpRootDir));
@@ -157,7 +173,6 @@ public void deleteNonEmptyDir() throws Exception {
 
         Assertions.assertFalse(itemsAfter.contains("dir1"));
         Assertions.assertTrue(itemsAfter.contains("dir2"));
-
     }
 
     @Test
diff --git a/airavata-api/src/test/resources/airavata-server.properties b/airavata-api/src/test/resources/airavata-server.properties
index 1cb4735a036..58370dc1b88 100644
--- a/airavata-api/src/test/resources/airavata-server.properties
+++ b/airavata-api/src/test/resources/airavata-server.properties
@@ -28,9 +28,9 @@
 #  API Server Registry Configuration
 ###########################################################################
 
-#for derby [AiravataJPARegistry]
+#for derby [AiravataJPARegistry] - all catalogs use single database
 registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-registry.jdbc.url=jdbc:derby:experiment_catalog;create=true;user=airavata;password=airavata
+registry.jdbc.url=jdbc:derby:airavata;create=true;user=airavata;password=airavata
 registry.jdbc.user=airavata
 registry.jdbc.password=airavata
 validationQuery=SELECT 1 from CONFIGURATION
@@ -44,9 +44,8 @@ default.registry.oauth.client.secret=client_secret
 ###########################################################################
 #  Application Catalog DB Configuration
 ###########################################################################
-#for derby [AiravataJPARegistry]
 appcatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-appcatalog.jdbc.url=jdbc:derby:app_catalog;create=true;user=airavata;password=airavata
+appcatalog.jdbc.url=jdbc:derby:airavata;create=true;user=airavata;password=airavata
 appcatalog.jdbc.user=airavata
 appcatalog.jdbc.password=airavata
 appcatalog.validationQuery=SELECT 1 from CONFIGURATION
@@ -54,9 +53,8 @@ appcatalog.validationQuery=SELECT 1 from CONFIGURATION
 ##########################################################################
 #  Replica Catalog DB Configuration
 ###########################################################################
-#for derby [AiravataJPARegistry]
 replicacatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-replicacatalog.jdbc.url=jdbc:derby:replica_catalog;create=true;user=airavata;password=airavata
+replicacatalog.jdbc.url=jdbc:derby:airavata;create=true;user=airavata;password=airavata
 replicacatalog.jdbc.user=airavata
 replicacatalog.jdbc.password=airavata
 replicacatalog.validationQuery=SELECT 1 from CONFIGURATION
@@ -64,9 +62,8 @@ replicacatalog.validationQuery=SELECT 1 from CONFIGURATION
 ###########################################################################
 #  Workflow Catalog DB Configuration
 ###########################################################################
-#for derby [AiravataJPARegistry]
 workflowcatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-workflowcatalog.jdbc.url=jdbc:derby:workflow_catalog;create=true;user=airavata;password=airavata
+workflowcatalog.jdbc.url=jdbc:derby:airavata;create=true;user=airavata;password=airavata
 workflowcatalog.jdbc.user=airavata
 workflowcatalog.jdbc.password=airavata
 workflowcatalog.validationQuery=SELECT 1 from CONFIGURATION
diff --git a/airavata-api/src/test/resources/authenticators.xml b/airavata-api/src/test/resources/authenticators.xml
index 46d71cd4c6a..e236a0db782 100644
--- a/airavata-api/src/test/resources/authenticators.xml
+++ b/airavata-api/src/test/resources/authenticators.xml
@@ -47,7 +47,7 @@ Those configurations are reside inside &lt;specificConfigurations&gt; tags.
                 systemUserPassword - The password of the LDAP server connection user
                 userDNTemplate - The DN structure of the users in LDAP
             -->
-                <url>ldap://localhost:10389</url>
+                <url>ldap://airavata.localhost:10389</url>
                 <systemUser>admin</systemUser>
                 <systemUserPassword>secret</systemUserPassword>
                 <userDNTemplate>uid={0},ou=system</userDNTemplate>
diff --git a/airavata-api/src/test/resources/jdbc-authenticator.xml b/airavata-api/src/test/resources/jdbc-authenticator.xml
index fccf8b89881..3df88ab39e7 100644
--- a/airavata-api/src/test/resources/jdbc-authenticator.xml
+++ b/airavata-api/src/test/resources/jdbc-authenticator.xml
@@ -26,7 +26,7 @@
         <specificConfigurations>
             <database>
                 <!--jdbcUrl>jdbc:h2:modules/commons/airavata-registry-rest/src/test/resources/testdb/test</jdbcUrl-->
-                <jdbcUrl>jdbc:derby://localhost:20000/experiment_catalog;create=true</jdbcUrl>
+                <jdbcUrl>jdbc:derby://airavata.localhost:20000/airavata;create=true</jdbcUrl>
                 <userName>admin</userName>
                 <password>admin</password>
                 <databaseDriver>org.apache.derby.jdbc.ClientDriver</databaseDriver>
diff --git a/airavata-api/src/test/resources/ldap-authenticator.xml b/airavata-api/src/test/resources/ldap-authenticator.xml
index 651920fc9ba..6261b7b40d6 100644
--- a/airavata-api/src/test/resources/ldap-authenticator.xml
+++ b/airavata-api/src/test/resources/ldap-authenticator.xml
@@ -31,7 +31,7 @@
                 systemUserPassword - The password of the LDAP server connection user
                 userDNTemplate - The DN structure of the users in LDAP
             -->
-                <url>ldap://localhost:10389</url>
+                <url>ldap://airavata.localhost:10389</url>
                 <systemUser>admin</systemUser>
                 <systemUserPassword>secret</systemUserPassword>
                 <userDNTemplate>uid={0},ou=system</userDNTemplate>
diff --git a/airavata-api/src/test/resources/session-authenticator.xml b/airavata-api/src/test/resources/session-authenticator.xml
index 31de2df4073..67601768672 100644
--- a/airavata-api/src/test/resources/session-authenticator.xml
+++ b/airavata-api/src/test/resources/session-authenticator.xml
@@ -28,7 +28,7 @@
             <database>
                 <!--jdbcUrl>jdbc:h2:modules/commons/airavata-registry-rest/src/test/resources/testdb/test</jdbcUrl-->
                 <!-- Points to /Users/thejaka/development/apache/airavata/trunk/modules/commons/airavata-registry-rest/target/tomcat6x/. -->
-                <jdbcUrl>jdbc:derby://localhost:20000/experiment_catalog;create=true</jdbcUrl>
+                <jdbcUrl>jdbc:derby://airavata.localhost:20000/airavata;create=true</jdbcUrl>
 
                 <!--jdbcUrl>jdbc:h2:modules/security/src/test/resources/testdb/test</jdbcUrl-->
 
diff --git a/compose.yml b/compose.yml
new file mode 100644
index 00000000000..e810e17d0f8
--- /dev/null
+++ b/compose.yml
@@ -0,0 +1,86 @@
+services:
+
+  db:
+    image: mariadb:11.8
+    container_name: airavata-db
+    restart: unless-stopped
+    environment:
+      MYSQL_ROOT_PASSWORD: rootpass
+      MYSQL_DATABASE: airavata
+      MYSQL_USER: airavata
+      MYSQL_PASSWORD: 123456
+    volumes:
+      - db_data:/var/lib/mysql
+      - ./airavata-api/modules/distribution/src/main/resources/conf/db/migration/airavata/V1__Baseline_schema.sql:/docker-entrypoint-initdb.d/01-schema.sql:ro
+    ports:
+      - "13306:3306"
+
+  rabbitmq:
+    image: rabbitmq:4.0-management
+    container_name: airavata-rabbitmq
+    restart: unless-stopped
+    environment:
+      RABBITMQ_DEFAULT_USER: airavata
+      RABBITMQ_DEFAULT_PASS: airavata
+    volumes:
+      - rabbitmq_data:/var/lib/rabbitmq
+    ports:
+      - "5672:5672"
+      - "15672:15672"
+
+  zookeeper:
+    image: zookeeper:latest
+    container_name: airavata-zookeeper
+    restart: unless-stopped
+    volumes:
+      - zk_data:/data
+      - zk_logs:/datalog
+    ports:
+      - "2181:2181"
+
+  kafka:
+    image: wurstmeister/kafka:latest
+    container_name: airavata-kafka
+    restart: unless-stopped
+    environment:
+      KAFKA_ADVERTISED_HOST_NAME: airavata.localhost
+      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+    volumes:
+      - kafka_data:/kafka
+    ports:
+      - "9092:9092"
+    depends_on:
+      - zookeeper
+
+  keycloak:
+    image: keycloak/keycloak:25.0
+    container_name: airavata-keycloak
+    restart: unless-stopped
+    environment:
+      KEYCLOAK_ADMIN: admin
+      KEYCLOAK_ADMIN_PASSWORD: admin
+    volumes:
+      - ./conf/keycloak/realm-default.json:/opt/keycloak/data/import/realm-default.json:ro
+      - ./conf/keycloak/keycloak.conf:/opt/keycloak/conf/keycloak.conf:ro
+    command: ["start", "--import-realm"]
+    ports:
+      - "18080:18080"
+
+  # Dev tools (start with: docker compose --profile tools up -d)
+
+  adminer:
+    profiles: [tools]
+    image: adminer:latest
+    container_name: airavata-adminer
+    restart: unless-stopped
+    ports:
+      - "18088:8080"
+    depends_on:
+      - db
+
+volumes:
+  db_data:
+  rabbitmq_data:
+  zk_data:
+  zk_logs:
+  kafka_data:
diff --git a/.devcontainer/keycloak/keycloak.conf b/conf/keycloak/keycloak.conf
similarity index 100%
rename from .devcontainer/keycloak/keycloak.conf
rename to conf/keycloak/keycloak.conf
diff --git a/.devcontainer/keycloak/realm-default.json b/conf/keycloak/realm-default.json
similarity index 99%
rename from .devcontainer/keycloak/realm-default.json
rename to conf/keycloak/realm-default.json
index 2bc90a07665..6b1ab5379d7 100644
--- a/.devcontainer/keycloak/realm-default.json
+++ b/conf/keycloak/realm-default.json
@@ -957,7 +957,7 @@
     "alwaysDisplayInConsole" : false,
     "clientAuthenticatorType" : "client-secret",
     "secret" : "DxeMtfiWU1qkDEmaGHf13RDahCujzhy1",
-    "redirectUris" : [ "", "/*", "http://airavata.host:20000/hub/oauth_callback" ],
+    "redirectUris" : [ "", "/*", "http://airavata.localhost:20000/hub/oauth_callback" ],
     "webOrigins" : [ "/*" ],
     "notBefore" : 0,
     "bearerOnly" : false,
@@ -1052,7 +1052,7 @@
     "description" : "",
     "rootUrl" : "",
     "adminUrl" : "",
-    "baseUrl" : "http://airavata.host:8009/",
+    "baseUrl" : "http://airavata.localhost:8009/",
     "surrogateAuthRequired" : false,
     "enabled" : true,
     "alwaysDisplayInConsole" : false,
@@ -1102,7 +1102,7 @@
     "alwaysDisplayInConsole" : false,
     "clientAuthenticatorType" : "client-secret",
     "secret" : "m36BXQIxX3j3VILadeHMK5IvbOeRlCCc",
-    "redirectUris" : [ "http://airavata.host:8008/callback*", "https://airavata.host:8009/auth/callback*" ],
+    "redirectUris" : [ "http://airavata.localhost:8008/callback*", "https://airavata.localhost:8009/auth/callback*" ],
     "webOrigins" : [ "*" ],
     "notBefore" : 0,
     "bearerOnly" : false,
@@ -1119,8 +1119,8 @@
       "oidc.ciba.grant.enabled" : "false",
       "client.secret.creation.time" : "1741724922",
       "backchannel.logout.session.required" : "true",
-      "frontchannel.logout.url" : "http://airavata.host:8009/",
-      "post.logout.redirect.uris" : "+##http://airavata.host:8009/",
+      "frontchannel.logout.url" : "http://airavata.localhost:8009/",
+      "post.logout.redirect.uris" : "+##http://airavata.localhost: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" : "http://airavata.host:8009/",
+      "logoutUrl" : "http://airavata.localhost:8009/",
       "sendIdTokenOnLogout" : "true",
       "passMaxAge" : "false"
     }
diff --git a/dev-tools/ansible/database.yml b/dev-tools/ansible/database.yml
deleted file mode 100644
index a403a5bcb72..00000000000
--- a/dev-tools/ansible/database.yml
+++ /dev/null
@@ -1,34 +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.
-#
-
----
-# Gather facts on the following (needed for database role to grant MySQL access from remote IPs)
-- hosts: api-orch
-- hosts: keycloak
-
-- hosts: database
-  tags: mysql , airavata
-  roles:
-    - env_setup
-    - role: database
-      become: yes
-      become_user: "{{user}}"
-
-...
diff --git a/dev-tools/ansible/inventories/dev/group_vars/all/vars.yml b/dev-tools/ansible/inventories/dev/group_vars/all/vars.yml
index 5320ff86978..50668431115 100644
--- a/dev-tools/ansible/inventories/dev/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/dev/group_vars/all/vars.yml
@@ -32,15 +32,16 @@ research_service_port: 18899
 file_server_port: 8050
 restproxy_port: 8082
 
-# Database names
-app_catalog: "app_catalog"
-exp_catalog: "experiment_catalog"
-replica_catalog: "replica_catalog"
-workflow_catalog: "workflow_catalog"
-sharing_catalog: "sharing_catalog"
-credential_store: "credential_store"
-profile_service: "profile_service"
-research_catalog: "research_catalog"
+# Database name (single unified database)
+db_name: "airavata"
+app_catalog: "{{ db_name }}"
+exp_catalog: "{{ db_name }}"
+replica_catalog: "{{ db_name }}"
+workflow_catalog: "{{ db_name }}"
+sharing_catalog: "{{ db_name }}"
+credential_store: "{{ db_name }}"
+profile_service: "{{ db_name }}"
+research_catalog: "{{ db_name }}"
 
 # Database drivers
 registry_jdbc_driver: "org.mariadb.jdbc.Driver"
@@ -76,8 +77,8 @@ email_expiration_minutes: 60
 email_based_monitoring_period: 10000
 
 # Kafka and RabbitMQ
-kafka_broker_url: "localhost:9092"
-restproxy_broker_url: "localhost:9092"
+kafka_broker_url: "airavata.localhost:9092"
+restproxy_broker_url: "airavata.localhost:9092"
 rabbitmq_port: 5672
 rabbitmq_status_exchange_name: "status_exchange"
 rabbitmq_process_exchange_name: "process_exchange"
@@ -86,7 +87,7 @@ experiment_launch_queue: "experiment_launch"
 
 # Zookeeper connection
 zookeeper_client_port: 2181
-zookeeper_connection: "localhost:{{ zookeeper_client_port }}"
+zookeeper_connection: "airavata.localhost:{{ zookeeper_client_port }}"
 embedded_zk: false
 # Zookeeper AdminServer port (default is 8081 to avoid conflict with Keycloak on 8080)
 # Can be overridden here if needed
@@ -99,12 +100,12 @@ api_server_public_hostname: "api.dev.cybershuttle.org"
 api_server_host: "{{ api_server_public_hostname }}"
 api_secured: true
 
-api_server_bind_host: "0.0.0.0"
-orchestrator_bind_host: "0.0.0.0"
-registry_bind_host: "0.0.0.0"
-sharing_registry_bind_host: "0.0.0.0"
-cred_store_server_bind_host: "0.0.0.0"
-profile_service_bind_host: "0.0.0.0"
+api_server_bind_host: "airavata.localhost"
+orchestrator_bind_host: "airavata.localhost"
+registry_bind_host: "airavata.localhost"
+sharing_registry_bind_host: "airavata.localhost"
+cred_store_server_bind_host: "airavata.localhost"
+profile_service_bind_host: "airavata.localhost"
 
 # TLS Configuration
 tls_enable: false
diff --git a/dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml b/dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml
index 6e853483d27..7b70ddf9c35 100644
--- a/dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml
@@ -185,23 +185,23 @@ thrift_client_pool_abandoned_removal_logged: true
 usage_reporting_key: "{{ vault_usage_reporting_key }}"
 
 participant_monitoring_enabled: true
-participant_monitoring_host: "0.0.0.0"
+participant_monitoring_host: "airavata.localhost"
 participant_monitoring_port: 9096
 
 pre_workflow_manager_monitoring_enabled: true
-pre_workflow_manager_monitoring_host: "0.0.0.0"
+pre_workflow_manager_monitoring_host: "airavata.localhost"
 pre_workflow_manager_monitoring_port: 9093
 
 post_workflow_manager_monitoring_enabled: true
-post_workflow_manager_monitoring_host: "0.0.0.0"
+post_workflow_manager_monitoring_host: "airavata.localhost"
 post_workflow_manager_monitoring_port: 9094
 
 parser_workflow_manager_monitoring_enabled: true
-parser_workflow_manager_monitoring_host: "0.0.0.0"
+parser_workflow_manager_monitoring_host: "airavata.localhost"
 parser_workflow_manager_monitoring_port: 9095
 
 api_server_monitoring_enabled: true
-api_server_monitoring_host: "0.0.0.0"
+api_server_monitoring_host: "airavata.localhost"
 api_server_monitoring_port: 9097
 
 # Variables related to data staging operations
diff --git a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
index 9e9fe4c92de..6d186d2bd3d 100644
--- a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
@@ -127,7 +127,7 @@ profile_service_port: 8962
 # Keycloak
 keycloak_ssl_keystore_file: "{{ inventory_dir }}/files/airavata.p12"
 keycloak_ssl_keystore_password: "{{ vault_keycloak_ssl_keystore_password }}"
-keycloak_db_host: "localhost"
+keycloak_db_host: "airavata.localhost"
 keycloak_db_username: "keycloak"
 keycloak_db_password: "{{ vault_keycloak_db_password }}"
 keycloak_master_account_username: "AiravataAdmin"
@@ -185,23 +185,23 @@ parser_broker_publisher_id: "ParserProducer"
 usage_reporting_key: "{{ vault_usage_reporting_key }}"
 
 participant_monitoring_enabled: true
-participant_monitoring_host: "0.0.0.0"
+participant_monitoring_host: "airavata.localhost"
 participant_monitoring_port: 9096
 
 pre_workflow_manager_monitoring_enabled: true
-pre_workflow_manager_monitoring_host: "0.0.0.0"
+pre_workflow_manager_monitoring_host: "airavata.localhost"
 pre_workflow_manager_monitoring_port: 9093
 
 post_workflow_manager_monitoring_enabled: true
-post_workflow_manager_monitoring_host: "0.0.0.0"
+post_workflow_manager_monitoring_host: "airavata.localhost"
 post_workflow_manager_monitoring_port: 9094
 
 parser_workflow_manager_monitoring_enabled: true
-parser_workflow_manager_monitoring_host: "0.0.0.0"
+parser_workflow_manager_monitoring_host: "airavata.localhost"
 parser_workflow_manager_monitoring_port: 9095
 
 api_server_monitoring_enabled: true
-api_server_monitoring_host: "0.0.0.0"
+api_server_monitoring_host: "airavata.localhost"
 api_server_monitoring_port: 9097
 
 # Variables related to data staging operations
diff --git a/dev-tools/ansible/inventories/scigap/production/host_vars/simvascular/vars.yml b/dev-tools/ansible/inventories/scigap/production/host_vars/simvascular/vars.yml
index 8d11f256c0b..8bc480bbd9b 100644
--- a/dev-tools/ansible/inventories/scigap/production/host_vars/simvascular/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/host_vars/simvascular/vars.yml
@@ -26,7 +26,7 @@ tusd_vhost_servername: "tus.simvascular.scigap.org"
 # configure user_data_dir and real_user_data_dir
 user_data_dir: "/var/www/portals/gateway-user-data"
 real_user_data_dir: "/home/www-shared/gateway-user-data"
-django_database_host_ip_address: "localhost"
+django_database_host_ip_address: "airavata.localhost"
 django_database_hosts:
   # Database is installed on the same host as the Django server
   - simvascular
diff --git a/dev-tools/ansible/inventories/scigap/production/host_vars/smiles/vars.yml b/dev-tools/ansible/inventories/scigap/production/host_vars/smiles/vars.yml
index fff5e7b795f..49da9603d1f 100644
--- a/dev-tools/ansible/inventories/scigap/production/host_vars/smiles/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/host_vars/smiles/vars.yml
@@ -42,8 +42,8 @@ ssl_certificate_key_file: "/etc/letsencrypt/live/{{ vhost_servername }}/privkey.
 django_file_upload_max_file_size_mb: 2000
 
 django_extra_settings:
-  CELERY_BROKER_URL: "redis://localhost:6379"
-  CELERY_RESULT_BACKEND: "redis://localhost:6379"
+  CELERY_BROKER_URL: "redis://airavata.localhost:6379"
+  CELERY_RESULT_BACKEND: "redis://airavata.localhost:6379"
   LOGIN_REDIRECT_URL: "/smiles/home/lit-dp-list"
   GATEWAY_DATA_SHARED_DIRECTORIES:
     shared:
diff --git a/dev-tools/ansible/inventories/scigap/staging/group_vars/all/vars.yml b/dev-tools/ansible/inventories/scigap/staging/group_vars/all/vars.yml
index 3f4f1191f93..b0d40b4767d 100644
--- a/dev-tools/ansible/inventories/scigap/staging/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/staging/group_vars/all/vars.yml
@@ -133,7 +133,7 @@ profile_service_port: 8962
 # Keycloak
 keycloak_ssl_keystore_file: "{{ inventory_dir }}/files/airavata.p12"
 keycloak_ssl_keystore_password: "{{ vault_keycloak_ssl_keystore_password }}"
-keycloak_db_host: "localhost"
+keycloak_db_host: "airavata.localhost"
 keycloak_db_username: "keycloak"
 keycloak_db_password: "{{ vault_keycloak_db_password }}"
 keycloak_master_account_username: "AiravataAdmin"
diff --git a/dev-tools/ansible/inventories/scigap/testing/group_vars/all/vars.yml b/dev-tools/ansible/inventories/scigap/testing/group_vars/all/vars.yml
index bab0334f938..16fb879907a 100644
--- a/dev-tools/ansible/inventories/scigap/testing/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/testing/group_vars/all/vars.yml
@@ -122,7 +122,7 @@ profile_service_port: 8962
 # Keycloak
 keycloak_ssl_keystore_file: "{{ inventory_dir }}/files/airavata.p12"
 keycloak_ssl_keystore_password: "{{ vault_keycloak_ssl_keystore_password }}"
-keycloak_db_host: "localhost"
+keycloak_db_host: "airavata.localhost"
 keycloak_db_username: "keycloak"
 keycloak_db_password: "{{ vault_keycloak_db_password }}"
 keycloak_master_account_username: "AiravataAdmin"
diff --git a/dev-tools/ansible/inventories/staging/group_vars/all/vars.yml b/dev-tools/ansible/inventories/staging/group_vars/all/vars.yml
index d1cf61c23af..7814946c343 100644
--- a/dev-tools/ansible/inventories/staging/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/staging/group_vars/all/vars.yml
@@ -32,15 +32,16 @@ research_service_port: 18899
 file_server_port: 8050
 restproxy_port: 8082
 
-# Database names
-app_catalog: "app_catalog"
-exp_catalog: "experiment_catalog"
-replica_catalog: "replica_catalog"
-workflow_catalog: "workflow_catalog"
-sharing_catalog: "sharing_catalog"
-credential_store: "credential_store"
-profile_service: "profile_service"
-research_catalog: "research_catalog"
+# Database name (single unified database)
+db_name: "airavata"
+app_catalog: "{{ db_name }}"
+exp_catalog: "{{ db_name }}"
+replica_catalog: "{{ db_name }}"
+workflow_catalog: "{{ db_name }}"
+sharing_catalog: "{{ db_name }}"
+credential_store: "{{ db_name }}"
+profile_service: "{{ db_name }}"
+research_catalog: "{{ db_name }}"
 
 # Database drivers
 registry_jdbc_driver: "org.mariadb.jdbc.Driver"
@@ -76,8 +77,8 @@ email_expiration_minutes: 60
 email_based_monitoring_period: 10000
 
 # Kafka and RabbitMQ
-kafka_broker_url: "localhost:9092"
-restproxy_broker_url: "localhost:9092"
+kafka_broker_url: "airavata.localhost:9092"
+restproxy_broker_url: "airavata.localhost:9092"
 rabbitmq_port: 5672
 rabbitmq_status_exchange_name: "status_exchange"
 rabbitmq_process_exchange_name: "process_exchange"
@@ -86,7 +87,7 @@ experiment_launch_queue: "experiment_launch"
 
 # Zookeeper connection
 zookeeper_client_port: 2181
-zookeeper_connection: "localhost:{{ zookeeper_client_port }}"
+zookeeper_connection: "airavata.localhost:{{ zookeeper_client_port }}"
 embedded_zk: false
 # Zookeeper AdminServer port (default is 8081 to avoid conflict with Keycloak on 8080)
 # Can be overridden here if needed
@@ -103,12 +104,12 @@ api_server_public_hostname: "api.staging.cybershuttle.org"
 api_server_host: "{{ api_server_public_hostname }}"
 api_secured: true
 
-api_server_bind_host: "0.0.0.0"
-orchestrator_bind_host: "0.0.0.0"
-registry_bind_host: "0.0.0.0"
-sharing_registry_bind_host: "0.0.0.0"
-cred_store_server_bind_host: "0.0.0.0"
-profile_service_bind_host: "0.0.0.0"
+api_server_bind_host: "airavata.localhost"
+orchestrator_bind_host: "airavata.localhost"
+registry_bind_host: "airavata.localhost"
+sharing_registry_bind_host: "airavata.localhost"
+cred_store_server_bind_host: "airavata.localhost"
+profile_service_bind_host: "airavata.localhost"
 
 # TLS Configuration
 tls_enable: false
diff --git a/dev-tools/ansible/inventories/standalone/group_vars/all/vars.yml b/dev-tools/ansible/inventories/standalone/group_vars/all/vars.yml
index 97a1ebb109b..e64d1de02a5 100644
--- a/dev-tools/ansible/inventories/standalone/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/standalone/group_vars/all/vars.yml
@@ -46,13 +46,14 @@ db_server_port: "3306"
 db_user: "airavata"
 db_password: "123456"
 mysql_root_password: "123456"
-app_catalog: "app_catalog"
-exp_catalog: "experiment_catalog"
-replica_catalog: "replica_catalog"
-sharing_catalog: "sharing_catalog"
-workflow_catalog: "workflow_catalog"
-credential_store: "credential_store"
-profile_service: "profile_service"
+db_name: "airavata"
+app_catalog: "{{ db_name }}"
+exp_catalog: "{{ db_name }}"
+replica_catalog: "{{ db_name }}"
+sharing_catalog: "{{ db_name }}"
+workflow_catalog: "{{ db_name }}"
+credential_store: "{{ db_name }}"
+profile_service: "{{ db_name }}"
 
 mysql_connector_jar: "mysql-connector-j-9.3.0-bin.jar"
 
@@ -145,7 +146,7 @@ profile_service_bind_host: "{{ profile_service_host }}"
 # Keycloak
 keycloak_ssl_keystore_file: "{{ keystore_src_path }}"
 keycloak_ssl_keystore_password: "{{ keystore_passwd }}"
-keycloak_db_host: "localhost"
+keycloak_db_host: "airavata.localhost"
 keycloak_db_username: "{{ db_user }}"
 keycloak_db_password: "{{ db_password }}"
 keycloak_master_account_username: "{{ iam_server_super_admin_username }}"
diff --git a/dev-tools/ansible/inventories/template/group_vars/all/vars.yml b/dev-tools/ansible/inventories/template/group_vars/all/vars.yml
index 6a227438554..2e23a279841 100644
--- a/dev-tools/ansible/inventories/template/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/template/group_vars/all/vars.yml
@@ -46,13 +46,14 @@ db_server_port: "3306"
 db_user: "airavata"
 db_password: "CHANGEME"
 mysql_root_password: "CHANGEME"
-app_catalog: "app_catalog"
-exp_catalog: "experiment_catalog"
-replica_catalog: "replica_catalog"
-sharing_catalog: "sharing_catalog"
-workflow_catalog: "workflow_catalog"
-credential_store: "credential_store"
-profile_service: "profile_service"
+db_name: "airavata"
+app_catalog: "{{ db_name }}"
+exp_catalog: "{{ db_name }}"
+replica_catalog: "{{ db_name }}"
+sharing_catalog: "{{ db_name }}"
+workflow_catalog: "{{ db_name }}"
+credential_store: "{{ db_name }}"
+profile_service: "{{ db_name }}"
 
 mysql_connector_jar: "mysql-connector-j-9.3.0-bin.jar"
 
@@ -138,7 +139,7 @@ profile_service_port: 8962
 # Keycloak
 keycloak_ssl_keystore_file: "CHANGEME"
 keycloak_ssl_keystore_password: "CHANGEME"
-keycloak_db_host: "localhost"
+keycloak_db_host: "airavata.localhost"
 keycloak_db_username: "keycloak"
 keycloak_db_password: "CHANGEME"
 keycloak_master_account_username: "CHANGEME"
diff --git a/dev-tools/ansible/roles/airavata_services/defaults/main.yml b/dev-tools/ansible/roles/airavata_services/defaults/main.yml
index 00e6c58a0e8..06eecc7f870 100644
--- a/dev-tools/ansible/roles/airavata_services/defaults/main.yml
+++ b/dev-tools/ansible/roles/airavata_services/defaults/main.yml
@@ -51,10 +51,10 @@ file_server_port: 8050
 restproxy_port: 8082
 
 # Service hosts
-api_server_host: "0.0.0.0"
-profile_service_host: "0.0.0.0"
-agent_service_server_address: "0.0.0.0"
-research_service_server_address: "0.0.0.0"
+api_server_host: "airavata.localhost"
+profile_service_host: "airavata.localhost"
+agent_service_server_address: "airavata.localhost"
+research_service_server_address: "airavata.localhost"
 
 # Monitoring ports
 api_server_monitoring_port: 9097
@@ -63,16 +63,16 @@ pre_wm_monitoring_port: 9093
 post_wm_monitoring_port: 9094
 
 # Monitoring hosts
-api_server_monitoring_host: "localhost"
-participant_monitoring_host: "localhost"
-pre_workflow_manager_monitoring_host: "localhost"
-post_workflow_manager_monitoring_host: "localhost"
+api_server_monitoring_host: "airavata.localhost"
+participant_monitoring_host: "airavata.localhost"
+pre_workflow_manager_monitoring_host: "airavata.localhost"
+post_workflow_manager_monitoring_host: "airavata.localhost"
 
 # Server hosts
-orchestrator_server_host: "localhost"
-regserver_server_host: "localhost"
-sharing_registry_server_host: "localhost"
-cred_store_server_host: "localhost"
+orchestrator_server_host: "airavata.localhost"
+regserver_server_host: "airavata.localhost"
+sharing_registry_server_host: "airavata.localhost"
+cred_store_server_host: "airavata.localhost"
 
 # Orchestrator configuration
 orchestrator_class: "org.apache.airavata.orchestrator.server.OrchestratorServer"
@@ -124,7 +124,7 @@ prefetch_count: 200
 durable_queue: false
 
 # RabbitMQ configuration
-rabbitmq_server: "localhost"
+rabbitmq_server: "airavata.localhost"
 rabbitmq_status_exchange_name: "status_exchange"
 rabbitmq_process_exchange_name: "process_exchange"
 rabbitmq_experiment_exchange_name: "experiment_exchange"
@@ -191,7 +191,7 @@ thrift_client_pool_abandoned_removal_logged: false
 db_event_manager_class: "org.apache.airavata.db.event.manager.DBEventManagerRunner"
 
 # Agent service configuration
-agent_service_grpc_host: "localhost"  # Override in inventory files (vars.yml or vault.yml) per environment
+agent_service_grpc_host: "airavata.localhost"  # Override in inventory files (vars.yml or vault.yml) per environment
 agent_service_grpc_port: 19900
 agent_service_grpc_max_inbound_message_size: 10485760
 agent_service_max_file_size: "200MB"
diff --git a/dev-tools/ansible/roles/airavata_services/tasks/generate_keystore.yml b/dev-tools/ansible/roles/airavata_services/tasks/generate_keystore.yml
index 306afaa0037..28e4c16a5f7 100644
--- a/dev-tools/ansible/roles/airavata_services/tasks/generate_keystore.yml
+++ b/dev-tools/ansible/roles/airavata_services/tasks/generate_keystore.yml
@@ -24,7 +24,7 @@
 
 - name: Set Let's Encrypt certificate directory
   set_fact:
-    letsencrypt_cert_dir: "/etc/letsencrypt/live/{{ api_server_public_hostname | default('localhost') }}"
+    letsencrypt_cert_dir: "/etc/letsencrypt/live/{{ api_server_public_hostname | default('airavata.localhost') }}"
 
 - name: Check if Let's Encrypt certificate exists
   stat:
diff --git a/dev-tools/ansible/roles/airavata_services/tasks/start_services.yml b/dev-tools/ansible/roles/airavata_services/tasks/start_services.yml
index 33ca2941eb3..3f2f1c9ab48 100644
--- a/dev-tools/ansible/roles/airavata_services/tasks/start_services.yml
+++ b/dev-tools/ansible/roles/airavata_services/tasks/start_services.yml
@@ -29,7 +29,7 @@
 - name: Wait for API Server orchestrator to be ready
   wait_for:
     port: '{{ orchestrator_server_port }}'
-    host: localhost
+    host: airavata.localhost
     delay: 5
     timeout: 60
   tags:
diff --git a/dev-tools/ansible/roles/api-orch/defaults/main.yml b/dev-tools/ansible/roles/api-orch/defaults/main.yml
index 76ea2d6f1b7..f0bbff800da 100644
--- a/dev-tools/ansible/roles/api-orch/defaults/main.yml
+++ b/dev-tools/ansible/roles/api-orch/defaults/main.yml
@@ -30,7 +30,7 @@ iam_server_url: "https://iam.scigap.org/auth"
 iam_server_super_admin_username: "admin"
 #iam_server_super_admin_password: "changeme"
 
-profile_service_host: "localhost"
+profile_service_host: "airavata.localhost"
 profile_service_port: 8962
 
 mariadb_connector_jar_url: "http://downloads.mariadb.com/Connectors/java/connector-java-2.0.2/mariadb-java-client-2.0.2.jar"
@@ -51,10 +51,10 @@ api_orch_systemd_unit_file: "/etc/systemd/system/apiorch.service"
 thrift_client_pool_abandoned_removal_enabled: false
 thrift_client_pool_abandoned_removal_logged: false
 
-api_server_public_hostname: "localhost"
+api_server_public_hostname: "airavata.localhost"
 api_server_port: 8930
 api_server_tls_port: 9930
-api_server_host: "localhost"
+api_server_host: "airavata.localhost"
 haproxy_api_server_ssl_cert: "/etc/ssl/{{ api_server_public_hostname }}/{{ api_server_public_hostname }}.pem"
 api_server_letsencrypt_ssl_cert: "/etc/letsencrypt/live/{{ api_server_public_hostname }}/cert.pem"
 haproxy_service_name:
diff --git a/dev-tools/ansible/roles/database/defaults/main.yml b/dev-tools/ansible/roles/database/defaults/main.yml
deleted file mode 100644
index f52157d9a1d..00000000000
--- a/dev-tools/ansible/roles/database/defaults/main.yml
+++ /dev/null
@@ -1,21 +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.
-#
-
-mysql_root_password: "admin"
diff --git a/dev-tools/ansible/roles/database/files/MariaDB_yum_CentOS_7.repo b/dev-tools/ansible/roles/database/files/MariaDB_yum_CentOS_7.repo
deleted file mode 100644
index bb1872403d1..00000000000
--- a/dev-tools/ansible/roles/database/files/MariaDB_yum_CentOS_7.repo
+++ /dev/null
@@ -1,27 +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.
-#
-
-# MariaDB 10.0 CentOS repository list - created 2017-03-06 19:32 UTC
-# http://downloads.mariadb.org/mariadb/repositories/
-[mariadb]
-name = MariaDB
-baseurl = http://yum.mariadb.org/10.0/centos7-amd64
-gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB
-gpgcheck=1
diff --git a/dev-tools/ansible/roles/database/files/mysql-tmp.te b/dev-tools/ansible/roles/database/files/mysql-tmp.te
deleted file mode 100644
index 40ebc538855..00000000000
--- a/dev-tools/ansible/roles/database/files/mysql-tmp.te
+++ /dev/null
@@ -1,29 +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.
-#
-
-module mysql-tmp 1.0;
-
-require {
-	type mysqld_safe_t;
-	class capability { setgid setuid };
-}
-
-#============= mysqld_safe_t ==============
-allow mysqld_safe_t self:capability { setgid setuid };
diff --git a/dev-tools/ansible/roles/database/handlers/main.yml b/dev-tools/ansible/roles/database/handlers/main.yml
deleted file mode 100644
index d48aa97da34..00000000000
--- a/dev-tools/ansible/roles/database/handlers/main.yml
+++ /dev/null
@@ -1,34 +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.
-#
-
----
-- name: start mariadb
-  service: name=mariadb state=started enabled=yes
-  become: yes
-
-- name: stop mariadb
-  service: name=mariadb state=stopped
-  become: yes
-
-- name: restart mariadb
-  service: name=mariadb state=restarted enabled=yes
-  become: yes
-
-...
diff --git a/dev-tools/ansible/roles/database/tasks/keycloak.yml b/dev-tools/ansible/roles/database/tasks/keycloak.yml
deleted file mode 100644
index b6461e7eefd..00000000000
--- a/dev-tools/ansible/roles/database/tasks/keycloak.yml
+++ /dev/null
@@ -1,68 +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.
-#
-
----
-
-# Setup keycloak user and database
-- name: create keycloak database
-  mysql_db:
-    name: "keycloak"
-    state: present
-    encoding: utf8
-    login_user: root
-    login_password: "{{ mysql_root_password }}"
-    login_unix_socket: "{{ '/var/run/mysqld/mysqld.sock' if ansible_os_family == 'Debian' else '/var/lib/mysql/mysql.sock' }}"
-  when: "'keycloak' in groups"
-
-- name: give access to {{ keycloak_db_username }} from remote
-  # Creating the access record with the IP address works better for MySQL so it
-  # doesn't have to do a DNS lookup (and it has DNS caching issues if the domain
-  # name changes)
-  mysql_user:
-    name: "{{ keycloak_db_username }}"
-    password: "{{ keycloak_db_password }}"
-    host: "{{ hostvars[item].public_ipv4 | default(hostvars[item].ansible_host | default(item)) }}"
-    login_user: root
-    login_password: "{{ mysql_root_password }}"
-    login_unix_socket: "{{ '/var/run/mysqld/mysqld.sock' if ansible_os_family == 'Debian' else '/var/lib/mysql/mysql.sock' }}"
-  with_items:
-    - "{{ groups['keycloak'] }}"
-  when: "'keycloak' in groups and (hostvars[item].public_ipv4 is defined or hostvars[item].ansible_host is defined)"
-
-- name: give access to {{ keycloak_db_username }} from localhost
-  mysql_user:
-    name: "{{ keycloak_db_username }}"
-    password: "{{ keycloak_db_password }}"
-    host: localhost
-    login_user: root
-    login_password: "{{ mysql_root_password }}"
-    login_unix_socket: "{{ '/var/run/mysqld/mysqld.sock' if ansible_os_family == 'Debian' else '/var/lib/mysql/mysql.sock' }}"
-
-- name: create new user {{ keycloak_db_username }} with all privilege
-  mysql_user:
-    name: "{{ keycloak_db_username }}"
-    password: "{{ keycloak_db_password }}"
-    append_privs: yes
-    host_all: yes
-    priv: keycloak.*:ALL,GRANT
-    state: present
-    login_user: root
-    login_password: "{{ mysql_root_password }}"
-    login_unix_socket: "{{ '/var/run/mysqld/mysqld.sock' if ansible_os_family == 'Debian' else '/var/lib/mysql/mysql.sock' }}"
diff --git a/dev-tools/ansible/roles/database/tasks/main.yml b/dev-tools/ansible/roles/database/tasks/main.yml
deleted file mode 100644
index 19acf0f2dec..00000000000
--- a/dev-tools/ansible/roles/database/tasks/main.yml
+++ /dev/null
@@ -1,388 +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.
-#
-
----
-# - name: yum update
-#   yum: name=* state=latest
-
-# Install Mysql
-- name: install epel release  (CentOS)
-  yum: name=epel-release state=present
-  become_user: root
-  when: ansible_distribution == "CentOS"
-
-- name: install epel release (Rocky)
-  dnf: name=epel-release
-  become_user: root
-  when: ansible_distribution == "Rocky"
-
-- name: install pip (CentOS)
-  yum: name=python-pip state=latest update_cache=yes
-  become_user: root
-  when: ansible_distribution == "CentOS"
-
-- name: install pip (Rocky)
-  dnf: name=python3-pip
-  become_user: root
-  when: ansible_distribution == "Rocky"
-
-- name: install pexpect (Ubuntu/Debian)
-  apt:
-    name: python3-pexpect
-    state: present
-    update_cache: yes
-  become_user: root
-  when: ansible_os_family == "Debian"
-
-- name: install pexpect (Rocky)
-  dnf: name=python3-pexpect
-  become_user: root
-  when: ansible_distribution == "Rocky"
-
-- name: install pexpect (CentOS)
-  pip:
-    name: pexpect
-  become_user: root
-  when: ansible_distribution == "CentOS"
-
-# - name: Adds Python MySQL support on Debian/Ubuntu
-#   apt: pkg="python-mysqldb" state=present
-#   when: ansible_os_family == 'Debian'
-
-- name: Adds Python MySQL support on CentOS
-  yum: name=MySQL-python state=present
-  become_user: root
-  when: ansible_distribution == 'CentOS'
-
-- name: Adds Python MySQL support on Rocky
-  dnf: name=python3-PyMySQL state=present
-  become_user: root
-  when: ansible_distribution == 'Rocky'
-
-- name: Adds Python MySQL support on Ubuntu/Debian
-  apt:
-    pkg: python3-pymysql
-    state: present
-    update_cache: yes
-  become_user: root
-  when: ansible_os_family == 'Debian'
-
-- name: Add MariaDB yum repository on CentOS {{ ansible_distribution }}
-  copy: src="MariaDB_yum_CentOS_{{ ansible_distribution_major_version }}.repo"
-        dest="/etc/yum.repos.d/"
-  become_user: root
-  when: ansible_distribution == 'CentOS'
-
-- name: install mariadb (CentOS)
-  yum: name="{{ item }}" state=latest update_cache=yes
-  with_items: "{{ mysql_packages }}"
-  become_user: root
-  when: ansible_distribution == 'CentOS'
-
-- name: install mariadb (Rocky)
-  dnf: name="{{ item }}"
-  with_items: "{{ mysql_packages }}"
-  become_user: root
-  when: ansible_distribution == 'Rocky'
-
-- name: Set MariaDB root password via debconf (Ubuntu/Debian)
-  debconf:
-    name: mariadb-server
-    question: "mysql-server/root_password"
-    value: "{{ mysql_root_password | default('') }}"
-    vtype: password
-  become_user: root
-  when: ansible_os_family == 'Debian' and mysql_root_password is defined and mysql_root_password | length > 0
-
-- name: Confirm MariaDB root password via debconf (Ubuntu/Debian)
-  debconf:
-    name: mariadb-server
-    question: "mysql-server/root_password_again"
-    value: "{{ mysql_root_password | default('') }}"
-    vtype: password
-  become_user: root
-  when: ansible_os_family == 'Debian' and mysql_root_password is defined and mysql_root_password | length > 0
-
-- name: install mariadb (Ubuntu/Debian)
-  apt:
-    name: "{{ item }}"
-    state: present
-    update_cache: yes
-  with_items: "{{ mysql_packages }}"
-  become_user: root
-  when: ansible_os_family == 'Debian'
-
-- name: check if mysql has been updated
-  stat: path=/usr/share/mysql/SELinux/mariadb.pp
-  register: mysql_selinux_update
-
-- debug:
-    var: mysql_selinux_update
-
-- name: double check policycoreutils installed (Centos)
-  yum: name=policycoreutils-python state=installed
-  when: mysql_selinux_update.stat.exists == False and (ansible_distribution == 'CentOS') and ansible_os_family == "RedHat"
-  become_user: root
-
-- name: double check policycoreutils installed (Rocky)
-  dnf: name=policycoreutils-python-utils state=installed
-  when: mysql_selinux_update.stat.exists == False and ansible_distribution == 'Rocky' and ansible_os_family == "RedHat"
-  become_user: root
-
-- name: Copy SELinux type enforcement file
-  copy: src=mysql-tmp.te dest=/tmp/
-  when: mysql_selinux_update.stat.exists == False and ansible_os_family == "RedHat"
-
-- name: Compile SELinux module file
-  command: checkmodule -M -m -o /tmp/mysql-tmp.mod /tmp/mysql-tmp.te
-  when: mysql_selinux_update.stat.exists == False and ansible_os_family == "RedHat"
-
-- name: Build SELinux policy package
-  command: semodule_package -o /tmp/mysql-tmp.pp -m /tmp/mysql-tmp.mod
-  when: mysql_selinux_update.stat.exists == False and ansible_os_family == "RedHat"
-
-#- name: check if mysql has been updated
-#  stat: path=/tmp/mysql-tmp.pp
-#  register: mysql_pp
-#
-#- debug:
-#    var: mysql_pp
-
-- name: unLoad SELinux policy package
-  command: semodule -r mysql-tmp
-  when: mysql_selinux_update.stat.exists == False and ansible_os_family == "RedHat"
-  become_user: root
-  ignore_errors: True
-
-- name: Load SELinux policy package
-  command: semodule -i /tmp/mysql-tmp.pp
-  when: mysql_selinux_update.stat.exists == False and ansible_os_family == "RedHat"
-  become_user: root
-
-- name: Remove temporary files
-  file: path=/tmp/mysql-tmp.* state=absent
-  when: mysql_selinux_update.stat.exists == False and ansible_os_family == "RedHat"
-
-# TODO: SELinux issue for 10.0.29 MariaDB, need to allow setgid/setuid.
-## See https://www.rootusers.com/how-to-fix-mariadb-10-0-29-selinux-update-failure/
-# and https://jira.mariadb.org/browse/MDEV-11789
-# For now I'm not adding to Ansible script since this bug should be fixed in next MariaDB release
-
-- name: Stop stray MariaDB processes (CentOS/Rocky)
-  shell: pkill -9 -f "mariadbd|mysqld_safe|mysqld" || true
-  become_user: root
-  when: ansible_os_family == 'RedHat'
-  ignore_errors: yes
-
-- name: Remove stale MariaDB socket and pid files (CentOS/Rocky)
-  file:
-    path: "{{ item }}"
-    state: absent
-  with_items:
-    - /var/lib/mysql/mysql.sock
-    - /var/run/mariadb/mariadb.pid
-    - /run/mariadb/mariadb.pid
-  become_user: root
-  when: ansible_os_family == 'RedHat'
-  ignore_errors: yes
-
-- name: Ensure no MariaDB systemd overrides remain from recovery attempts (CentOS/Rocky)
-  file:
-    path: /etc/systemd/system/mariadb.service.d
-    state: absent
-  become_user: root
-  when: ansible_os_family == 'RedHat'
-  ignore_errors: yes
-
-- name: start mariadb (CentOS)
-  service: name=mysql state=started enabled=yes
-  become_user: root
-  when: ansible_distribution == 'CentOS'
-
-- name: start mariadb (Rocky)
-  service: name=mariadb state=started enabled=yes
-  become_user: root
-  when: ansible_distribution == 'Rocky'
-
-- name: Wait for MariaDB to be ready (CentOS/Rocky)
-  wait_for:
-    port: 3306
-    host: localhost
-    delay: 5
-    timeout: 60
-  become_user: root
-  when: ansible_os_family == 'RedHat'
-
-- name: start mariadb (Ubuntu/Debian)
-  service: name=mariadb state=started enabled=yes
-  become_user: root
-  when: ansible_os_family == 'Debian'
-
-- name: Wait for MariaDB to be ready
-  wait_for:
-    port: 3306
-    host: localhost
-    delay: 5
-    timeout: 60
-  become_user: root
-  when: ansible_os_family == 'Debian'
-
-- name: Wait for MariaDB socket to be ready (Ubuntu/Debian)
-  wait_for:
-    path: /var/run/mysqld/mysqld.sock
-    state: present
-    timeout: 60
-  become_user: root
-  when: ansible_os_family == 'Debian'
-
-- include: secure_install.yml
-
-- name: create databases
-  mysql_db:
-    name: "{{ item }}"
-    state: present
-    encoding: utf8
-    login_user: root
-    login_password: "{{ mysql_root_password }}"
-    login_unix_socket: "/var/run/mysqld/mysqld.sock"
-  with_items:
-    - "{{ mysql_databases }}"
-  when: ansible_os_family == 'Debian'
-
-- name: create databases (CentOS/Rocky)
-  mysql_db:
-    name: "{{ item }}"
-    state: present
-    encoding: utf8
-    login_user: root
-    login_password: "{{ mysql_root_password }}"
-    login_unix_socket: /var/lib/mysql/mysql.sock
-  with_items:
-    - "{{ mysql_databases }}"
-  when: ansible_os_family == 'RedHat'
-
-- name: give access to {{ db_user }} from remote
-  mysql_user:
-    name: "{{ db_user }}"
-    password: "{{ db_password }}"
-    host: "{{ hostvars[item].ansible_default_ipv4.address | default(hostvars[item].ansible_host | default(item)) }}"
-    login_user: root
-    login_password: "{{ mysql_root_password }}"
-    login_unix_socket: "/var/run/mysqld/mysqld.sock"
-  with_items:
-    - "{{ groups['api-orch'] }}"
-  when: ansible_os_family == 'Debian' and 'api-orch' in groups and (hostvars[item].ansible_default_ipv4.address is defined or hostvars[item].ansible_host is defined)
-
-- name: give access to {{ db_user }} from remote (CentOS/Rocky)
-  mysql_user:
-    name: "{{ db_user }}"
-    password: "{{ db_password }}"
-    host: "{{ hostvars[item].ansible_default_ipv4.address | default(hostvars[item].ansible_host | default(item)) }}"
-    login_user: root
-    login_password: "{{ mysql_root_password }}"
-    login_unix_socket: /var/lib/mysql/mysql.sock
-  with_items:
-    - "{{ groups['api-orch'] }}"
-  when: ansible_os_family == 'RedHat' and 'api-orch' in groups and (hostvars[item].ansible_default_ipv4.address is defined or hostvars[item].ansible_host is defined)
-
-- name: give access to {{ db_user }} from localhost
-  mysql_user:
-    name: "{{ db_user }}"
-    password: "{{ db_password }}"
-    host: localhost
-    login_user: root
-    login_password: "{{ mysql_root_password }}"
-    login_unix_socket: "/var/run/mysqld/mysqld.sock"
-  when: ansible_os_family == 'Debian'
-
-- name: give access to {{ db_user }} from localhost (CentOS/Rocky)
-  mysql_user:
-    name: "{{ db_user }}"
-    password: "{{ db_password }}"
-    host: localhost
-    login_user: root
-    login_password: "{{ mysql_root_password }}"
-    login_unix_socket: /var/lib/mysql/mysql.sock
-  when: ansible_os_family == 'RedHat'
-
-# TODO: database access from GFac is no longer needed (GFac deprecated and only using Registry API)
-- name: give access to {{ db_user }} from remote
-  mysql_user:
-    name: "{{ db_user }}"
-    password: "{{ db_password }}"
-    host: "{{ hostvars[item].ansible_default_ipv4.address | default(hostvars[item].ansible_host | default(item)) }}"
-    login_user: root
-    login_password: "{{ mysql_root_password }}"
-    login_unix_socket: "/var/run/mysqld/mysqld.sock"
-  with_items:
-    - "{{ groups['gfac'] }}"
-  when: ansible_os_family == 'Debian' and 'gfac' in groups and (hostvars[item].ansible_default_ipv4.address is defined or hostvars[item].ansible_host is defined)
-
-- name: give access to {{ db_user }} from remote (CentOS/Rocky)
-  mysql_user:
-    name: "{{ db_user }}"
-    password: "{{ db_password }}"
-    host: "{{ hostvars[item].ansible_default_ipv4.address | default(hostvars[item].ansible_host | default(item)) }}"
-    login_user: root
-    login_password: "{{ mysql_root_password }}"
-    login_unix_socket: /var/lib/mysql/mysql.sock
-  with_items:
-    - "{{ groups['gfac'] }}"
-  when: ansible_os_family == 'RedHat' and 'gfac' in groups and (hostvars[item].ansible_default_ipv4.address is defined or hostvars[item].ansible_host is defined)
-
-- name: create new user {{ db_user }} with all privilege
-  mysql_user:
-    name: "{{ db_user }}"
-    password: "{{ db_password }}"
-    append_privs: yes
-    host_all: yes
-    priv: "*.*:ALL,GRANT"
-    state: present
-    login_user: root
-    login_password: "{{ mysql_root_password }}"
-    login_unix_socket: "/var/run/mysqld/mysqld.sock"
-  when: ansible_os_family == 'Debian'
-
-- name: create new user {{ db_user }} with all privilege (CentOS/Rocky)
-  mysql_user:
-    name: "{{ db_user }}"
-    password: "{{ db_password }}"
-    append_privs: yes
-    host_all: yes
-    priv: "*.*:ALL,GRANT"
-    state: present
-    login_user: root
-    login_password: "{{ mysql_root_password }}"
-    login_unix_socket: /var/lib/mysql/mysql.sock
-  when: ansible_os_family == 'RedHat'
-
-- include: keycloak.yml
-  when: "'keycloak' in groups"
-
-- name: allow only selected networks to access DB
-  firewalld:
-    zone: public
-    permanent: yes
-    state: enabled
-    immediate: yes
-    rich_rule: rule family=ipv4 source address="{{ item }}" port port="{{ db_server_port | default(3306) }}" protocol=tcp accept
-  with_items: "{{ db_subnets | default([]) }}"
-  become_user: root
-  when: db_subnets is defined and db_subnets | length > 0
diff --git a/dev-tools/ansible/roles/database/tasks/secure_install.yml b/dev-tools/ansible/roles/database/tasks/secure_install.yml
deleted file mode 100644
index 0b360b36cc7..00000000000
--- a/dev-tools/ansible/roles/database/tasks/secure_install.yml
+++ /dev/null
@@ -1,214 +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.
-#
-
----
-# This is ansible equivalent for mysql_secure_installation
-- name: Skip root password setting for Ubuntu - handled by debconf or already configured
-  debug:
-    msg: "Root password is set via debconf during installation (fresh installs) or already configured. Skipping password setting step."
-  when: ansible_os_family == 'Debian'
-
-- name: Mark root password as set (Ubuntu/Debian)
-  file:
-    path: /tmp/.root_password_set
-    state: touch
-  become: yes
-  when: ansible_os_family == 'Debian'
-
-- name: Reset and set root password via recovery mode (CentOS/Rocky)
-  block:
-    - name: Stop MariaDB before recovery (CentOS/Rocky)
-      systemd:
-        name: mariadb
-        state: stopped
-      become: yes
-      become_user: root
-
-    - name: Create systemd override directory for MariaDB recovery (CentOS/Rocky)
-      file:
-        path: /etc/systemd/system/mariadb.service.d
-        state: directory
-      become: yes
-      become_user: root
-
-    - name: Configure MariaDB to start with skip-grant-tables (CentOS/Rocky)
-      copy:
-        dest: /etc/systemd/system/mariadb.service.d/override.conf
-        content: |
-          [Service]
-          ExecStart=
-          ExecStart=/usr/libexec/mariadbd --basedir=/usr $MYSQLD_OPTS $_WSREP_NEW_CLUSTER --skip-grant-tables --skip-networking --pid-file=/run/mariadb/mariadb.pid --socket=/var/lib/mysql/mysql.sock
-      become: yes
-      become_user: root
-
-    - name: Start MariaDB in recovery mode (CentOS/Rocky)
-      systemd:
-        name: mariadb
-        daemon_reload: yes
-        state: started
-      become: yes
-      become_user: root
-
-    - name: Wait for MariaDB socket in recovery mode (CentOS/Rocky)
-      wait_for:
-        path: /var/lib/mysql/mysql.sock
-        state: present
-        timeout: 60
-      become: yes
-      become_user: root
-
-    - name: Reset root password in recovery mode (CentOS/Rocky)
-      shell: |
-        mysql --protocol=socket --socket=/var/lib/mysql/mysql.sock -uroot <<'EOF'
-        FLUSH PRIVILEGES;
-        ALTER USER 'root'@'localhost' IDENTIFIED BY '{{ mysql_root_password }}';
-        UPDATE mysql.user SET plugin='mysql_native_password' WHERE user='root' AND host='localhost';
-        FLUSH PRIVILEGES;
-        EOF
-      become: yes
-      become_user: root
-      no_log: true
-      failed_when: false
-  rescue:
-    - debug:
-        msg: "Recovery mode password reset failed; attempting cleanup and restart."
-  always:
-    - name: Stop MariaDB recovery instance (CentOS/Rocky)
-      systemd:
-        name: mariadb
-        state: stopped
-      become: yes
-      become_user: root
-      ignore_errors: yes
-
-    - name: Remove recovery override for MariaDB (CentOS/Rocky)
-      file:
-        path: /etc/systemd/system/mariadb.service.d/override.conf
-        state: absent
-      become: yes
-      become_user: root
-      ignore_errors: yes
-
-    - name: Remove recovery override directory if empty (CentOS/Rocky)
-      file:
-        path: /etc/systemd/system/mariadb.service.d
-        state: absent
-      become: yes
-      become_user: root
-      ignore_errors: yes
-
-    - name: Reload systemd and start MariaDB normally after recovery (CentOS/Rocky)
-      systemd:
-        name: mariadb
-        daemon_reload: yes
-        state: started
-      become: yes
-      become_user: root
-
-    - name: Verify root login with provided password (CentOS/Rocky)
-      command: "mysql --protocol=socket --socket=/var/lib/mysql/mysql.sock -uroot -p{{ mysql_root_password }} -e 'SELECT 1'"
-      register: root_login_check_recovered
-      changed_when: false
-      failed_when: root_login_check_recovered.rc != 0
-      no_log: true
-      become: yes
-      become_user: root
-    - name: Wait for MariaDB to be ready after recovery (CentOS/Rocky)
-      wait_for:
-        port: 3306
-        host: localhost
-        delay: 2
-        timeout: 60
-      become: yes
-      become_user: root
-  when: ansible_os_family == 'RedHat'
-
-- name: Copy .my.cnf file
-  template: src=my.cnf.j2 dest="{{ user_home }}/.my.cnf"
-  # become: yes
-
-- name: Removes all anonymous user accounts (Ubuntu/Debian)
-  mysql_user:
-    name: ''
-    host_all: yes
-    state: absent
-    login_user: root
-    login_password: "{{ mysql_root_password }}"
-    login_unix_socket: "/var/run/mysqld/mysqld.sock"
-  when: ansible_os_family == 'Debian'
-  ignore_errors: yes
-
-- name: Removes all anonymous user accounts (CentOS/Rocky)
-  mysql_user:
-    name: ''
-    host_all: yes
-    state: absent
-    login_user: root
-    login_password: "{{ mysql_root_password }}"
-    login_unix_socket: /var/lib/mysql/mysql.sock
-  when: ansible_os_family == 'RedHat'
-  become: yes
-  become_user: root
-
-- name: Secures the MySQL root user for all hosts (Ubuntu/Debian)
-  mysql_user:
-    user: root
-    password: "{{ mysql_root_password }}"
-    host_all: yes
-    login_user: root
-    login_password: "{{ mysql_root_password }}"
-    login_unix_socket: "/var/run/mysqld/mysqld.sock"
-  when: ansible_os_family == 'Debian'
-  ignore_errors: yes
-
-- name: Secures the MySQL root user for all hosts (CentOS/Rocky)
-  mysql_user:
-    user: root
-    password: "{{ mysql_root_password }}"
-    host_all: yes
-    login_user: root
-    login_password: "{{ mysql_root_password }}"
-    login_unix_socket: /var/lib/mysql/mysql.sock
-  when: ansible_os_family == 'RedHat'
-  become: yes
-  become_user: root
-
-- name: Removes the MySQL test database (Ubuntu/Debian)
-  mysql_db:
-    db: test
-    state: absent
-    login_user: root
-    login_password: "{{ mysql_root_password }}"
-    login_unix_socket: "/var/run/mysqld/mysqld.sock"
-  when: ansible_os_family == 'Debian'
-  ignore_errors: yes
-
-- name: Removes the MySQL test database (CentOS/Rocky)
-  mysql_db:
-    db: test
-    state: absent
-    login_user: root
-    login_password: "{{ mysql_root_password }}"
-    login_unix_socket: /var/lib/mysql/mysql.sock
-  when: ansible_os_family == 'RedHat'
-  become: yes
-  become_user: root
-
-...
diff --git a/dev-tools/ansible/roles/database/templates/my.cnf.j2 b/dev-tools/ansible/roles/database/templates/my.cnf.j2
deleted file mode 100644
index ebe5b5b3ffd..00000000000
--- a/dev-tools/ansible/roles/database/templates/my.cnf.j2
+++ /dev/null
@@ -1,4 +0,0 @@
-# Example .my.cnf file for setting the root password
-[client]
-user=root
-password="{{ mysql_root_password }}"
diff --git a/dev-tools/ansible/roles/database/vars/main.yml b/dev-tools/ansible/roles/database/vars/main.yml
deleted file mode 100644
index 7f6bb2573d0..00000000000
--- a/dev-tools/ansible/roles/database/vars/main.yml
+++ /dev/null
@@ -1,45 +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.
-#
-
----
-mysql_packages:
-  - mariadb-server
-
-mysql_databases:
-    - "{{ app_catalog }}"
-    - "{{ exp_catalog }}"
-    - "{{ replica_catalog }}"
-    - "{{ workflow_catalog }}"
-    - "{{ credential_store }}"
-    - "{{ sharing_catalog }}"
-    - "{{ profile_service }}"
-    - "{{ research_catalog }}"
-
-mysql_privs:
-    - "{{ app_catalog }}.*:ALL"
-    - "{{ exp_catalog }}.*:ALL"
-    - "{{ replica_catalog }}.*:ALL"
-    - "{{ workflow_catalog }}.*:ALL"
-    - "{{ credential_store }}.*:ALL"
-    - "{{ sharing_catalog }}.*:ALL"
-    - "{{ profile_service }}.*:ALL"
-    - "{{ research_catalog }}.*:ALL"
-
-...
diff --git a/dev-tools/ansible/roles/django/tasks/database.yml b/dev-tools/ansible/roles/django/tasks/database.yml
deleted file mode 100644
index a4e963f8600..00000000000
--- a/dev-tools/ansible/roles/django/tasks/database.yml
+++ /dev/null
@@ -1,51 +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.
-#
-
----
-
-- name: Adds Python MySQL support on Debian/Ubuntu
-  apt: pkg="python3-mysqldb" state=present
-  become: true
-  become_user: root
-  when: hostvars[delegated_host].ansible_os_family == 'Debian'
-
-# Explicitly lookup hostvars for delegated host. There seem to be bugs around
-# delegation and ansible facts, see https://github.com/ansible/ansible/issues/30630
-- include_tasks: install_deps_{{ hostvars[delegated_host].ansible_distribution }}_{{ hostvars[delegated_host].ansible_distribution_major_version }}.yml
-  when: hostvars[delegated_host].ansible_os_family == "RedHat"
-
-- name: create django database ({{ django_database_name }})
-  mysql_db: name="{{ django_database_name }}" state=present encoding=utf8 collation=utf8_bin
-
-- name: give access to {{ django_db_username }} from remote (internal ip)
-  mysql_user: name="{{ django_db_username }}" password="{{ django_db_password }}" host="{{ django_internal_ip }}"
-
-- name: give access to {{ django_db_username }} from remote (public ip)
-  mysql_user: name="{{ django_db_username }}" password="{{ django_db_password }}" host="{{ django_public_ip }}"
-
-- name: give access to {{ django_db_username }} from localhost
-  mysql_user: name="{{ django_db_username }}" password="{{ django_db_password }}" host="localhost"
-
-- name: create new user {{ django_db_username }} with all privileges on all django databases
-  mysql_user: name="{{ django_db_username }}"
-              password="{{ django_db_password }}"
-              append_privs=yes
-              host_all=yes
-              priv={{ django_database_name }}.*:ALL,GRANT state=present
diff --git a/dev-tools/ansible/roles/kafka/defaults/main.yml b/dev-tools/ansible/roles/kafka/defaults/main.yml
index 110c7c66dda..c0188393b8f 100644
--- a/dev-tools/ansible/roles/kafka/defaults/main.yml
+++ b/dev-tools/ansible/roles/kafka/defaults/main.yml
@@ -44,6 +44,6 @@ log_retention_check_interval: "300000"
 grp_initial_rebalance_delay: "0"
 kafka_listener_port: 9092
 kafka_rest_proxy_listener_port: 8082
-zookeeper_connection_url: "{{ zookeeper_connection | default('localhost:2181') }}"
+zookeeper_connection_url: "{{ zookeeper_connection | default('airavata.localhost:2181') }}"
 
 ...
\ No newline at end of file
diff --git a/dev-tools/ansible/roles/keycloak/defaults/main.yml b/dev-tools/ansible/roles/keycloak/defaults/main.yml
index 15e51f73c0e..68316ec75ea 100644
--- a/dev-tools/ansible/roles/keycloak/defaults/main.yml
+++ b/dev-tools/ansible/roles/keycloak/defaults/main.yml
@@ -41,7 +41,7 @@ keycloak_master_account_password: "CHANGEME"
 keycloak_java_home: "{{ java_home }}"
 
 keycloak_db_vendor: "mariadb"
-keycloak_db_host: "localhost"
+keycloak_db_host: "airavata.localhost"
 keycloak_db_port: "3306"
 keycloak_db_schema_name: "keycloak"
 keycloak_db_url: "jdbc:mysql://{{keycloak_db_host}}:{{keycloak_db_port}}/{{keycloak_db_schema_name}}"
@@ -63,8 +63,8 @@ keycloak_logout_url: "https://{{ keycloak_vhost_servername }}/"
 # PGA client configuration
 keycloak_pga_client_secret: "CHANGEME_PGA_CLIENT_SECRET"
 keycloak_pga_redirect_uris:
-  - "http://airavata.host:8008/callback*"
-  - "https://airavata.host:8009/auth/callback*"
+  - "http://airavata.localhost:8008/callback*"
+  - "https://airavata.localhost:8009/auth/callback*"
 keycloak_pga_web_origins:
   - "*"
 
@@ -73,7 +73,7 @@ keycloak_jupyterlab_client_secret: "CHANGEME_JUPYTERLAB_CLIENT_SECRET"
 keycloak_jupyterlab_redirect_uris:
   - ""
   - "/*"
-  - "http://airavata.host:20000/hub/oauth_callback"
+  - "http://airavata.localhost:20000/hub/oauth_callback"
 
 # CILogon identity provider configuration
 keycloak_cilogon_client_id: "CHANGEME_CILOGON_CLIENT_ID"
diff --git a/dev-tools/ansible/roles/keycloak/templates/realm-default.json.j2 b/dev-tools/ansible/roles/keycloak/templates/realm-default.json.j2
index 072c2c34ef3..a2b080c5607 100644
--- a/dev-tools/ansible/roles/keycloak/templates/realm-default.json.j2
+++ b/dev-tools/ansible/roles/keycloak/templates/realm-default.json.j2
@@ -970,7 +970,7 @@
       "description": "",
       "rootUrl": "",
       "adminUrl": "",
-      "baseUrl": "http://airavata.host:8009/",
+      "baseUrl": "http://airavata.localhost:8009/",
       "surrogateAuthRequired": false,
       "enabled": true,
       "alwaysDisplayInConsole": false,
@@ -1053,8 +1053,8 @@
         "oidc.ciba.grant.enabled": "false",
         "client.secret.creation.time": "1741724922",
         "backchannel.logout.session.required": "true",
-        "frontchannel.logout.url": "http://airavata.host:8009/",
-        "post.logout.redirect.uris": "+##http://airavata.host:8009/",
+        "frontchannel.logout.url": "http://airavata.localhost:8009/",
+        "post.logout.redirect.uris": "+##http://airavata.localhost:8009/",
         "display.on.consent.screen": "false",
         "oauth2.device.authorization.grant.enabled": "true",
         "backchannel.logout.revoke.offline.tokens": "false"
diff --git a/dev-tools/ansible/roles/tusd/templates/tus-vhost.conf.j2 b/dev-tools/ansible/roles/tusd/templates/tus-vhost.conf.j2
index a49b9acd9a7..9cc4dafdb5b 100644
--- a/dev-tools/ansible/roles/tusd/templates/tus-vhost.conf.j2
+++ b/dev-tools/ansible/roles/tusd/templates/tus-vhost.conf.j2
@@ -30,6 +30,6 @@
     RequestHeader set X-Forwarded-Proto "https"
     ProxyPreserveHost on
 
-    ProxyPass /files http://localhost:{{ tusd_port }}/files
-    ProxyPassReverse /files http://localhost:{{ tusd_port }}/files
+    ProxyPass /files http://airavata.localhost:{{ tusd_port }}/files
+    ProxyPassReverse /files http://airavata.localhost:{{ tusd_port }}/files
 </VirtualHost>
diff --git a/dev-tools/ansible/roles/zabbix/defaults/main.yml b/dev-tools/ansible/roles/zabbix/defaults/main.yml
index 73f93381b9a..bbe7556f890 100644
--- a/dev-tools/ansible/roles/zabbix/defaults/main.yml
+++ b/dev-tools/ansible/roles/zabbix/defaults/main.yml
@@ -20,7 +20,7 @@
 
 ---
 
-zabbix_server: localhost
+zabbix_server: airavata.localhost
 zabbix_yum_repository: https://repo.zabbix.com/zabbix/4.0/rhel/7/x86_64/zabbix-release-4.0-1.el7.noarch.rpm
 zabbix_rpm_key: https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-A14FE591
 
diff --git a/dev-tools/deployment-scripts/airavata-server.properties b/dev-tools/deployment-scripts/airavata-server.properties
index 505a1d0b6bd..fc8cc3bd90b 100644
--- a/dev-tools/deployment-scripts/airavata-server.properties
+++ b/dev-tools/deployment-scripts/airavata-server.properties
@@ -23,55 +23,40 @@
 ############################
 
 ############################
-# Registry Database (MariaDB)
+# Database (MariaDB) - single unified database
 ############################
 registry.jdbc.driver=org.mariadb.jdbc.Driver
-registry.jdbc.url=jdbc:mariadb://mysql:3306/experiment_catalog
+registry.jdbc.url=jdbc:mariadb://mysql:3306/airavata
 registry.jdbc.user=airavata
 registry.jdbc.password=123456
 registry.jdbc.validationQuery=SELECT 1
 
-############################
-# App Catalog Database (MariaDB)
-############################
 appcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-appcatalog.jdbc.url=jdbc:mariadb://mysql:3306/app_catalog
+appcatalog.jdbc.url=jdbc:mariadb://mysql:3306/airavata
 appcatalog.jdbc.user=airavata
 appcatalog.jdbc.password=123456
 appcatalog.jdbc.validationQuery=SELECT 1
 
-############################
-# Replica Catalog Database (MariaDB)
-############################
 replicacatalog.jdbc.driver=org.mariadb.jdbc.Driver
-replicacatalog.jdbc.url=jdbc:mariadb://mysql:3306/replica_catalog
+replicacatalog.jdbc.url=jdbc:mariadb://mysql:3306/airavata
 replicacatalog.jdbc.user=airavata
 replicacatalog.jdbc.password=123456
 replicacatalog.jdbc.validationQuery=SELECT 1
 
-############################
-# Workflow Catalog Database (MariaDB)
-############################
 workflowcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-workflowcatalog.jdbc.url=jdbc:mariadb://mysql:3306/workflow_catalog
+workflowcatalog.jdbc.url=jdbc:mariadb://mysql:3306/airavata
 workflowcatalog.jdbc.user=airavata
 workflowcatalog.jdbc.password=123456
 workflowcatalog.jdbc.validationQuery=SELECT 1
 
-############################
-# Sharing Catalog Database (MariaDB)
-############################
 sharingcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-sharingcatalog.jdbc.url=jdbc:mariadb://mysql:3306/sharing_catalog
+sharingcatalog.jdbc.url=jdbc:mariadb://mysql:3306/airavata
 sharingcatalog.jdbc.user=airavata
 sharingcatalog.jdbc.password=123456
 sharingcatalog.jdbc.validationQuery=SELECT 1
 
-############################
-# Credential Store Database (MariaDB)
-############################
 credential.store.jdbc.driver=org.mariadb.jdbc.Driver
-credential.store.jdbc.url=jdbc:mariadb://mysql:3306/credential_store
+credential.store.jdbc.url=jdbc:mariadb://mysql:3306/airavata
 credential.store.jdbc.user=airavata
 credential.store.jdbc.password=123456
 credential.store.jdbc.validationQuery=SELECT 1
@@ -103,9 +88,9 @@ participant.name=AiravataParticipant
 ############################
 # Monitoring Configuration
 ############################
-controller.monitoring.host=0.0.0.0
+controller.monitoring.host=airavata.localhost
 controller.monitoring.port=9094
-participant.monitoring.host=0.0.0.0
+participant.monitoring.host=airavata.localhost
 participant.monitoring.port=9096
 
 ############################
@@ -144,7 +129,7 @@ thrift.client.pool.max.idle.limit=10
 # API Server Configuration
 ############################
 # API Server URLs for development
-api.server.host=localhost
+api.server.host=airavata.localhost
 api.server.port=8930
 
 ############################
@@ -152,9 +137,9 @@ api.server.port=8930
 ############################
 # Development defaults - NOT for production!
 enable.sharing=true
-remote.oauth.authorization.server=https://localhost:8443/oauth2/authorize
-remote.oauth.token.server=https://localhost:8443/oauth2/token
-remote.oauth.callback.url=https://localhost:8443/callback-url
+remote.oauth.authorization.server=https://airavata.localhost:8443/oauth2/authorize
+remote.oauth.token.server=https://airavata.localhost:8443/oauth2/token
+remote.oauth.callback.url=https://airavata.localhost:8443/callback-url
 
 ############################
 # File Storage Configuration
@@ -233,7 +218,7 @@ parser.directory=/opt/airavata/parsers
 ############################
 # Default compute resources for development
 localhost.resource.description=Local machine for development
-localhost.resource.hostname=localhost
+localhost.resource.hostname=airavata.localhost
 localhost.resource.username=airavata
 
 ############################
@@ -247,7 +232,7 @@ application.deployment.directory=/opt/airavata/applications
 # Orchestrator Configuration
 ############################
 enable.orchestrator=true
-orchestrator.server.host=localhost
+orchestrator.server.host=airavata.localhost
 orchestrator.server.port=8940
 orchestrator.server.name=Airavata_Orchestrator
 
@@ -261,9 +246,9 @@ participant.monitoring.enabled=true
 # Workflow Manager Settings
 ############################
 pre.workflow.manager.monitoring.enabled=true
-pre.workflow.manager.monitoring.host=localhost
+pre.workflow.manager.monitoring.host=airavata.localhost
 post.workflow.manager.monitoring.enabled=true
-post.workflow.manager.monitoring.host=localhost
+post.workflow.manager.monitoring.host=airavata.localhost
 
 ############################
 # Helix Participant Settings
@@ -274,55 +259,55 @@ helix.participant.name=AiravataParticipant
 # GFAC Configuration
 ############################
 enable.gfac=true
-gfac.server.host=localhost
+gfac.server.host=airavata.localhost
 gfac.server.port=8950
 gfac.server.name=Airavata_GFAC
 
 ############################
 # Registry Configuration
 ############################
-registry.server.host=localhost
+registry.server.host=airavata.localhost
 registry.server.port=8960
 registry.server.name=Airavata_Registry
 
 ############################
 # Credential Store Configuration
 ############################
-credential.store.server.host=localhost
+credential.store.server.host=airavata.localhost
 credential.store.server.port=8961
 credential.store.server.name=Airavata_CredentialStore
 
 ############################
 # User Profile Configuration
 ############################
-profile.service.server.host=localhost
+profile.service.server.host=airavata.localhost
 profile.service.server.port=8962
 profile.service.server.name=Airavata_ProfileService
 
 ############################
 # Tenant Profile Configuration
 ############################
-tenant.profile.service.server.host=localhost
+tenant.profile.service.server.host=airavata.localhost
 tenant.profile.service.server.port=8963
 tenant.profile.service.server.name=Airavata_TenantProfileService
 
 ############################
 # IAM Admin Services Configuration
 ############################
-iam.admin.services.server.host=localhost
+iam.admin.services.server.host=airavata.localhost
 iam.admin.services.server.port=8964
 iam.admin.services.server.name=Airavata_IamAdminServices
 
 ############################
 # Group Manager Configuration
 ############################
-group.manager.service.server.host=localhost
+group.manager.service.server.host=airavata.localhost
 group.manager.service.server.port=8965
 group.manager.service.server.name=Airavata_GroupManagerService
 
 ############################
 # Sharing Registry Configuration
 ############################
-sharing.registry.server.host=localhost
+sharing.registry.server.host=airavata.localhost
 sharing.registry.server.port=8966
 sharing.registry.server.name=Airavata_SharingRegistryService
diff --git a/dev-tools/deployment-scripts/docker-startup.sh b/dev-tools/deployment-scripts/docker-startup.sh
index f9a13e86b96..0e2b5a5d6c1 100644
--- a/dev-tools/deployment-scripts/docker-startup.sh
+++ b/dev-tools/deployment-scripts/docker-startup.sh
@@ -134,7 +134,7 @@ sleep 10
 # Stream all service logs to docker logs and keep container running
 echo "🚀 All Airavata services are running!"
 echo "📋 Service status:"
-echo "   - ZooKeeper: Connected (no more 'airavata.host' errors)"
+echo "   - ZooKeeper: Connected (no more 'airavata.localhost' errors)"
 echo "   - All components started successfully"
 echo ""
 echo "🔍 Streaming all logs to 'docker logs -f airavata-monolithic'"
diff --git a/dev-tools/simstream/example/settings.json b/dev-tools/simstream/example/settings.json
index d354d46ce60..0ab2dcfedc3 100644
--- a/dev-tools/simstream/example/settings.json
+++ b/dev-tools/simstream/example/settings.json
@@ -1,5 +1,5 @@
 {
-    "url": "amqp://guest:guest@localhost:5672",
+    "url": "amqp://guest:guest@airavata.localhost:5672",
     "exchange": "simstream",
     "queue": "test",
     "exchange_type": "topic"
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 2403ca741d0..00000000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,113 +0,0 @@
-services:
-  mysql:
-    image: mariadb:10.11
-    container_name: mariadb
-    environment:
-      MYSQL_ROOT_PASSWORD: rootpass
-      MYSQL_DATABASE: experiment_catalog
-      MYSQL_USER: airavata
-      MYSQL_PASSWORD: 123456
-    ports:
-      - "3306:3306"
-    volumes:
-      - mysql-data:/var/lib/mysql
-      - ./.devcontainer/database_scripts/init:/docker-entrypoint-initdb.d:ro
-    networks:
-      - airavata-network
-
-  rabbitmq:
-    image: rabbitmq:3-management
-    container_name: airavata-rabbitmq
-    environment:
-      RABBITMQ_DEFAULT_USER: airavata
-      RABBITMQ_DEFAULT_PASS: airavata
-    ports:
-      - "5672:5672"
-      - "15672:15672"
-    volumes:
-      - rabbitmq-data:/var/lib/rabbitmq
-    networks:
-      - airavata-network
-
-  zookeeper:
-    image: confluentinc/cp-zookeeper:7.4.0
-    container_name: airavata-zookeeper
-    environment:
-      ZOOKEEPER_CLIENT_PORT: 2181
-      ZOOKEEPER_TICK_TIME: 2000
-    volumes:
-      - zookeeper-data:/var/lib/zookeeper/data
-      - zookeeper-logs:/var/lib/zookeeper/log
-    networks:
-      - airavata-network
-
-  kafka:
-    image: confluentinc/cp-kafka:7.4.0
-    container_name: airavata-kafka
-    depends_on:
-      - zookeeper
-    ports:
-      - "9092:9092"
-    environment:
-      KAFKA_BROKER_ID: 1
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-      KAFKA_LISTENERS: PLAINTEXT://0.0.0.0:9092
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092
-      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
-      KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
-      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
-    volumes:
-      - kafka-data:/var/lib/kafka/data
-    networks:
-      airavata-network:
-        aliases:
-          - airavata.host
-
-  airavata-monolithic:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    container_name: airavata-monolithic
-    ports:
-      - "8930:8930"    # Airavata API (Thrift RPC)
-      - "8050:8050"    # File Server (Thrift RPC)
-      - "18800:18800"  # Agent Service (Thrift RPC)
-      - "18889:18889"  # Research Service (Thrift RPC)
-      - "19900:19900"  # Agent Service gRPC
-      - "19908:19908"  # Research Service gRPC
-    healthcheck:
-      test: ["CMD-SHELL", "nc -z localhost 8930 || exit 1"]
-      interval: 30s
-      timeout: 10s
-      start_period: 60s
-      retries: 3
-    volumes:
-      - ./dev-tools/deployment-scripts/airavata-server.properties:/opt/airavata/vault/airavata-server.properties:ro
-      - ./dev-tools/deployment-scripts/airavata-server.properties:/opt/airavata/apache-airavata-api-server/conf/airavata-server.properties:ro
-      - airavata-logs:/opt/airavata/logs
-    environment:
-      - JAVA_OPTS=-Xmx2g -Xms1g -Dthrift.server.max.message.size=1048576000 -Dthrift.server.max.frame.size=1048576000 -Dthrift.server.transport.max.message.size=1048576000 -Dthrift.maxMessageSize=1048576000 -Dthrift.maxFrameSize=1048576000
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "10m"
-        max-file: "3"
-    depends_on:
-      - mysql
-      - rabbitmq
-      - zookeeper
-      - kafka
-    networks:
-      - airavata-network
-
-volumes:
-  mysql-data:
-  rabbitmq-data:
-  zookeeper-data:
-  zookeeper-logs:
-  kafka-data:
-  airavata-logs:
-
-networks:
-  airavata-network:
-    driver: bridge
diff --git a/examples/profile-service-java-client-samples/src/main/resources/profile-client-sample.properties b/examples/profile-service-java-client-samples/src/main/resources/profile-client-sample.properties
index a38fc414601..4b6497e306a 100644
--- a/examples/profile-service-java-client-samples/src/main/resources/profile-client-sample.properties
+++ b/examples/profile-service-java-client-samples/src/main/resources/profile-client-sample.properties
@@ -24,6 +24,6 @@
 #
 ##################################################################################
 
-profile.service.server.host=localhost
+profile.service.server.host=airavata.localhost
 profile.service.server.port=8962
 
diff --git a/keystores/generate_keystore.sh b/keystores/generate_keystore.sh
index 9b66510c381..2a14563782c 100755
--- a/keystores/generate_keystore.sh
+++ b/keystores/generate_keystore.sh
@@ -5,8 +5,8 @@ keytool -genseckey -alias airavata -keyalg AES -keysize 256 -keystore aes.p12 -s
 
 # generate self-signed key-cert pair for SSL termination
 openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout server.key -out server.crt \
-  -subj "/CN=airavata.host/OU=airavata.host/O=airavata.host/L=airavata.host/ST=airavata.host/C=airavata.host" \
-  -addext "subjectAltName=DNS:airavata.host"
+  -subj "/CN=airavata.localhost/OU=airavata.localhost/O=airavata.localhost/L=airavata.localhost/ST=airavata.localhost/C=airavata.localhost" \
+  -addext "subjectAltName=DNS:airavata.localhost"
 
 # add server.crt to java truststore
 sudo keytool -cacerts -storepass changeit -delete -alias airavata
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 fbfd32da1db..e500d03be44 100644
--- a/modules/agent-framework/agent-service/src/main/resources/application.yml
+++ b/modules/agent-framework/agent-service/src/main/resources/application.yml
@@ -16,13 +16,13 @@
 
 grpc:
   server:
-    host: airavata.host
+    host: airavata.localhost
     port: 19900
     max-inbound-message-size: 20971520
 
 server:
   port: 18880
-  address: 0.0.0.0
+  address: airavata.localhost
 
 spring:
   servlet:
@@ -30,7 +30,7 @@ spring:
       max-file-size: 200MB
       max-request-size: 200MB
   datasource:
-    url: "jdbc:mariadb://airavata.host:13306/app_catalog"
+    url: "jdbc:mariadb://airavata.localhost:13306/airavata"
     username: "airavata"
     password: "123456"
     driver-class-name: org.mariadb.jdbc.Driver
@@ -44,15 +44,15 @@ spring:
 
 airavata:
   server:
-    url: airavata.host
+    url: airavata.localhost
     port: 8930
     secure: false
-  storageResourceId: airavata.host_77116e91-f042-4d3a-ab9c-3e7b4ebcd5bd
+  storageResourceId: airavata.localhost_77116e91-f042-4d3a-ab9c-3e7b4ebcd5bd
   storagePath: /tmp
   cluster:
     applicationInterfaceId: AiravataAgent_f4313e4d-20c2-4bf6-bff1-8aa0f0b0c1d6
   tunnel:
-    serverHost: airavata.host
+    serverHost: airavata.localhost
     serverPort: 17000
     serverToken: airavata
-    serverApiUrl: http://airavata.host:8000
+    serverApiUrl: http://airavata.localhost:8000
diff --git a/modules/file-server/src/main/resources/application.properties b/modules/file-server/src/main/resources/application.properties
index d6dc1ad2c7b..42a416d40a8 100644
--- a/modules/file-server/src/main/resources/application.properties
+++ b/modules/file-server/src/main/resources/application.properties
@@ -1,9 +1,9 @@
 spring.servlet.multipart.max-file-size=10MB
 spring.servlet.multipart.max-request-size=10MB
 
-regserver.server.host=airavata.host
+regserver.server.host=airavata.localhost
 regserver.server.port=8970
-credential.store.server.host=airavata.host
+credential.store.server.host=airavata.localhost
 credential.store.server.port=8960
 
 server.port=8050
diff --git a/modules/registry-db-migrator/README.md b/modules/registry-db-migrator/README.md
deleted file mode 100644
index c2427334b2c..00000000000
--- a/modules/registry-db-migrator/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-0.7 => 0.8
-==============
-
-1. Build registry-db-migrator
-2. Copy registry-db-migrator-0.8-SNAPSHOT.jar and commons-cli-1.1.jar (you will find this in your maven repository) to <AIRAVATA_HOME>/lib
-3. Copy db-migrate.sh file to <AIRAVATA_HOME>/bin
-4. Make sure previous version of airavata database is up and running
-5. Run db-migrate.sh script file
-        ./db-migrate.sh -url jdbc:mysql://localhost:3306/experiment_catalog -user airavata -pwd airavata -v 0.7
\ No newline at end of file
diff --git a/modules/registry-db-migrator/pom.xml b/modules/registry-db-migrator/pom.xml
deleted file mode 100644
index c8615059c63..00000000000
--- a/modules/registry-db-migrator/pom.xml
+++ /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.
--->
-<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>registry-db-migrator</artifactId>
-    <packaging>jar</packaging>
-    <name>Airavata Registry Tools - DB Migrator</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derbyclient</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derbynet</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derbytools</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/modules/registry-db-migrator/src/main/java/org/apache/airavata/registry/tool/DBMigrator.java b/modules/registry-db-migrator/src/main/java/org/apache/airavata/registry/tool/DBMigrator.java
deleted file mode 100644
index f6008266fdd..00000000000
--- a/modules/registry-db-migrator/src/main/java/org/apache/airavata/registry/tool/DBMigrator.java
+++ /dev/null
@@ -1,373 +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.
-*/
-package org.apache.airavata.registry.tool;
-
-import java.io.*;
-import java.net.URI;
-import java.sql.*;
-import java.text.DecimalFormat;
-import java.util.*;
-import java.util.Date;
-import org.apache.commons.cli.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class DBMigrator {
-    private static final Logger logger = LoggerFactory.getLogger(DBMigrator.class);
-    private static final String delimiter = ";";
-    private static final String MIGRATE_SQL_DERBY = "migrate_derby.sql";
-    private static final String MIGRATE_SQL_MYSQL = "migrate_mysql.sql";
-    private static final String REGISTRY_VERSION = "registry.version";
-    private static final String AIRAVATA_VERSION = "0.5";
-    private static String currentAiravataVersion;
-    private static String relativePath;
-    private static String SELECT_QUERY;
-    private static String INSERT_QUERY;
-    private static String UPDATE_QUERY;
-    private static String jdbcURL;
-    private static String jdbcUser;
-    private static String jdbcPwd;
-
-    public static void main(String[] args) {
-        parseArguments(args);
-        generateConfigTableQueries();
-        updateDB(jdbcURL, jdbcUser, jdbcPwd);
-    }
-
-    public static void generateConfigTableQueries() {
-        SELECT_QUERY =
-                "SELECT * FROM CONFIGURATION WHERE config_key='" + REGISTRY_VERSION + "' and category_id='SYSTEM'";
-        INSERT_QUERY = "INSERT INTO CONFIGURATION (config_key, config_val, expire_date, category_id) VALUES('"
-                + REGISTRY_VERSION
-                + "', '" + getIncrementedVersion(currentAiravataVersion) + "', '" + getCurrentDate() + "','SYSTEM')";
-        UPDATE_QUERY = "UPDATE CONFIGURATION SET config_val='" + getIncrementedVersion(currentAiravataVersion)
-                + "', expire_date='" + getCurrentDate() + "' WHERE config_key='" + REGISTRY_VERSION
-                + "' and category_id='SYSTEM'";
-    }
-
-    // we assume given database is up and running
-    public static void updateDB(String jdbcUrl, String jdbcUser, String jdbcPwd) {
-        relativePath = "db-scripts/" + getIncrementedVersion(currentAiravataVersion) + "/";
-        InputStream sqlStream = null;
-        Scanner in = new Scanner(System.in);
-        if (jdbcUrl == null || jdbcUrl.equals("")) {
-            System.out.println("Enter JDBC URL : ");
-            jdbcUrl = in.next();
-        }
-        if (jdbcUser == null || jdbcUser.equals("")) {
-            System.out.println("Enter JDBC Username : ");
-            jdbcUser = in.next();
-        }
-        if (jdbcPwd == null || jdbcPwd.equals("")) {
-            System.out.println("Enter JDBC password : ");
-            jdbcPwd = in.next();
-        }
-
-        String dbType = getDBType(jdbcUrl);
-        String jdbcDriver = null;
-
-        Connection connection;
-        try {
-            File file = null;
-            if (dbType.contains("derby")) {
-                jdbcDriver = "org.apache.derby.jdbc.ClientDriver";
-                sqlStream = DBMigrator.class.getClassLoader().getResourceAsStream(relativePath + MIGRATE_SQL_DERBY);
-            } else if (dbType.contains("mysql")) {
-                jdbcDriver = "com.mysql.jdbc.Driver";
-                sqlStream = DBMigrator.class.getClassLoader().getResourceAsStream(relativePath + MIGRATE_SQL_MYSQL);
-            }
-            Class.forName(jdbcDriver).newInstance();
-            connection = DriverManager.getConnection(jdbcUrl, jdbcUser, jdbcPwd);
-            if (canUpdated(connection)) {
-                executeSQLScript(connection, sqlStream);
-                // update configuration table with airavata version
-                updateConfigTable(connection);
-            }
-        } catch (ClassNotFoundException e) {
-            logger.error("Unable to find SQL scripts...", e);
-        } catch (InstantiationException e) {
-            logger.error("Error while updating the database...", e);
-        } catch (IllegalAccessException e) {
-            logger.error("Error while updating the database...", e);
-        } catch (SQLException e) {
-            logger.error("Error while updating the database...", e);
-        } catch (Exception e) {
-            logger.error("Error while updating the database...", e);
-        }
-    }
-
-    private static boolean canUpdated(Connection conn) {
-        if (!currentAiravataVersion.equals(AIRAVATA_VERSION)) {
-            String config = executeSelectQuery(conn);
-            if (config != null) {
-                if (config.equals(getIncrementedVersion(currentAiravataVersion))) {
-                    return false;
-                } else {
-                    return true;
-                }
-            }
-        } else if (currentAiravataVersion.equals(AIRAVATA_VERSION)) {
-            return true;
-        }
-        return false;
-    }
-
-    private static void updateConfigTable(Connection connection) {
-        // if existing need to update, otherwise insert
-        if (executeSelectQuery(connection) != null) {
-            executeQuery(connection, UPDATE_QUERY);
-        } else {
-            executeQuery(connection, INSERT_QUERY);
-        }
-    }
-
-    private static Timestamp getCurrentDate() {
-        Calendar cal = Calendar.getInstance();
-        Date date = cal.getTime();
-        Timestamp d = new Timestamp(date.getTime());
-        return d;
-    }
-
-    private static String getIncrementedVersion(String currentVersion) {
-
-        DecimalFormat decimalFormat = new DecimalFormat("#,##0.0");
-        Double currentVer = Double.parseDouble(currentVersion);
-        double v = currentVer + .1;
-        String formattedVal = decimalFormat.format(v);
-        return formattedVal;
-    }
-
-    private static String executeSelectQuery(Connection conn) {
-        try {
-            Statement statement = conn.createStatement();
-            ResultSet rs = statement.executeQuery(SELECT_QUERY);
-            if (rs != null) {
-                while (rs.next()) {
-                    currentAiravataVersion = rs.getString(2);
-                    return currentAiravataVersion;
-                }
-            }
-        } catch (SQLException e) {
-            logger.error(e.getMessage(), e);
-        }
-        return null;
-    }
-
-    private static void executeQuery(Connection conn, String query) {
-        try {
-            Statement statement = conn.createStatement();
-            statement.execute(query);
-        } catch (SQLException e) {
-            logger.error(e.getMessage(), e);
-        }
-    }
-
-    private static void executeSQLScript(Connection conn, InputStream inputStream) throws Exception {
-        StringBuffer sql = new StringBuffer();
-        BufferedReader reader = null;
-        try {
-            reader = new BufferedReader(new InputStreamReader(inputStream));
-            String line;
-            while ((line = reader.readLine()) != null) {
-                line = line.trim();
-                if (line.startsWith("//")) {
-                    continue;
-                }
-                if (line.startsWith("--")) {
-                    continue;
-                }
-                StringTokenizer st = new StringTokenizer(line);
-                if (st.hasMoreTokens()) {
-                    String token = st.nextToken();
-                    if ("REM".equalsIgnoreCase(token)) {
-                        continue;
-                    }
-                }
-                sql.append(" ").append(line);
-
-                // SQL defines "--" as a comment to EOL
-                // and in Oracle it may contain a hint
-                // so we cannot just remove it, instead we must end it
-                if (line.indexOf("--") >= 0) {
-                    sql.append("\n");
-                }
-                if ((checkStringBufferEndsWith(sql, delimiter))) {
-                    String sqlString = sql.substring(0, sql.length() - delimiter.length());
-                    executeSQL(sqlString, conn);
-                    sql.replace(0, sql.length(), "");
-                }
-            }
-            System.out.println(sql.toString());
-            // Catch any statements not followed by ;
-            if (sql.length() > 0) {
-                executeSQL(sql.toString(), conn);
-            }
-        } catch (IOException e) {
-            logger.error("Error occurred while executing SQL script for creating Airavata database", e);
-            throw new Exception("Error occurred while executing SQL script for creating Airavata database", e);
-        } finally {
-            if (reader != null) {
-                reader.close();
-            }
-        }
-    }
-
-    private static String getDBType(String jdbcURL) {
-        try {
-            String cleanURI = jdbcURL.substring(5);
-            URI uri = URI.create(cleanURI);
-            return uri.getScheme();
-        } catch (Exception e) {
-            logger.error(e.getMessage(), e);
-            return null;
-        }
-    }
-
-    public static boolean checkStringBufferEndsWith(StringBuffer buffer, String suffix) {
-        if (suffix.length() > buffer.length()) {
-            return false;
-        }
-        // this loop is done on purpose to avoid memory allocation performance
-        // problems on various JDKs
-        // StringBuffer.lastIndexOf() was introduced in jdk 1.4 and
-        // implementation is ok though does allocation/copying
-        // StringBuffer.toString().endsWith() does massive memory
-        // allocation/copying on JDK 1.5
-        // See http://issues.apache.org/bugzilla/show_bug.cgi?id=37169
-        int endIndex = suffix.length() - 1;
-        int bufferIndex = buffer.length() - 1;
-        while (endIndex >= 0) {
-            if (buffer.charAt(bufferIndex) != suffix.charAt(endIndex)) {
-                return false;
-            }
-            bufferIndex--;
-            endIndex--;
-        }
-        return true;
-    }
-
-    private static void executeSQL(String sql, Connection conn) throws Exception {
-        if ("".equals(sql.trim())) {
-            return;
-        }
-        Statement statement = null;
-        try {
-            logger.debug("SQL : " + sql);
-
-            boolean ret;
-            int updateCount = 0, updateCountTotal = 0;
-            statement = conn.createStatement();
-            ret = statement.execute(sql);
-            updateCount = statement.getUpdateCount();
-            do {
-                if (!ret) {
-                    if (updateCount != -1) {
-                        updateCountTotal += updateCount;
-                    }
-                }
-                ret = statement.getMoreResults();
-                if (ret) {
-                    updateCount = statement.getUpdateCount();
-                }
-            } while (ret);
-
-            logger.debug(sql + " : " + updateCountTotal + " rows affected");
-
-            SQLWarning warning = conn.getWarnings();
-            while (warning != null) {
-                logger.warn(warning + " sql warning");
-                warning = warning.getNextWarning();
-            }
-            conn.clearWarnings();
-        } catch (SQLException e) {
-            if (e.getSQLState().equals("X0Y32")) {
-                logger.info("Table Already Exists", e);
-            } else {
-                throw new Exception("Error occurred while executing : " + sql, e);
-            }
-        } finally {
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException e) {
-                    logger.error("Error occurred while closing result set.", e);
-                }
-            }
-        }
-    }
-
-    public static void parseArguments(String[] args) {
-        try {
-            Options options = new Options();
-            options.addOption("url", true, "JDBC URL");
-            options.addOption("user", true, "JDBC Username");
-            options.addOption("pwd", true, "JDBC Password");
-            options.addOption("v", true, "Airavata Current Version");
-            CommandLineParser parser = new PosixParser();
-            CommandLine cmd = parser.parse(options, args);
-            jdbcURL = cmd.getOptionValue("url");
-            if (jdbcURL == null) {
-                logger.info("You should enter JDBC URL and JDBC Credentials as parameters...");
-            }
-            jdbcUser = cmd.getOptionValue("user");
-            if (jdbcUser == null) {
-                logger.info("You should enter JDBC URL and JDBC Credentials as parameters...");
-            }
-            jdbcPwd = cmd.getOptionValue("pwd");
-            currentAiravataVersion = cmd.getOptionValue("v");
-            if (currentAiravataVersion == null) {
-                logger.info("You should enter current Airavata version you are using...");
-            }
-        } catch (ParseException e) {
-            logger.error("Error while reading command line parameters", e);
-        }
-    }
-
-    protected static InputStream readFile(File file) {
-        StringBuilder fileContentsBuilder = new StringBuilder();
-        BufferedReader bufferedReader = null;
-        try {
-            char[] buffer = new char[32767];
-            bufferedReader = new BufferedReader(new FileReader(file));
-            int read = 0;
-
-            do {
-                read = bufferedReader.read(buffer);
-                if (read > 0) {
-                    fileContentsBuilder.append(buffer, 0, read);
-                }
-            } while (read > 0);
-        } catch (Exception e) {
-            logger.error("Failed to read file " + file.getPath(), e);
-        } finally {
-            if (bufferedReader != null) {
-                try {
-                    bufferedReader.close();
-                } catch (IOException e) {
-                    logger.error("Unable to close BufferedReader for " + file.getPath(), e);
-                }
-            }
-        }
-        System.out.println(fileContentsBuilder.toString());
-        InputStream is = new ByteArrayInputStream(fileContentsBuilder.toString().getBytes());
-
-        return is;
-    }
-}
diff --git a/modules/registry-db-migrator/src/main/resources/db-migrate.sh b/modules/registry-db-migrator/src/main/resources/db-migrate.sh
deleted file mode 100755
index f11644339f8..00000000000
--- a/modules/registry-db-migrator/src/main/resources/db-migrate.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-. $(dirname $0)/setenv.sh
-cd $AIRAVATA_HOME/bin
-
-# update classpath
-REG_MIGRATE_CLASSPATH="$AIRAVATA_HOME/lib"
-for f in $AIRAVATA_HOME/lib/*.jar; do
-  REG_MIGRATE_CLASSPATH=$REG_MIGRATE_CLASSPATH:$f
-done
-
-java -server -Xms128M -Xmx128M \
-  $XDEBUG \
-  $TEMP_PROPS \
-  -classpath $REG_MIGRATE_CLASSPATH \
-  -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=5000,suspend=n \
-  org.apache.airavata.registry.tool.DBMigrator $*
diff --git a/modules/registry-db-migrator/src/main/resources/db-scripts/0.6/migrate_derby.sql b/modules/registry-db-migrator/src/main/resources/db-scripts/0.6/migrate_derby.sql
deleted file mode 100644
index 1e6a60590d0..00000000000
--- a/modules/registry-db-migrator/src/main/resources/db-scripts/0.6/migrate_derby.sql
+++ /dev/null
@@ -1,35 +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.
- *
- */
-
-ALTER TABLE Configuration ADD category_id varchar(255) NOT NULL DEFAULT 'SYSTEM';
-
-ALTER TABLE Configuration DROP PRIMARY KEY;
-
-ALTER TABLE Configuration ADD PRIMARY KEY(config_key, config_val, category_id);
-
-ALTER TABLE Node_Data
-ADD execution_index int NOT NULL DEFAULT 0;
-
-ALTER TABLE Node_Data DROP PRIMARY KEY;
-
-ALTER TABLE Node_Data ADD PRIMARY KEY(workflow_instanceID, node_id, execution_index);
-
-
diff --git a/modules/registry-db-migrator/src/main/resources/db-scripts/0.6/migrate_mysql.sql b/modules/registry-db-migrator/src/main/resources/db-scripts/0.6/migrate_mysql.sql
deleted file mode 100644
index be3d66e564b..00000000000
--- a/modules/registry-db-migrator/src/main/resources/db-scripts/0.6/migrate_mysql.sql
+++ /dev/null
@@ -1,32 +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.
- *
- */
-
-ALTER TABLE Configuration
-ADD category_id varchar(255);
-
-UPDATE Configuration SET category_id="SYSTEM" ;
-
-ALTER TABLE Configuration DROP PRIMARY KEY, ADD PRIMARY KEY(config_key, config_val, category_id);
-
-ALTER TABLE Node_Data
-ADD execution_index int NOT NULL;
-
-ALTER TABLE Node_Data DROP PRIMARY KEY, ADD PRIMARY KEY(workflow_instanceID, node_id, execution_index);
\ No newline at end of file
diff --git a/modules/registry-db-migrator/src/main/resources/db-scripts/0.7/migrate_derby.sql b/modules/registry-db-migrator/src/main/resources/db-scripts/0.7/migrate_derby.sql
deleted file mode 100644
index 0528e10e94b..00000000000
--- a/modules/registry-db-migrator/src/main/resources/db-scripts/0.7/migrate_derby.sql
+++ /dev/null
@@ -1,40 +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 community_user
-(
-        GATEWAY_NAME 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_NAME, 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,
-        PRIMARY KEY (GATEWAY_ID, TOKEN_ID)
-);
\ No newline at end of file
diff --git a/modules/registry-db-migrator/src/main/resources/db-scripts/0.8/migrate_derby.sql b/modules/registry-db-migrator/src/main/resources/db-scripts/0.8/migrate_derby.sql
deleted file mode 100644
index 95b2ccfd125..00000000000
--- a/modules/registry-db-migrator/src/main/resources/db-scripts/0.8/migrate_derby.sql
+++ /dev/null
@@ -1,72 +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 Execution_Error
-(
-       error_id INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-       experiment_ID varchar(255),
-       workflow_instanceID varchar(255),
-       node_id varchar(255),
-       gfacJobID varchar(255),
-       source_type varchar(255),
-       error_date TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-       error_msg CLOB,
-       error_des CLOB,
-       error_code varchar(255),
-       error_reporter varchar(255),
-       error_location varchar(255),
-       action_taken varchar(255),
-       error_reference INTEGER,
-       PRIMARY KEY(error_id),
-       FOREIGN KEY (workflow_instanceID) REFERENCES Workflow_Data(workflow_instanceID) ON DELETE CASCADE,
-       FOREIGN KEY (experiment_ID) REFERENCES Experiment_Data(experiment_ID) ON DELETE CASCADE
-);
-
-create table GFac_Job_Data
-(
-       experiment_ID varchar(255),
-       workflow_instanceID varchar(255),
-       node_id varchar(255),
-       application_descriptor_ID varchar(255),
-       host_descriptor_ID varchar(255),
-       service_descriptor_ID varchar(255),
-       job_data CLOB,
-       local_Job_ID varchar(255),
-       submitted_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-       status_update_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-       status varchar(255),
-       metadata CLOB,
-       PRIMARY KEY(local_Job_ID),
-       FOREIGN KEY (experiment_ID) REFERENCES Experiment_Data(experiment_ID),
-       FOREIGN KEY (workflow_instanceID) REFERENCES Workflow_Data(workflow_instanceID)
-);
-
-create table GFac_Job_Status
-(
-       local_Job_ID varchar(255),
-       status_update_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-       status varchar(255),
-       FOREIGN KEY (local_Job_ID) REFERENCES GFac_Job_Data(local_Job_ID)
-);
-
-INSERT INTO GFac_Job_Data(experiment_ID, workflow_instanceID, node_id, application_descriptor_ID, host_descriptor_ID, service_descriptor_ID,
-job_data, local_Job_ID, submitted_time, statusUpdateTime, status, metadata) SELECT null, workflow_instanceID, node_id, null, invoked_host,
-null, null, local_Job_ID, null, null, 'UNKNOWN', null FROM Gram_Data;
\ No newline at end of file
diff --git a/modules/registry-db-migrator/src/main/resources/db-scripts/0.8/migrate_mysql.sql b/modules/registry-db-migrator/src/main/resources/db-scripts/0.8/migrate_mysql.sql
deleted file mode 100644
index 40ca48c66de..00000000000
--- a/modules/registry-db-migrator/src/main/resources/db-scripts/0.8/migrate_mysql.sql
+++ /dev/null
@@ -1,72 +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 Execution_Error
-(
-       error_id INT NOT NULL AUTO_INCREMENT,
-       experiment_ID varchar(255),
-       workflow_instanceID varchar(255),
-       node_id varchar(255),
-       gfacJobID varchar(255),
-       source_type varchar(255),
-       error_date TIMESTAMP DEFAULT now() on update now(),
-       error_msg LONGTEXT,
-       error_des LONGTEXT,
-       error_code varchar(255),
-       error_reporter varchar(255),
-       error_location varchar(255),
-       action_taken varchar(255),
-       error_reference INTEGER,
-       PRIMARY KEY(error_id),
-       FOREIGN KEY (workflow_instanceID) REFERENCES Workflow_Data(workflow_instanceID) ON DELETE CASCADE,
-       FOREIGN KEY (experiment_ID) REFERENCES Experiment_Data(experiment_ID) ON DELETE CASCADE
-);
-
-create table GFac_Job_Data
-(
-       experiment_ID varchar(255),
-       workflow_instanceID varchar(255),
-       node_id varchar(255),
-       application_descriptor_ID varchar(255),
-       host_descriptor_ID varchar(255),
-       service_descriptor_ID varchar(255),
-       job_data LONGTEXT,
-       local_Job_ID varchar(255),
-       submitted_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-       status_update_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-       status varchar(255),
-       metadata LONGTEXT,
-       PRIMARY KEY(local_Job_ID)
-       FOREIGN KEY (experiment_ID) REFERENCES Experiment_Data(experiment_ID),
-       FOREIGN KEY (workflow_instanceID) REFERENCES Workflow_Data(workflow_instanceID)
-);
-
-create table GFac_Job_Status
-(
-       local_Job_ID varchar(255),
-       status_update_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
-       status varchar(255),
-       FOREIGN KEY (local_Job_ID) REFERENCES GFac_Job_Data(local_Job_ID)
-);
-
-INSERT INTO GFac_Job_Data(experiment_ID, workflow_instanceID, node_id, application_descriptor_ID, host_descriptor_ID, service_descriptor_ID,
-job_data, local_Job_ID, submitted_time, status_update_time, status, metadata) SELECT null, workflow_instanceID, node_id, null, invoked_host,
-null, null, local_Job_ID, null, null, 'UNKNOWN', null FROM Gram_Data;
\ No newline at end of file
diff --git a/modules/release-migration-scripts/0.16-0.17/DeltaScripts/appCatalog_schema_delta.sql b/modules/release-migration-scripts/0.16-0.17/DeltaScripts/appCatalog_schema_delta.sql
deleted file mode 100644
index ca32647a7a2..00000000000
--- a/modules/release-migration-scripts/0.16-0.17/DeltaScripts/appCatalog_schema_delta.sql
+++ /dev/null
@@ -1,106 +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.
---
-
-# Will migrate 0.16 DataBase schema to 0.17 Database Schema
-
-CREATE TABLE `USER_RESOURCE_PROFILE` (
-  `USER_ID` varchar(255) NOT NULL,
-  `CREATION_TIME` datetime 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` datetime DEFAULT NULL,
-  PRIMARY KEY (`USER_ID`,`GATEWAY_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-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`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-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`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-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` datetime DEFAULT NULL,
-  `RESERVATION_START_TIME` datetime DEFAULT NULL,
-  `SCRATCH_LOCATION` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`RESOURCE_ID`,`USER_ID`,`GATEWAY_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-ALTER TABLE `BATCH_QUEUE` ADD `DEFAULT_CPU_COUNT` int(11) DEFAULT NULL;
-ALTER TABLE `BATCH_QUEUE` ADD `DEFAULT_NODE_COUNT` int(11) DEFAULT NULL;
-ALTER TABLE `BATCH_QUEUE` ADD `IS_DEFAULT_QUEUE` bit(1) DEFAULT NULL;
-ALTER TABLE `BATCH_QUEUE` ADD `CPU_PER_NODE` int(11) DEFAULT NULL;
-ALTER TABLE `LOCAL_SUBMISSION` ADD `SECURITY_PROTOCOL` varchar(255) DEFAULT NULL;
-ALTER TABLE `APPLICATION_DEPLOYMENT` ADD `DEFAULT_QUEUE_NAME` varchar(255) DEFAULT NULL;
-ALTER TABLE `APPLICATION_DEPLOYMENT` ADD `DEFAULT_CPU_COUNT` int(11) DEFAULT NULL;
-ALTER TABLE `APPLICATION_INPUT` ADD `IS_READ_ONLY` tinyint(1) NOT NULL DEFAULT '0';
-ALTER TABLE `APPLICATION_DEPLOYMENT` ADD `DEFAULT_NODE_COUNT` int(11) DEFAULT NULL;
-ALTER TABLE `APPLICATION_DEPLOYMENT` ADD `EDITABLE_BY_USER` bit(1) DEFAULT NULL;
-ALTER TABLE `GATEWAY_CLIENT_CREDENTIAL` CHANGE `CLIENT_KEY` `CLIENT_KEY` varchar(255) NOT NULL;
-
-
-ALTER TABLE `COMPUTE_RESOURCE` ADD `DEFAULT_NODE_COUNT` int(11) NOT NULL DEFAULT '0';
-ALTER TABLE `COMPUTE_RESOURCE` ADD `DEFAULT_CPU_COUNT` int(11) NOT NULL DEFAULT '0';
-ALTER TABLE `COMPUTE_RESOURCE` ADD `DEFAULT_WALLTIME` int(11) NOT NULL DEFAULT '0';
-ALTER TABLE `COMPUTE_RESOURCE` ADD `CPUS_PER_NODE` int(11) NOT NULL DEFAULT '0';
-ALTER TABLE `BATCH_QUEUE` ADD `QUEUE_SPECIFIC_MACROS` varchar(255) NOT NULL;
-ALTER TABLE `APPLICATION_DEPLOYMENT` ADD `DEFAULT_WALLTIME` int(11) NOT NULL DEFAULT '0';
-ALTER TABLE `BATCH_QUEUE` ADD `DEFAULT_WALLTIME` int(11) NOT NULL DEFAULT '0';
-ALTER TABLE `APPLICATION_DEPLOYMENT` CHANGE `DEFAULT_NODE_COUNT` `DEFAULT_NODE_COUNT` int(11) DEFAULT '0';
-ALTER TABLE `APPLICATION_DEPLOYMENT` CHANGE `DEFAULT_CPU_COUNT` `DEFAULT_CPU_COUNT` int(11) NOT NULL DEFAULT '0';
-
-
-alter table COMPUTE_RESOURCE_PREFERENCE add SSH_ACCOUNT_PROVISIONER VARCHAR(255);
-alter table COMPUTE_RESOURCE_PREFERENCE add SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO VARCHAR(1000);
-
-CREATE TABLE SSH_ACCOUNT_PROVISIONER_CONFIG
-(
-        GATEWAY_ID VARCHAR(255),
-        RESOURCE_ID VARCHAR(255),
-        CONFIG_NAME VARCHAR(255),
-        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
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
-alter table USER_COMPUTE_RESOURCE_PREFERENCE add VALIDATED tinyint(1) NOT NULL DEFAULT 0;
--- VALIDATED defaults to false (0) but set all existing ones to be true (1)
-update USER_COMPUTE_RESOURCE_PREFERENCE set VALIDATED = 1;
-
diff --git a/modules/release-migration-scripts/0.16-0.17/DeltaScripts/credentialStore_schema_delta.sql b/modules/release-migration-scripts/0.16-0.17/DeltaScripts/credentialStore_schema_delta.sql
deleted file mode 100644
index 78201fcaa06..00000000000
--- a/modules/release-migration-scripts/0.16-0.17/DeltaScripts/credentialStore_schema_delta.sql
+++ /dev/null
@@ -1,29 +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.
---
-
-# Will migrate 0.16 DataBase schema to 0.17 Database Schema
-
-CREATE TABLE `CONFIGURATION` (
-  `CONFIG_KEY` varchar(255) NOT NULL DEFAULT '',
-  `CONFIG_VAL` varchar(255) NOT NULL DEFAULT '',
-  PRIMARY KEY (`CONFIG_KEY`,`CONFIG_VAL`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-ALTER TABLE `CREDENTIALS` ADD `CREDENTIAL_OWNER_TYPE` varchar(10) NOT NULL DEFAULT 'GATEWAY';
-ALTER TABLE `CREDENTIALS` ADD `DESCRIPTION` varchar(512) DEFAULT NULL;
diff --git a/modules/release-migration-scripts/0.16-0.17/DeltaScripts/expCatalog_schema_delta.sql b/modules/release-migration-scripts/0.16-0.17/DeltaScripts/expCatalog_schema_delta.sql
deleted file mode 100644
index 3c122f940d9..00000000000
--- a/modules/release-migration-scripts/0.16-0.17/DeltaScripts/expCatalog_schema_delta.sql
+++ /dev/null
@@ -1,46 +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.
---
-
-# Will migrate 0.16 DataBase schema to 0.17 Database Schema
-
-CREATE TABLE `QUEUE_STATUS` (
-  `HOST_NAME` varchar(255) NOT NULL,
-  `QUEUE_NAME` varchar(255) NOT NULL,
-  `CREATED_TIME` bigint(20) NOT NULL,
-  `QUEUE_UP` bit(1) DEFAULT NULL,
-  `QUEUED_JOBS` int(11) DEFAULT NULL,
-  `RUNNING_JOBS` int(11) DEFAULT NULL,
-  PRIMARY KEY (`HOST_NAME`,`QUEUE_NAME`,`CREATED_TIME`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-ALTER TABLE `GATEWAY` ADD `REQUESTER_USERNAME` varchar(255) DEFAULT NULL;
-ALTER TABLE `GATEWAY` ADD `GATEWAY_DOMAIN` varchar(255) DEFAULT NULL;
-ALTER TABLE `USER_CONFIGURATION_DATA` ADD `IS_USE_USER_CR_PREF` bit(1) DEFAULT NULL;
-ALTER TABLE `PROCESS_INPUT` ADD `IS_READ_ONLY` smallint(1) NOT NULL DEFAULT '0';
-ALTER TABLE `PROCESS` ADD `USE_USER_CR_PREF` bit(1) DEFAULT NULL;
-ALTER TABLE `GATEWAY` ADD `REQUEST_CREATION_TIME` datetime DEFAULT CURRENT_TIMESTAMP;
-ALTER TABLE `EXPERIMENT_INPUT` ADD `IS_READ_ONLY` smallint(1) NOT NULL DEFAULT '0';
-ALTER TABLE `GATEWAY` ADD `OAUTH_CLIENT_ID` varchar(255) DEFAULT NULL;
-ALTER TABLE `GATEWAY` ADD `DECLINED_REASON` varchar(255) DEFAULT NULL;
-ALTER TABLE `GATEWAY` ADD `OAUTH_CLIENT_SECRET` varchar(255) DEFAULT NULL;
-ALTER TABLE `USERS` CHANGE `AIRAVATA_INTERNAL_USER_ID` `AIRAVATA_INTERNAL_USER_ID` varchar(255) NOT NULL;
-ALTER TABLE `EXPERIMENT_STATUS` CHANGE `TIME_OF_STATE_CHANGE` `TIME_OF_STATE_CHANGE` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6);
-ALTER TABLE `NOTIFICATION` CHANGE `NOTIFICATION_MESSAGE` `NOTIFICATION_MESSAGE` varchar(4096) NOT NULL;
-ALTER TABLE `JOB_STATUS` CHANGE `TIME_OF_STATE_CHANGE` `TIME_OF_STATE_CHANGE` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
-ALTER TABLE `USERS` ADD UNIQUE KEY `AIRAVATA_INTERNAL_USER_ID` (`AIRAVATA_INTERNAL_USER_ID`);
diff --git a/modules/release-migration-scripts/0.16-0.17/DeltaScripts/profile_service_schema_delta.sql b/modules/release-migration-scripts/0.16-0.17/DeltaScripts/profile_service_schema_delta.sql
deleted file mode 100644
index 94ea038e500..00000000000
--- a/modules/release-migration-scripts/0.16-0.17/DeltaScripts/profile_service_schema_delta.sql
+++ /dev/null
@@ -1,21 +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.
---
-
--- no differences
diff --git a/modules/release-migration-scripts/0.16-0.17/DeltaScripts/replicaCatalog_schema_delta.sql b/modules/release-migration-scripts/0.16-0.17/DeltaScripts/replicaCatalog_schema_delta.sql
deleted file mode 100644
index 16c4db2ab5c..00000000000
--- a/modules/release-migration-scripts/0.16-0.17/DeltaScripts/replicaCatalog_schema_delta.sql
+++ /dev/null
@@ -1,24 +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.
---
-
-# Will migrate 0.16 DataBase schema to 0.17 Database Schema
-
-ALTER TABLE `DATA_PRODUCT` ADD KEY `PARENT_PRODUCT_URI` (`PARENT_PRODUCT_URI`);
-ALTER TABLE `DATA_PRODUCT` ADD CONSTRAINT `DATA_PRODUCT_ibfk_1` FOREIGN KEY (`PARENT_PRODUCT_URI`) REFERENCES `DATA_PRODUCT` (`PRODUCT_URI`) ON DELETE CASCADE;
diff --git a/modules/release-migration-scripts/0.16-0.17/DeltaScripts/sharingCatalog_schema_delta.sql b/modules/release-migration-scripts/0.16-0.17/DeltaScripts/sharingCatalog_schema_delta.sql
deleted file mode 100644
index b8b9838d863..00000000000
--- a/modules/release-migration-scripts/0.16-0.17/DeltaScripts/sharingCatalog_schema_delta.sql
+++ /dev/null
@@ -1,31 +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.
---
-
--- NOTE: the following is only needed if you previously installed Airavata from
--- the master branch and have a sharing catalog database
-ALTER TABLE `ENTITY` CHANGE `SHARED_COUNT` `SHARED_COUNT` BIGINT DEFAULT 0;
-ALTER TABLE `SHARING` DROP FOREIGN KEY IF EXISTS `SHARING_ibfk_1`;
-ALTER TABLE `SHARING` DROP FOREIGN KEY IF EXISTS `SHARING_ibfk_2`;
-ALTER TABLE `SHARING` DROP FOREIGN KEY IF EXISTS `SHARING_ibfk_3`;
-ALTER TABLE `SHARING` DROP FOREIGN KEY IF EXISTS `SHARING_ibfk_4`;
-ALTER TABLE `SHARING` ADD CONSTRAINT `SHARING_PERMISSION_TYPE_ID_DOMAIN_ID_FK` FOREIGN KEY (PERMISSION_TYPE_ID, DOMAIN_ID) REFERENCES PERMISSION_TYPE(PERMISSION_TYPE_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION;
-ALTER TABLE `SHARING` ADD CONSTRAINT `SHARING_ENTITY_ID_DOMAIN_ID_FK` FOREIGN KEY (ENTITY_ID, DOMAIN_ID) REFERENCES ENTITY(ENTITY_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION;
-ALTER TABLE `SHARING` ADD CONSTRAINT `SHARING_INHERITED_PARENT_ID_DOMAIN_ID_FK` FOREIGN KEY (INHERITED_PARENT_ID, DOMAIN_ID) REFERENCES ENTITY(ENTITY_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION;
-ALTER TABLE `SHARING` ADD CONSTRAINT `SHARING_GROUP_ID_DOMAIN_ID_FK` FOREIGN KEY (GROUP_ID, DOMAIN_ID) REFERENCES USER_GROUP(GROUP_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION;
diff --git a/modules/release-migration-scripts/0.16-0.17/DeltaScripts/workFlow_schema_delta.sql b/modules/release-migration-scripts/0.16-0.17/DeltaScripts/workFlow_schema_delta.sql
deleted file mode 100644
index 42367f57165..00000000000
--- a/modules/release-migration-scripts/0.16-0.17/DeltaScripts/workFlow_schema_delta.sql
+++ /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.
---
-
-# Will migrate 0.16 DataBase schema to 0.17 Database Schema
-
-# No Migration needed, schema's are identical
diff --git a/modules/release-migration-scripts/0.16-0.17/keycloak-migration-replica-catalog/replicaCatalog_lowercase_user_data_dir_example.sql b/modules/release-migration-scripts/0.16-0.17/keycloak-migration-replica-catalog/replicaCatalog_lowercase_user_data_dir_example.sql
deleted file mode 100644
index 3ff6ddaf97a..00000000000
--- a/modules/release-migration-scripts/0.16-0.17/keycloak-migration-replica-catalog/replicaCatalog_lowercase_user_data_dir_example.sql
+++ /dev/null
@@ -1,38 +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.
---
-
--- user_data_dir is the path to the gateway's data storage directory
-set @user_data_dir = '/var/www/user_data/';
-set @storage_id = '149.165.156.11_b5f26430-14d5-4372-8a7e-39b125aa640b';
-update DATA_REPLICA_LOCATION
-inner join (
-    select
-        REPLICA_ID,
-        FILE_PATH,
-        SUBSTR(FILE_PATH,
-            LOCATE(@user_data_dir, FILE_PATH) + LENGTH(@user_data_dir),
-            LOCATE('/', FILE_PATH, LOCATE(@user_data_dir, FILE_PATH) + LENGTH(@user_data_dir))
-            - (LOCATE(@user_data_dir, FILE_PATH) + LENGTH(@user_data_dir))
-        ) USERNAME
-    from DATA_REPLICA_LOCATION where STORAGE_RESOURCE_ID = @storage_id
-    and FILE_PATH like concat('%', @user_data_dir, '%')
-) a
-on a.REPLICA_ID = DATA_REPLICA_LOCATION.REPLICA_ID
-set DATA_REPLICA_LOCATION.FILE_PATH = REPLACE(DATA_REPLICA_LOCATION.FILE_PATH, concat(@user_data_dir, a.USERNAME), concat(@user_data_dir, LOWER(a.USERNAME)));
\ No newline at end of file
diff --git a/modules/release-migration-scripts/0.16-0.17/keycloak-migration/credentialStore_keycloak_migration.sql b/modules/release-migration-scripts/0.16-0.17/keycloak-migration/credentialStore_keycloak_migration.sql
deleted file mode 100644
index 081901b9920..00000000000
--- a/modules/release-migration-scripts/0.16-0.17/keycloak-migration/credentialStore_keycloak_migration.sql
+++ /dev/null
@@ -1,22 +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.
---
-
--- credential store
-update CREDENTIALS set PORTAL_USER_ID = lower(PORTAL_USER_ID);
\ No newline at end of file
diff --git a/modules/release-migration-scripts/0.16-0.17/keycloak-migration/expCatalog_keycloak_migration.sql b/modules/release-migration-scripts/0.16-0.17/keycloak-migration/expCatalog_keycloak_migration.sql
deleted file mode 100644
index e3f61364753..00000000000
--- a/modules/release-migration-scripts/0.16-0.17/keycloak-migration/expCatalog_keycloak_migration.sql
+++ /dev/null
@@ -1,31 +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.
---
-
--- experiment catalog
---- disable foreign key checks
-SET FOREIGN_KEY_CHECKS=0;
-update GATEWAY set REQUESTER_USERNAME = lower(REQUESTER_USERNAME);
-update USERS set AIRAVATA_INTERNAL_USER_ID = lower(AIRAVATA_INTERNAL_USER_ID), USER_NAME = lower(USER_NAME);
-update GATEWAY_WORKER set USER_NAME = lower(USER_NAME);
-update PROJECT set USER_NAME = lower(USER_NAME);
-update PROJECT_USER set USER_NAME = lower(USER_NAME);
-update EXPERIMENT set USER_NAME = lower(USER_NAME);
-update PROCESS set USERNAME = lower(USERNAME);
-SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
diff --git a/modules/release-migration-scripts/0.16-0.17/keycloak-migration/profileService_keycloak_migration.sql b/modules/release-migration-scripts/0.16-0.17/keycloak-migration/profileService_keycloak_migration.sql
deleted file mode 100644
index 15c8bdaf699..00000000000
--- a/modules/release-migration-scripts/0.16-0.17/keycloak-migration/profileService_keycloak_migration.sql
+++ /dev/null
@@ -1,28 +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.
---
-
--- profile service
---- disable foreign key checks in MySQL/MariaDB
-SET FOREIGN_KEY_CHECKS=0;
-update GATEWAY set REQUESTER_USERNAME = lower(REQUESTER_USERNAME);
-update USER_PROFILE set AIRAVATA_INTERNAL_USER_ID = lower(AIRAVATA_INTERNAL_USER_ID), USER_ID = lower(USER_ID);
-update USER_PROFILE_EMAIL set AIRAVATA_INTERNAL_USER_ID = lower(AIRAVATA_INTERNAL_USER_ID);
-update USER_PROFILE_PHONE set AIRAVATA_INTERNAL_USER_ID = lower(AIRAVATA_INTERNAL_USER_ID);
-SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
diff --git a/modules/release-migration-scripts/0.16-0.17/keycloak-migration/sharingCatalog_keycloak_migration.sql b/modules/release-migration-scripts/0.16-0.17/keycloak-migration/sharingCatalog_keycloak_migration.sql
deleted file mode 100644
index 3fee1c207bf..00000000000
--- a/modules/release-migration-scripts/0.16-0.17/keycloak-migration/sharingCatalog_keycloak_migration.sql
+++ /dev/null
@@ -1,28 +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.
---
-
--- sharing catalog
---- disable foreign key checks in MySQL/MariaDB
-SET FOREIGN_KEY_CHECKS=0;
-update SHARING_USER set USER_ID = lower(USER_ID), USER_NAME = lower(USER_NAME);
-update USER_GROUP set OWNER_ID = lower(OWNER_ID), GROUP_ID = lower(GROUP_ID);
-update ENTITY set OWNER_ID = lower(OWNER_ID);
-update SHARING set GROUP_ID = lower(GROUP_ID);
-SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
diff --git a/modules/release-migration-scripts/0.16-0.17/migration-notes.md b/modules/release-migration-scripts/0.16-0.17/migration-notes.md
deleted file mode 100644
index 18422e2e893..00000000000
--- a/modules/release-migration-scripts/0.16-0.17/migration-notes.md
+++ /dev/null
@@ -1,17 +0,0 @@
-## 0.16 - 0.17 Migration Notes
- 
- ### Known Issues:
-  
-  * Experiment catalog - _NOTIFICATION_ and _USER_ table's column ordering differs, apart from this difference all other constraints are met 
- 
- ### Migration Steps:
- 
-  * Execute the SQL scripts present in DeltaScripts folder on top of Airavata 0.16 Release Database
-  * dev_sharingcatalog and dev_grouper database schema's are not present in Airavata 0.16 Release, hence whole database has to be migrated, therefore not delta scripts are generated.
-  * There is no migration script for the new profile_service database
-  * Run the WSO2 IS -> Keycloak+Profile Service migration script. See MigrationManager.java in the user-profile-migration module.
-  * Keycloak only allows lowercase usernames. So all usernames in the database must be lowercased. 
-  Run the scripts in the keycloak-migration folder to lowercase usernames.
-  * For each gateway in gateway data storage, run the replicaCatalog_lowercase_user_data_dir_example.sql
-  script in the keycloak-migration-replica-catalog directory. **NOTE**: you'll need to tweak the variables
-  at the start of the script for a particular deployment.
diff --git a/modules/release-migration-scripts/0.17-0.18/DeltaScripts/expCatalog_schema_delta.sql b/modules/release-migration-scripts/0.17-0.18/DeltaScripts/expCatalog_schema_delta.sql
deleted file mode 100644
index f950a97f56a..00000000000
--- a/modules/release-migration-scripts/0.17-0.18/DeltaScripts/expCatalog_schema_delta.sql
+++ /dev/null
@@ -1,34 +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.
---
-
-use experiment_catalog;
-
-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 NOW(),
-  PRIMARY KEY (PROCESS_ID, WORKFLOW_ID),
-  FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-ALTER TABLE `TASK` ADD `MAX_RETRY` int(11) NOT NULL DEFAULT '3';
-ALTER TABLE `TASK` ADD `CURRENT_RETRY` int(11) NOT NULL DEFAULT '0';
diff --git a/modules/release-migration-scripts/0.17-0.18/DeltaScripts/profile_service_schema_delta.sql b/modules/release-migration-scripts/0.17-0.18/DeltaScripts/profile_service_schema_delta.sql
deleted file mode 100644
index 86b0438e7ae..00000000000
--- a/modules/release-migration-scripts/0.17-0.18/DeltaScripts/profile_service_schema_delta.sql
+++ /dev/null
@@ -1,53 +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.
---
-
-use profile_service;
-
-CREATE TABLE IF NOT EXISTS `CUSTOMIZED_DASHBOARD` (
- `AIRAVATA_INTERNAL_USER_ID` varchar(255) NOT NULL,
- `ENABLED_APPLICATION` varchar(255) DEFAULT NULL,
- `ENABLED_COMPUTE_RESOURCE` varchar(255) DEFAULT NULL,
- `ENABLED_CPU_COUNT` varchar(255) DEFAULT NULL,
- `ENABLED_CREATION_TIME` varchar(255) DEFAULT NULL,
- `ENABLED_DESCRIPTION` varchar(255) DEFAULT NULL,
- `ENABLED_ERRORS` varchar(255) DEFAULT NULL,
- `ENABLED_EXPERIMENT_ID` varchar(255) DEFAULT NULL,
- `ENABLED_INPUTS` varchar(255) DEFAULT NULL,
- `ENABLED_JOB_CREATION_TIME` varchar(255) DEFAULT NULL,
- `ENABLED_JOB_DESCRIPTION` varchar(255) DEFAULT NULL,
- `ENABLED_JOB_ID` varchar(255) DEFAULT NULL,
- `ENABLED_JOB_NAME` varchar(255) DEFAULT NULL,
- `ENABLED_JOB_STATUS` varchar(255) DEFAULT NULL,
- `ENABLED_LAST_MODIFIED_TIME` varchar(255) DEFAULT NULL,
- `ENABLED_NAME` varchar(255) DEFAULT NULL,
- `ENABLED_NODE_COUNT` varchar(255) DEFAULT NULL,
- `ENABLED_NOTIFICATIONS_TO` varchar(255) DEFAULT NULL,
- `ENABLED_OUTPUTS` varchar(255) DEFAULT NULL,
- `ENABLED_OWNER` varchar(255) DEFAULT NULL,
- `ENABLED_PROJECT` varchar(255) DEFAULT NULL,
- `ENABLED_QUEUE` varchar(255) DEFAULT NULL,
- `ENABLED_STORAGE_DIR` varchar(255) DEFAULT NULL,
- `ENABLED_WALL_TIME` varchar(255) DEFAULT NULL,
- `ENABLED_WORKING_DIR` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`AIRAVATA_INTERNAL_USER_ID`),
- CONSTRAINT `CUSTOMIZED_DASHBOARD_ibfk_1` FOREIGN KEY (`AIRAVATA_INTERNAL_USER_ID`) REFERENCES `USER_PROFILE` (`AIRAVATA_INTERNAL_USER_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-alter database profile_service character set = 'latin1';
diff --git a/modules/release-migration-scripts/0.17-0.18/DeltaScripts/sharingCatalog_schema_delta.sql b/modules/release-migration-scripts/0.17-0.18/DeltaScripts/sharingCatalog_schema_delta.sql
deleted file mode 100644
index 59b010a6b8b..00000000000
--- a/modules/release-migration-scripts/0.17-0.18/DeltaScripts/sharingCatalog_schema_delta.sql
+++ /dev/null
@@ -1,28 +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.
---
-
-use sharing_catalog;
-
-CREATE TABLE IF NOT EXISTS `GROUP_ADMIN` (
- `ADMIN_ID` varchar(255) NOT NULL,
- `DOMAIN_ID` varchar(255) NOT NULL,
- `GROUP_ID` varchar(255) NOT NULL,
- PRIMARY KEY (`ADMIN_ID`,`DOMAIN_ID`,`GROUP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
diff --git a/modules/release-migration-scripts/0.18-0.19/DeltaScripts/appCatalog_schema_delta.sql b/modules/release-migration-scripts/0.18-0.19/DeltaScripts/appCatalog_schema_delta.sql
deleted file mode 100644
index 846109af450..00000000000
--- a/modules/release-migration-scripts/0.18-0.19/DeltaScripts/appCatalog_schema_delta.sql
+++ /dev/null
@@ -1,513 +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.
---
-
-use app_catalog;
-
--- AIRAVATA-2938: bring database schema into sync with registry-refactoring DB init scripts
--- first, change the db table engine of these tables to InnoDB to allow new tables to FK to them
-ALTER TABLE `JOB_MANAGER_COMMAND` ENGINE = InnoDB;
-ALTER TABLE `HOST_IPADDRESS` ENGINE = InnoDB;
-ALTER TABLE `GSISSH_SUBMISSION` ENGINE = InnoDB;
-ALTER TABLE `HOST_ALIAS` ENGINE = InnoDB;
-ALTER TABLE `JOB_SUBMISSION_INTERFACE` ENGINE = InnoDB;
-ALTER TABLE `LIBRARY_PREPAND_PATH` ENGINE = InnoDB;
-ALTER TABLE `LOCAL_SUBMISSION` ENGINE = InnoDB;
--- ALTER TABLE `DATA_STORAGE_PREFERENCE` ENGINE = InnoDB;
-ALTER TABLE `COMPUTE_RESOURCE` ENGINE = InnoDB;
-ALTER TABLE `COMPUTE_RESOURCE_FILE_SYSTEM` ENGINE = InnoDB;
-ALTER TABLE `LIBRARY_APEND_PATH` ENGINE = InnoDB;
-ALTER TABLE `GSISSH_EXPORT` ENGINE = InnoDB;
-ALTER TABLE `GLOBUS_GK_ENDPOINT` ENGINE = InnoDB;
-ALTER TABLE `GATEWAY_PROFILE` ENGINE = InnoDB;
-ALTER TABLE `CONFIGURATION` ENGINE = InnoDB;
-ALTER TABLE `DATA_MOVEMENT_INTERFACE` ENGINE = InnoDB;
-ALTER TABLE `GLOBUS_SUBMISSION` ENGINE = InnoDB;
-ALTER TABLE `GRIDFTP_DATA_MOVEMENT` ENGINE = InnoDB;
-ALTER TABLE `GSISSH_POSTJOBCOMMAND` ENGINE = InnoDB;
-ALTER TABLE `POSTJOB_COMMAND` ENGINE = InnoDB;
-ALTER TABLE `GRIDFTP_ENDPOINT` ENGINE = InnoDB;
-ALTER TABLE `COMPUTE_RESOURCE_PREFERENCE` ENGINE = InnoDB;
-ALTER TABLE `GSISSH_PREJOBCOMMAND` ENGINE = InnoDB;
-ALTER TABLE `LOCAL_DATA_MOVEMENT` ENGINE = InnoDB;
-ALTER TABLE `APPLICATION_INPUT` ENGINE = InnoDB;
-ALTER TABLE `APP_ENVIRONMENT` ENGINE = InnoDB;
-ALTER TABLE `APP_MODULE_MAPPING` ENGINE = InnoDB;
-ALTER TABLE `APPLICATION_OUTPUT` ENGINE = InnoDB;
-ALTER TABLE `APPLICATION_MODULE` ENGINE = InnoDB;
-ALTER TABLE `UNICORE_DATAMOVEMENT` ENGINE = InnoDB;
-ALTER TABLE `APPLICATION_INTERFACE` ENGINE = InnoDB;
-ALTER TABLE `UNICORE_SUBMISSION` ENGINE = InnoDB;
--- ALTER TABLE `WORKFLOW_INPUT` ENGINE = InnoDB;
--- ALTER TABLE `WORKFLOW` ENGINE = InnoDB;
-ALTER TABLE `SSH_JOB_SUBMISSION` ENGINE = InnoDB;
--- ALTER TABLE `WORKFLOW_OUTPUT` ENGINE = InnoDB;
-ALTER TABLE `APPLICATION_DEPLOYMENT` ENGINE = InnoDB;
-ALTER TABLE `RESOURCE_JOB_MANAGER` ENGINE = InnoDB;
-ALTER TABLE `PREJOB_COMMAND` ENGINE = InnoDB;
-ALTER TABLE `SCP_DATA_MOVEMENT` ENGINE = InnoDB;
-ALTER TABLE `BATCH_QUEUE` ENGINE = InnoDB;
-
--- new tables
-CREATE TABLE IF NOT EXISTS `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`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT exists `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`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS `GROUP_RESOURCE_PROFILE` (
-  `GROUP_RESOURCE_PROFILE_ID` varchar(255) NOT NULL,
-  `CREATION_TIME` bigint(20) NOT NULL,
-  `GATEWAY_ID` varchar(255) NOT NULL,
-  `GROUP_RESOURCE_PROFILE_NAME` varchar(255) DEFAULT NULL,
-  `UPDATE_TIME` bigint(20) NOT NULL,
-  `DEFAULT_CREDENTIAL_STORE_TOKEN` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`GROUP_RESOURCE_PROFILE_ID`),
-  UNIQUE KEY `GATEWAY_ID` (`GATEWAY_ID`,`GROUP_RESOURCE_PROFILE_NAME`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS `GROUP_COMPUTE_RESOURCE_PREFERENCE` (
-  `RESOURCE_ID` varchar(255) NOT NULL,
-  `GROUP_RESOURCE_PROFILE_ID` varchar(255) NOT NULL,
-  `ALLOCATION_PROJECT_NUMBER` varchar(255) DEFAULT NULL,
-  `LOGIN_USERNAME` varchar(255) DEFAULT NULL,
-  `OVERRIDE_BY_AIRAVATA` smallint(6) DEFAULT NULL,
-  `PREFERED_BATCH_QUEUE` varchar(255) DEFAULT NULL,
-  `PREFERED_DATA_MOVE_PROTOCOL` varchar(255) DEFAULT NULL,
-  `PREFERED_JOB_SUB_PROTOCOL` varchar(255) DEFAULT NULL,
-  `QUALITY_OF_SERVICE` varchar(255) DEFAULT NULL,
-  `RESERVATION` varchar(255) DEFAULT NULL,
-  `RESERVATION_END_TIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `RESERVATION_START_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `RESOURCE_CS_TOKEN` varchar(255) DEFAULT NULL,
-  `SCRATCH_LOCATION` varchar(255) DEFAULT NULL,
-  `SSH_ACCOUNT_PROVISIONER` varchar(255) DEFAULT NULL,
-  `SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO` varchar(1000) DEFAULT NULL,
-  `USAGE_REPORTING_GATEWAY_ID` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`RESOURCE_ID`,`GROUP_RESOURCE_PROFILE_ID`),
-  KEY `GROUP_RESOURCE_PROFILE_ID` (`GROUP_RESOURCE_PROFILE_ID`),
-  CONSTRAINT `GROUP_COMPUTE_RESOURCE_PREFERENCE_ibfk_1` FOREIGN KEY (`RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE,
-  CONSTRAINT `GROUP_COMPUTE_RESOURCE_PREFERENCE_ibfk_2` FOREIGN KEY (`GROUP_RESOURCE_PROFILE_ID`) REFERENCES `GROUP_RESOURCE_PROFILE` (`GROUP_RESOURCE_PROFILE_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS `GATEWAY_GROUPS` (
-  `GATEWAY_ID` varchar(255) NOT NULL,
-  `ADMINS_GROUP_ID` varchar(255) DEFAULT NULL,
-  `DEFAULT_GATEWAY_USERS_GROUP_ID` varchar(255) DEFAULT NULL,
-  `READ_ONLY_ADMINS_GROUP_ID` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`GATEWAY_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS `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,
-  `MAX_ALLOWED_CORES` int(11) DEFAULT NULL,
-  `MAX_ALLOWED_NODES` int(11) DEFAULT NULL,
-  `MAX_ALLOWED_WALLTIME` int(11) DEFAULT NULL,
-  `QUEUE_NAME` varchar(255) NOT NULL,
-  PRIMARY KEY (`RESOURCE_POLICY_ID`),
-  KEY `COMPUTE_RESOURCE_ID` (`COMPUTE_RESOURCE_ID`),
-  KEY `GROUP_RESOURCE_PROFILE_ID` (`GROUP_RESOURCE_PROFILE_ID`),
-  CONSTRAINT `BATCH_QUEUE_RESOURCE_POLICY_ibfk_1` FOREIGN KEY (`COMPUTE_RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE,
-  CONSTRAINT `BATCH_QUEUE_RESOURCE_POLICY_ibfk_2` FOREIGN KEY (`GROUP_RESOURCE_PROFILE_ID`) REFERENCES `GROUP_RESOURCE_PROFILE` (`GROUP_RESOURCE_PROFILE_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS `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`),
-  KEY `PARENT_PARSER_ID` (`PARENT_PARSER_ID`),
-  KEY `CHILD_PARSER_ID` (`CHILD_PARSER_ID`),
-  KEY `PARSING_TEMPLATE_ID` (`PARSING_TEMPLATE_ID`),
-  CONSTRAINT `PARSER_CONNECTOR_ibfk_1` FOREIGN KEY (`PARENT_PARSER_ID`) REFERENCES `PARSER` (`PARSER_ID`) ON DELETE CASCADE,
-  CONSTRAINT `PARSER_CONNECTOR_ibfk_2` FOREIGN KEY (`CHILD_PARSER_ID`) REFERENCES `PARSER` (`PARSER_ID`) ON DELETE CASCADE,
-  CONSTRAINT `PARSER_CONNECTOR_ibfk_3` FOREIGN KEY (`PARSING_TEMPLATE_ID`) REFERENCES `PARSING_TEMPLATE` (`PARSING_TEMPLATE_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS `PARSER_OUTPUT` (
-  `PARSER_OUTPUT_ID` varchar(255) NOT NULL,
-  `PARSER_OUTPUT_NAME` varchar(255) NOT NULL,
-  `PARSER_OUTPUT_REQUIRED` tinyint(1) NOT NULL,
-  `PARSER_ID` varchar(255) NOT NULL,
-  `OUTPUT_TYPE` varchar(255) NOT NULL,
-  PRIMARY KEY (`PARSER_OUTPUT_ID`),
-  KEY `PARSER_ID` (`PARSER_ID`),
-  CONSTRAINT `PARSER_OUTPUT_ibfk_1` FOREIGN KEY (`PARSER_ID`) REFERENCES `PARSER` (`PARSER_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS `PARSER_INPUT` (
-  `PARSER_INPUT_ID` varchar(255) NOT NULL,
-  `PARSER_INPUT_NAME` varchar(255) NOT NULL,
-  `PARSER_INPUT_REQUIRED` tinyint(1) NOT NULL,
-  `PARSER_ID` varchar(255) NOT NULL,
-  `INPUT_TYPE` varchar(255) NOT NULL,
-  PRIMARY KEY (`PARSER_INPUT_ID`),
-  KEY `PARSER_ID` (`PARSER_ID`),
-  CONSTRAINT `PARSER_INPUT_ibfk_1` FOREIGN KEY (`PARSER_ID`) REFERENCES `PARSER` (`PARSER_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS `PARSING_TEMPLATE_INPUT` (
-  `PARSING_TEMPLATE_INPUT_ID` varchar(255) NOT NULL,
-  `TARGET_PARSER_INPUT_ID` varchar(255) NOT NULL,
-  `APPLICATION_OUTPUT_NAME` varchar(255) DEFAULT NULL,
-  `VALUE` varchar(255) DEFAULT NULL,
-  `PARSING_TEMPLATE_ID` varchar(255) NOT NULL,
-  PRIMARY KEY (`PARSING_TEMPLATE_INPUT_ID`),
-  KEY `PARSING_TEMPLATE_ID` (`PARSING_TEMPLATE_ID`),
-  KEY `TARGET_PARSER_INPUT_ID` (`TARGET_PARSER_INPUT_ID`),
-  CONSTRAINT `PARSING_TEMPLATE_INPUT_ibfk_1` FOREIGN KEY (`TARGET_PARSER_INPUT_ID`) REFERENCES `PARSER_INPUT` (`PARSER_INPUT_ID`) ON DELETE CASCADE,
-  CONSTRAINT `PARSING_TEMPLATE_INPUT_ibfk_2` FOREIGN KEY (`PARSING_TEMPLATE_ID`) REFERENCES `PARSING_TEMPLATE` (`PARSING_TEMPLATE_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS `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`),
-  KEY `COMPUTE_RESOURCE_ID` (`COMPUTE_RESOURCE_ID`),
-  KEY `GROUP_RESOURCE_PROFILE_ID` (`GROUP_RESOURCE_PROFILE_ID`),
-  CONSTRAINT `COMPUTE_RESOURCE_POLICY_ibfk_1` FOREIGN KEY (`COMPUTE_RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE,
-  CONSTRAINT `COMPUTE_RESOURCE_POLICY_ibfk_2` FOREIGN KEY (`GROUP_RESOURCE_PROFILE_ID`) REFERENCES `GROUP_RESOURCE_PROFILE` (`GROUP_RESOURCE_PROFILE_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS `PARSER_CONNECTOR_INPUT` (
-  `PARSER_CONNECTOR_INPUT_ID` varchar(255) NOT NULL,
-  `PARSER_INPUT_ID` varchar(255) NOT NULL,
-  `PARSER_OUTPUT_ID` varchar(255) DEFAULT NULL,
-  `VALUE` varchar(255) DEFAULT NULL,
-  `PARSER_CONNECTOR_ID` varchar(255) NOT NULL,
-  PRIMARY KEY (`PARSER_CONNECTOR_INPUT_ID`),
-  KEY `PARSER_INPUT_ID` (`PARSER_INPUT_ID`),
-  KEY `PARSER_OUTPUT_ID` (`PARSER_OUTPUT_ID`),
-  KEY `PARSER_CONNECTOR_ID` (`PARSER_CONNECTOR_ID`),
-  CONSTRAINT `PARSER_CONNECTOR_INPUT_ibfk_1` FOREIGN KEY (`PARSER_INPUT_ID`) REFERENCES `PARSER_INPUT` (`PARSER_INPUT_ID`) ON DELETE CASCADE,
-  CONSTRAINT `PARSER_CONNECTOR_INPUT_ibfk_2` FOREIGN KEY (`PARSER_OUTPUT_ID`) REFERENCES `PARSER_OUTPUT` (`PARSER_OUTPUT_ID`) ON DELETE CASCADE,
-  CONSTRAINT `PARSER_CONNECTOR_INPUT_ibfk_3` FOREIGN KEY (`PARSER_CONNECTOR_ID`) REFERENCES `PARSER_CONNECTOR` (`PARSER_CONNECTOR_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS `GRP_SSH_ACC_PROV_CONFIG` (
-  `CONFIG_NAME` varchar(255) NOT NULL,
-  `GROUP_RESOURCE_PROFILE_ID` varchar(255) NOT NULL,
-  `RESOURCE_ID` varchar(255) NOT NULL,
-  `CONFIG_VALUE` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`CONFIG_NAME`,`GROUP_RESOURCE_PROFILE_ID`,`RESOURCE_ID`),
-  KEY `RESOURCE_ID` (`RESOURCE_ID`,`GROUP_RESOURCE_PROFILE_ID`),
-  CONSTRAINT `GRP_SSH_ACC_PROV_CONFIG_ibfk_1` FOREIGN KEY (`RESOURCE_ID`, `GROUP_RESOURCE_PROFILE_ID`) REFERENCES `GROUP_COMPUTE_RESOURCE_PREFERENCE` (`RESOURCE_ID`, `GROUP_RESOURCE_PROFILE_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE IF NOT EXISTS `COMPUTE_RESOURCE_POLICY_QUEUES` (
-  `RESOURCE_POLICY_ID` varchar(255) NOT NULL,
-  `QUEUE_NAME` varchar(255) NOT NULL,
-  PRIMARY KEY (`RESOURCE_POLICY_ID`,`QUEUE_NAME`),
-  CONSTRAINT `COMPUTE_RESOURCE_POLICY_QUEUES_ibfk_1` FOREIGN KEY (`RESOURCE_POLICY_ID`) REFERENCES `COMPUTE_RESOURCE_POLICY` (`RESOURCE_POLICY_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-
--- AIRAVATA-2768
-alter table APPLICATION_INPUT modify METADATA VARCHAR(4096);
-
--- AIRAVATA-2758
--- Note: this doesn't really represent a schema change, rather some legacy database instances improperly had created these columns as NOT NULL
-alter table COMPUTE_RESOURCE modify column CREATION_TIME TIMESTAMP DEFAULT NOW() null;
-alter table COMPUTE_RESOURCE modify column CPUS_PER_NODE int default 0 null;
-alter table COMPUTE_RESOURCE modify column DEFAULT_NODE_COUNT int default 0 null;
-alter table COMPUTE_RESOURCE modify column DEFAULT_CPU_COUNT int default 0 null;
-alter table COMPUTE_RESOURCE modify column DEFAULT_WALLTIME int default 0 null;
-alter table COMPUTE_RESOURCE modify column UPDATE_TIME timestamp default '0000-00-00 00:00:00' null;
-
--- AIRAVATA-2827: OpenJPA 2.4.3 upgrade, convert BIT -> TINYINT(1)
-alter table APPLICATION_OUTPUT modify column OUTPUT_STREAMING tinyint(1);
-alter table APPLICATION_INTERFACE modify column ARCHIVE_WORKING_DIRECTORY tinyint(1);
-alter table APPLICATION_INTERFACE modify column HAS_OPTIONAL_FILE_INPUTS tinyint(1);
-alter table APPLICATION_DEPLOYMENT modify column EDITABLE_BY_USER tinyint(1);
-alter table BATCH_QUEUE modify column IS_DEFAULT_QUEUE tinyint(1);
-alter table COMPUTE_RESOURCE modify column GATEWAY_USAGE_REPORTING tinyint(1);
-alter table USER_COMPUTE_RESOURCE_PREFERENCE modify column VALIDATED tinyint(1) default 0;
-
--- AIRAVATA-2872: NOT NULL foreign key columsn
-set FOREIGN_KEY_CHECKS=0;
-alter table HOST_ALIAS modify column RESOURCE_ID VARCHAR(255) NOT NULL;
-alter table HOST_IPADDRESS modify column RESOURCE_ID VARCHAR(255) NOT NULL;
-alter table GSISSH_EXPORT modify column SUBMISSION_ID VARCHAR(255) NOT NULL;
-alter table GSISSH_PREJOBCOMMAND modify column SUBMISSION_ID VARCHAR(255) NOT NULL;
-alter table GSISSH_POSTJOBCOMMAND modify column SUBMISSION_ID VARCHAR(255) NOT NULL;
-alter table GLOBUS_GK_ENDPOINT modify column SUBMISSION_ID VARCHAR(255) NOT NULL;
-alter table APPLICATION_DEPLOYMENT modify column APP_MODULE_ID VARCHAR(255) NOT NULL;
-alter table APPLICATION_DEPLOYMENT modify column COMPUTE_HOSTID VARCHAR(255) NOT NULL;
-alter table PREJOB_COMMAND modify column APPDEPLOYMENT_ID VARCHAR(255) NOT NULL;
-alter table POSTJOB_COMMAND modify column APPDEPLOYMENT_ID VARCHAR(255) NOT NULL;
-alter table LIBRARY_PREPAND_PATH modify column DEPLOYMENT_ID VARCHAR(255) NOT NULL;
-alter table LIBRARY_APEND_PATH modify column DEPLOYMENT_ID VARCHAR(255) NOT NULL;
-alter table APP_ENVIRONMENT modify column DEPLOYMENT_ID VARCHAR(255) NOT NULL;
-alter table APP_MODULE_MAPPING modify column INTERFACE_ID VARCHAR(255) NOT NULL;
-alter table APP_MODULE_MAPPING modify column MODULE_ID VARCHAR(255) NOT NULL;
-alter table APPLICATION_INPUT modify column INTERFACE_ID VARCHAR(255) NOT NULL;
-alter table APPLICATION_OUTPUT modify column INTERFACE_ID VARCHAR(255) NOT NULL;
-alter table COMPUTE_RESOURCE_PREFERENCE modify column GATEWAY_ID VARCHAR(255) NOT NULL;
-alter table COMPUTE_RESOURCE_PREFERENCE modify column RESOURCE_ID VARCHAR(255) NOT NULL;
-alter table SSH_ACCOUNT_PROVISIONER_CONFIG modify column GATEWAY_ID VARCHAR(255) NOT NULL;
-alter table SSH_ACCOUNT_PROVISIONER_CONFIG modify column RESOURCE_ID VARCHAR(255) NOT NULL;
--- alter table DATA_STORAGE_PREFERENCE modify column GATEWAY_ID VARCHAR(255) NOT NULL;
--- alter table WORKFLOW_INPUT modify column WF_TEMPLATE_ID VARCHAR(255) NOT NULL;
--- alter table WORKFLOW_OUTPUT modify column WF_TEMPLATE_ID VARCHAR(255) NOT NULL;
-set FOREIGN_KEY_CHECKS=1;
-
--- AIRAVATA-2872: add missing column
-alter table APP_ENVIRONMENT add column IF NOT EXISTS ENV_ORDER INTEGER;
-
--- AIRAVATA-2939: add NOT NULL constraints to DB fields that aren't in data model
-alter table APPLICATION_MODULE modify column GATEWAY_ID VARCHAR(255) NOT NULL;
-alter table APPLICATION_MODULE modify column CREATION_TIME TIMESTAMP DEFAULT NOW() NOT NULL;
-alter table APPLICATION_MODULE modify column UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' NOT NULL;
-alter table APPLICATION_DEPLOYMENT modify column CREATION_TIME TIMESTAMP DEFAULT NOW() NOT NULL;
-alter table APPLICATION_DEPLOYMENT modify column UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' NOT NULL;
-alter table APPLICATION_DEPLOYMENT modify column GATEWAY_ID VARCHAR(255) NOT NULL;
-alter table APPLICATION_INTERFACE modify column GATEWAY_ID VARCHAR(255) NOT NULL;
-alter table APPLICATION_INTERFACE modify column CREATION_TIME TIMESTAMP DEFAULT NOW() NOT NULL;
-alter table APPLICATION_INTERFACE modify column UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' NOT NULL;
-
--- AIRAVATA-2938: bring database schema into sync with registry-refactoring DB init scripts
-
--- Some of these column changes involve FK columns so need to temporarily turn off FK checks
-set FOREIGN_KEY_CHECKS=0;
-ALTER TABLE `GROUP_COMPUTE_RESOURCE_PREFERENCE` CHANGE `RESERVATION_END_TIME` `RESERVATION_END_TIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00';
-ALTER TABLE `GROUP_COMPUTE_RESOURCE_PREFERENCE` CHANGE `PREFERED_JOB_SUB_PROTOCOL` `PREFERED_JOB_SUB_PROTOCOL` varchar(255) DEFAULT NULL;
-ALTER TABLE `GROUP_COMPUTE_RESOURCE_PREFERENCE` CHANGE `PREFERED_DATA_MOVE_PROTOCOL` `PREFERED_DATA_MOVE_PROTOCOL` varchar(255) DEFAULT NULL;
-ALTER TABLE `GROUP_COMPUTE_RESOURCE_PREFERENCE` CHANGE `RESERVATION_START_TIME` `RESERVATION_START_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
-
-ALTER TABLE `STORAGE_INTERFACE` CHANGE `CREATION_TIME` `CREATION_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP;
-ALTER TABLE `STORAGE_INTERFACE` CHANGE `DATA_MOVEMENT_PROTOCOL` `DATA_MOVEMENT_PROTOCOL` varchar(255) NOT NULL;
-ALTER TABLE `STORAGE_INTERFACE` CHANGE `UPDATE_TIME` `UPDATE_TIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00';
-
-ALTER TABLE `LOCAL_SUBMISSION` CHANGE `SECURITY_PROTOCOL` `SECURITY_PROTOCOL` varchar(255) NOT NULL;
-
-ALTER TABLE `PARSER` CHANGE `GATEWAY_ID` `GATEWAY_ID` varchar(255) NOT NULL;
-ALTER TABLE `PARSER` DROP IF EXISTS `PARSER_INFO_ID`;
-
-ALTER TABLE `PARSING_TEMPLATE` CHANGE `GATEWAY_ID` `GATEWAY_ID` varchar(255) NOT NULL;
-
-ALTER TABLE `GROUP_RESOURCE_PROFILE` CHANGE `UPDATE_TIME` `UPDATE_TIME` bigint(20) NOT NULL;
-ALTER TABLE `GROUP_RESOURCE_PROFILE` CHANGE `GATEWAY_ID` `GATEWAY_ID` varchar(255) NOT NULL;
-ALTER TABLE `GROUP_RESOURCE_PROFILE` CHANGE `CREATION_TIME` `CREATION_TIME` bigint(20) NOT NULL;
-
-ALTER TABLE `PARSING_TEMPLATE_INPUT` CHANGE `TARGET_PARSER_INPUT_ID` `TARGET_PARSER_INPUT_ID` varchar(255) NOT NULL;
-
-ALTER TABLE `GROUP_COMPUTE_RESOURCE_PREFERENCE` CHANGE `SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO` `SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO` varchar(1000) DEFAULT NULL;
-
-ALTER TABLE `BATCH_QUEUE` CHANGE `QUEUE_SPECIFIC_MACROS` `QUEUE_SPECIFIC_MACROS` varchar(255) DEFAULT NULL;
-ALTER TABLE `BATCH_QUEUE` CHANGE `DEFAULT_WALLTIME` `DEFAULT_WALLTIME` int(11) DEFAULT NULL;
-
-ALTER TABLE `BATCH_QUEUE_RESOURCE_POLICY` CHANGE `COMPUTE_RESOURCE_ID` `COMPUTE_RESOURCE_ID` varchar(255) NOT NULL;
-ALTER TABLE `BATCH_QUEUE_RESOURCE_POLICY` CHANGE `GROUP_RESOURCE_PROFILE_ID` `GROUP_RESOURCE_PROFILE_ID` varchar(255) NOT NULL;
-ALTER TABLE `BATCH_QUEUE_RESOURCE_POLICY` CHANGE `QUEUE_NAME` `QUEUE_NAME` varchar(255) NOT NULL;
-
-ALTER TABLE `APPLICATION_OUTPUT` CHANGE `OUTPUT_STREAMING` `OUTPUT_STREAMING` smallint(6) DEFAULT NULL;
-
-ALTER TABLE `APPLICATION_INTERFACE` CHANGE `ARCHIVE_WORKING_DIRECTORY` `ARCHIVE_WORKING_DIRECTORY` smallint(6) DEFAULT NULL;
-
-ALTER TABLE `COMPUTE_RESOURCE` CHANGE `CPUS_PER_NODE` `CPUS_PER_NODE` int(11) DEFAULT NULL;
-ALTER TABLE `COMPUTE_RESOURCE` CHANGE `CREATION_TIME` `CREATION_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP;
-ALTER TABLE `COMPUTE_RESOURCE` CHANGE `DEFAULT_NODE_COUNT` `DEFAULT_NODE_COUNT` int(11) DEFAULT NULL;
-ALTER TABLE `COMPUTE_RESOURCE` CHANGE `UPDATE_TIME` `UPDATE_TIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00';
-ALTER TABLE `COMPUTE_RESOURCE` CHANGE `DEFAULT_CPU_COUNT` `DEFAULT_CPU_COUNT` int(11) DEFAULT NULL;
-ALTER TABLE `COMPUTE_RESOURCE` CHANGE `DEFAULT_WALLTIME` `DEFAULT_WALLTIME` int(11) DEFAULT NULL;
-ALTER TABLE `COMPUTE_RESOURCE` CHANGE `GATEWAY_USAGE_MODULE_LOAD_CMD` `GATEWAY_USAGE_MODULE_LOAD_CMD` varchar(500) DEFAULT NULL;
-
-ALTER TABLE `COMPUTE_RESOURCE_POLICY` CHANGE `GROUP_RESOURCE_PROFILE_ID` `GROUP_RESOURCE_PROFILE_ID` varchar(255) NOT NULL;
-ALTER TABLE `COMPUTE_RESOURCE_POLICY` CHANGE `COMPUTE_RESOURCE_ID` `COMPUTE_RESOURCE_ID` varchar(255) NOT NULL;
-
-ALTER TABLE `APPLICATION_INPUT` CHANGE `IS_READ_ONLY` `IS_READ_ONLY` smallint(6) DEFAULT NULL;
-
-ALTER TABLE `COMPUTE_RESOURCE_POLICY_QUEUES` CHANGE `RESOURCE_POLICY_ID` `RESOURCE_POLICY_ID` varchar(255) NOT NULL;
-ALTER TABLE `COMPUTE_RESOURCE_POLICY_QUEUES` CHANGE `QUEUE_NAME` `QUEUE_NAME` varchar(255) NOT NULL;
-
-ALTER TABLE `COMPUTE_RESOURCE_PREFERENCE` CHANGE `SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO` `SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO` varchar(1000) DEFAULT NULL;
-ALTER TABLE `COMPUTE_RESOURCE_PREFERENCE` CHANGE `RESERVATION_START_TIME` `RESERVATION_START_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
-ALTER TABLE `COMPUTE_RESOURCE_PREFERENCE` CHANGE `RESERVATION_END_TIME` `RESERVATION_END_TIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00';
-
-ALTER TABLE `APPLICATION_DEPLOYMENT` CHANGE `DEFAULT_WALLTIME` `DEFAULT_WALLTIME` int(11) DEFAULT NULL;
-ALTER TABLE `APPLICATION_DEPLOYMENT` CHANGE `DEFAULT_CPU_COUNT` `DEFAULT_CPU_COUNT` int(11) DEFAULT NULL;
-ALTER TABLE `APPLICATION_DEPLOYMENT` CHANGE `DEFAULT_NODE_COUNT` `DEFAULT_NODE_COUNT` int(11) DEFAULT NULL;
-set FOREIGN_KEY_CHECKS=1;
-
-ALTER TABLE `GATEWAY_PROFILE` DROP IF EXISTS `DATA_STORAGE_HOST`;
-
--- This table was accidentally created by DB init script, but entity was mapped to STORAGE_PREFERENCE
-DROP TABLE IF EXISTS `DATA_STORAGE_PREFERENCE`;
-
--- DROP TABLE IF EXISTS `WORKFLOW`, `WORKFLOW_INPUT`, `WORKFLOW_OUTPUT`;
-
--- keys indexes
-ALTER TABLE `BATCH_QUEUE_RESOURCE_POLICY` ADD KEY IF NOT EXISTS `COMPUTE_RESOURCE_ID` (`COMPUTE_RESOURCE_ID`);
-ALTER TABLE `BATCH_QUEUE_RESOURCE_POLICY` ADD KEY IF NOT EXISTS `GROUP_RESOURCE_PROFILE_ID` (`GROUP_RESOURCE_PROFILE_ID`);
-ALTER TABLE `BATCH_QUEUE_RESOURCE_POLICY` DROP INDEX IF EXISTS `I_BTCHLCY_GROUPRESOURCEPROFILE`;
-ALTER TABLE `COMPUTE_RESOURCE_POLICY_QUEUES` ADD PRIMARY KEY IF NOT EXISTS (`RESOURCE_POLICY_ID`,`QUEUE_NAME`);
-ALTER TABLE `COMPUTE_RESOURCE_POLICY_QUEUES` DROP INDEX IF EXISTS `I_CMPT_QS_RESOURCE_POLICY_ID`;
-ALTER TABLE `COMPUTE_RESOURCE_POLICY` ADD KEY IF NOT EXISTS `COMPUTE_RESOURCE_ID` (`COMPUTE_RESOURCE_ID`);
-ALTER TABLE `COMPUTE_RESOURCE_POLICY` ADD KEY IF NOT EXISTS `GROUP_RESOURCE_PROFILE_ID` (`GROUP_RESOURCE_PROFILE_ID`);
-ALTER TABLE `COMPUTE_RESOURCE_POLICY` DROP INDEX IF EXISTS `I_CMPTLCY_GROUPRESOURCEPROFILE`;
-ALTER TABLE `GROUP_COMPUTE_RESOURCE_PREFERENCE` ADD KEY IF NOT EXISTS `GROUP_RESOURCE_PROFILE_ID` (`GROUP_RESOURCE_PROFILE_ID`);
-ALTER TABLE `GROUP_RESOURCE_PROFILE` ADD UNIQUE KEY IF NOT EXISTS `GATEWAY_ID` (`GATEWAY_ID`,`GROUP_RESOURCE_PROFILE_NAME`);
-ALTER TABLE `GRP_SSH_ACC_PROV_CONFIG` ADD KEY IF NOT EXISTS `RESOURCE_ID` (`RESOURCE_ID`,`GROUP_RESOURCE_PROFILE_ID`);
-ALTER TABLE `GRP_SSH_ACC_PROV_CONFIG` DROP INDEX IF EXISTS `CONFIG_NAME`;
-ALTER TABLE `PARALLELISM_COMMAND` ADD PRIMARY KEY IF NOT EXISTS (`RESOURCE_JOB_MANAGER_ID`,`COMMAND_TYPE`);
-ALTER TABLE `PARALLELISM_COMMAND` DROP INDEX IF EXISTS `COMMAND_TYPE`;
-ALTER TABLE `PARSING_TEMPLATE_INPUT` ADD KEY IF NOT EXISTS `TARGET_PARSER_INPUT_ID` (`TARGET_PARSER_INPUT_ID`);
-ALTER TABLE `PARSING_TEMPLATE_INPUT` DROP INDEX IF EXISTS `PARSER_INPUT_ID`;
-ALTER TABLE `POSTJOB_COMMAND` ADD PRIMARY KEY IF NOT EXISTS (`APPDEPLOYMENT_ID`,`COMMAND`);
-ALTER TABLE `POSTJOB_COMMAND` DROP INDEX IF EXISTS `COMMAND`;
-ALTER TABLE `SSH_ACCOUNT_PROVISIONER_CONFIG` ADD PRIMARY KEY IF NOT EXISTS (`GATEWAY_ID`,`RESOURCE_ID`,`CONFIG_NAME`);
-ALTER TABLE `SSH_ACCOUNT_PROVISIONER_CONFIG` DROP INDEX IF EXISTS `CONFIG_NAME`;
-ALTER TABLE `STORAGE_INTERFACE` ADD PRIMARY KEY IF NOT EXISTS (`STORAGE_RESOURCE_ID`,`DATA_MOVEMENT_INTERFACE_ID`);
-ALTER TABLE `STORAGE_INTERFACE` DROP INDEX IF EXISTS `DATA_MOVEMENT_INTERFACE_ID`;
-
--- Some of these FKs refer to non-existent data. Rather than cleaning up the orphaned data, we'll just turn off FK checks.
-set FOREIGN_KEY_CHECKS=0;
--- create table delete_ids as select DEPLOYMENT_ID from APP_ENVIRONMENT a where NOT EXISTS (select 1 from APPLICATION_DEPLOYMENT where DEPLOYMENT_ID = ae.DEPLOYMENT_ID);
--- delete from APP_ENVIRONMENT where DEPLOYMENT_ID in (select DEPLOYMENT_ID from delete_ids);
-ALTER TABLE `APP_ENVIRONMENT` ADD CONSTRAINT `APP_ENVIRONMENT_ibfk_1` FOREIGN KEY IF NOT EXISTS (`DEPLOYMENT_ID`) REFERENCES `APPLICATION_DEPLOYMENT` (`DEPLOYMENT_ID`) ON DELETE CASCADE;
--- drop table delete_ids;
-
--- create table delete_ids as select INTERFACE_ID from APP_MODULE_MAPPING a where NOT EXISTS (select 1 from APPLICATION_INTERFACE where INTERFACE_ID = a.INTERFACE_ID);
--- delete from APP_MODULE_MAPPING where INTERFACE_ID in (select INTERFACE_ID from delete_ids);
-ALTER TABLE `APP_MODULE_MAPPING` ADD CONSTRAINT `APP_MODULE_MAPPING_ibfk_1` FOREIGN KEY IF NOT EXISTS (`INTERFACE_ID`) REFERENCES `APPLICATION_INTERFACE` (`INTERFACE_ID`) ON DELETE CASCADE;
--- drop table delete_ids;
-
--- create table delete_ids as select MODULE_ID from APP_MODULE_MAPPING a where NOT EXISTS (select 1 from APPLICATION_MODULE where MODULE_ID = a.MODULE_ID);
--- delete from APP_MODULE_MAPPING where MODULE_ID in (select MODULE_ID from delete_ids);
-ALTER TABLE `APP_MODULE_MAPPING` ADD CONSTRAINT `APP_MODULE_MAPPING_ibfk_2` FOREIGN KEY IF NOT EXISTS (`MODULE_ID`) REFERENCES `APPLICATION_MODULE` (`MODULE_ID`) ON DELETE CASCADE;
--- drop table delete_ids;
-
--- create table delete_ids as select COMPUTE_HOSTID from APPLICATION_DEPLOYMENT a where NOT EXISTS (select 1 from COMPUTE_RESOURCE where RESOURCE_ID = a.COMPUTE_HOSTID);
--- delete from APPLICATION_DEPLOYMENT where COMPUTE_HOSTID in (select COMPUTE_HOSTID from delete_ids);
-ALTER TABLE `APPLICATION_DEPLOYMENT` ADD CONSTRAINT `APPLICATION_DEPLOYMENT_ibfk_1` FOREIGN KEY IF NOT EXISTS (`COMPUTE_HOSTID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE;
--- drop table delete_ids;
-
--- create table delete_ids as select APP_MODULE_ID from APPLICATION_DEPLOYMENT a where NOT EXISTS (select 1 from APPLICATION_MODULE where MODULE_ID = a.APP_MODULE_ID);
--- delete from APPLICATION_DEPLOYMENT where APP_MODULE_ID in (select APP_MODULE_ID from delete_ids);
-ALTER TABLE `APPLICATION_DEPLOYMENT` ADD CONSTRAINT `APPLICATION_DEPLOYMENT_ibfk_2` FOREIGN KEY IF NOT EXISTS (`APP_MODULE_ID`) REFERENCES `APPLICATION_MODULE` (`MODULE_ID`) ON DELETE CASCADE;
--- drop table delete_ids;
-
--- create table delete_ids as select INTERFACE_ID from APPLICATION_INPUT a where NOT EXISTS (select 1 from APPLICATION_INTERFACE where INTERFACE_ID = a.INTERFACE_ID);
--- delete from APPLICATION_INPUT where INTERFACE_ID in (select INTERFACE_ID from delete_ids);
-ALTER TABLE `APPLICATION_INPUT` ADD CONSTRAINT `APPLICATION_INPUT_ibfk_1` FOREIGN KEY IF NOT EXISTS(`INTERFACE_ID`) REFERENCES `APPLICATION_INTERFACE` (`INTERFACE_ID`) ON DELETE CASCADE;
--- drop table delete_ids;
-
--- create table delete_ids as select INTERFACE_ID from APPLICATION_OUTPUT a where NOT EXISTS (select 1 from APPLICATION_INTERFACE where INTERFACE_ID = a.INTERFACE_ID);
--- delete from APPLICATION_OUTPUT where INTERFACE_ID in (select INTERFACE_ID from delete_ids);
-ALTER TABLE `APPLICATION_OUTPUT` ADD CONSTRAINT `APPLICATION_OUTPUT_ibfk_1` FOREIGN KEY IF NOT EXISTS(`INTERFACE_ID`) REFERENCES `APPLICATION_INTERFACE` (`INTERFACE_ID`) ON DELETE CASCADE;
--- drop table delete_ids;
-
-ALTER TABLE `BATCH_QUEUE_RESOURCE_POLICY` ADD CONSTRAINT `BATCH_QUEUE_RESOURCE_POLICY_ibfk_1` FOREIGN KEY IF NOT EXISTS(`COMPUTE_RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE;
-ALTER TABLE `BATCH_QUEUE_RESOURCE_POLICY` ADD CONSTRAINT `BATCH_QUEUE_RESOURCE_POLICY_ibfk_2` FOREIGN KEY IF NOT EXISTS(`GROUP_RESOURCE_PROFILE_ID`) REFERENCES `GROUP_RESOURCE_PROFILE` (`GROUP_RESOURCE_PROFILE_ID`) ON DELETE CASCADE;
-ALTER TABLE `BATCH_QUEUE` ADD CONSTRAINT `BATCH_QUEUE_ibfk_1` FOREIGN KEY IF NOT EXISTS(`COMPUTE_RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE;
-ALTER TABLE `COMPUTE_RESOURCE_FILE_SYSTEM` ADD CONSTRAINT `COMPUTE_RESOURCE_FILE_SYSTEM_ibfk_1` FOREIGN KEY IF NOT EXISTS(`COMPUTE_RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE;
-ALTER TABLE `COMPUTE_RESOURCE_POLICY_QUEUES` ADD CONSTRAINT `COMPUTE_RESOURCE_POLICY_QUEUES_ibfk_1` FOREIGN KEY IF NOT EXISTS(`RESOURCE_POLICY_ID`) REFERENCES `COMPUTE_RESOURCE_POLICY` (`RESOURCE_POLICY_ID`) ON DELETE CASCADE;
-ALTER TABLE `COMPUTE_RESOURCE_POLICY` ADD CONSTRAINT `COMPUTE_RESOURCE_POLICY_ibfk_1` FOREIGN KEY IF NOT EXISTS(`COMPUTE_RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE;
-ALTER TABLE `COMPUTE_RESOURCE_POLICY` ADD CONSTRAINT `COMPUTE_RESOURCE_POLICY_ibfk_2` FOREIGN KEY IF NOT EXISTS(`GROUP_RESOURCE_PROFILE_ID`) REFERENCES `GROUP_RESOURCE_PROFILE` (`GROUP_RESOURCE_PROFILE_ID`) ON DELETE CASCADE;
-ALTER TABLE `COMPUTE_RESOURCE_PREFERENCE` ADD CONSTRAINT `COMPUTE_RESOURCE_PREFERENCE_ibfk_1` FOREIGN KEY IF NOT EXISTS(`RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE;
-ALTER TABLE `COMPUTE_RESOURCE_PREFERENCE` ADD CONSTRAINT `COMPUTE_RESOURCE_PREFERENCE_ibfk_2` FOREIGN KEY IF NOT EXISTS(`GATEWAY_ID`) REFERENCES `GATEWAY_PROFILE` (`GATEWAY_ID`) ON DELETE CASCADE;
-ALTER TABLE `DATA_MOVEMENT_INTERFACE` ADD CONSTRAINT `DATA_MOVEMENT_INTERFACE_ibfk_1` FOREIGN KEY IF NOT EXISTS(`COMPUTE_RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE;
-ALTER TABLE `GLOBUS_GK_ENDPOINT` ADD CONSTRAINT `GLOBUS_GK_ENDPOINT_ibfk_1` FOREIGN KEY IF NOT EXISTS(`SUBMISSION_ID`) REFERENCES `GLOBUS_SUBMISSION` (`SUBMISSION_ID`) ON DELETE CASCADE;
-ALTER TABLE `GRIDFTP_ENDPOINT` ADD CONSTRAINT `GRIDFTP_ENDPOINT_ibfk_1` FOREIGN KEY IF NOT EXISTS(`DATA_MOVEMENT_INTERFACE_ID`) REFERENCES `GRIDFTP_DATA_MOVEMENT` (`DATA_MOVEMENT_INTERFACE_ID`) ON DELETE CASCADE;
-ALTER TABLE `GROUP_COMPUTE_RESOURCE_PREFERENCE` ADD CONSTRAINT `GROUP_COMPUTE_RESOURCE_PREFERENCE_ibfk_1` FOREIGN KEY IF NOT EXISTS(`RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE;
-ALTER TABLE `GROUP_COMPUTE_RESOURCE_PREFERENCE` ADD CONSTRAINT `GROUP_COMPUTE_RESOURCE_PREFERENCE_ibfk_2` FOREIGN KEY IF NOT EXISTS(`GROUP_RESOURCE_PROFILE_ID`) REFERENCES `GROUP_RESOURCE_PROFILE` (`GROUP_RESOURCE_PROFILE_ID`) ON DELETE CASCADE;
-ALTER TABLE `GRP_SSH_ACC_PROV_CONFIG` ADD CONSTRAINT `GRP_SSH_ACC_PROV_CONFIG_ibfk_1` FOREIGN KEY IF NOT EXISTS(`RESOURCE_ID`, `GROUP_RESOURCE_PROFILE_ID`) REFERENCES `GROUP_COMPUTE_RESOURCE_PREFERENCE` (`RESOURCE_ID`, `GROUP_RESOURCE_PROFILE_ID`) ON DELETE CASCADE;
-ALTER TABLE `GSISSH_EXPORT` ADD CONSTRAINT `GSISSH_EXPORT_ibfk_1` FOREIGN KEY IF NOT EXISTS(`SUBMISSION_ID`) REFERENCES `GSISSH_SUBMISSION` (`SUBMISSION_ID`) ON DELETE CASCADE;
-ALTER TABLE `GSISSH_POSTJOBCOMMAND` ADD CONSTRAINT `GSISSH_POSTJOBCOMMAND_ibfk_1` FOREIGN KEY IF NOT EXISTS(`SUBMISSION_ID`) REFERENCES `GSISSH_SUBMISSION` (`SUBMISSION_ID`) ON DELETE CASCADE;
-ALTER TABLE `GSISSH_PREJOBCOMMAND` ADD CONSTRAINT `GSISSH_PREJOBCOMMAND_ibfk_1` FOREIGN KEY IF NOT EXISTS(`SUBMISSION_ID`) REFERENCES `GSISSH_SUBMISSION` (`SUBMISSION_ID`) ON DELETE CASCADE;
-ALTER TABLE `HOST_ALIAS` ADD CONSTRAINT `HOST_ALIAS_ibfk_1` FOREIGN KEY IF NOT EXISTS (`RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE;
-ALTER TABLE `HOST_IPADDRESS` ADD CONSTRAINT `HOST_IPADDRESS_ibfk_1` FOREIGN KEY IF NOT EXISTS (`RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE;
-ALTER TABLE `JOB_MANAGER_COMMAND` ADD CONSTRAINT `JOB_MANAGER_COMMAND_ibfk_1` FOREIGN KEY IF NOT EXISTS (`RESOURCE_JOB_MANAGER_ID`) REFERENCES `RESOURCE_JOB_MANAGER` (`RESOURCE_JOB_MANAGER_ID`) ON DELETE CASCADE;
-ALTER TABLE `JOB_SUBMISSION_INTERFACE` ADD CONSTRAINT `JOB_SUBMISSION_INTERFACE_ibfk_1` FOREIGN KEY IF NOT EXISTS (`COMPUTE_RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE;
-ALTER TABLE `LIBRARY_APEND_PATH` ADD CONSTRAINT `LIBRARY_APEND_PATH_ibfk_1` FOREIGN KEY IF NOT EXISTS (`DEPLOYMENT_ID`) REFERENCES `APPLICATION_DEPLOYMENT` (`DEPLOYMENT_ID`) ON DELETE CASCADE;
-ALTER TABLE `LIBRARY_PREPAND_PATH` ADD CONSTRAINT `LIBRARY_PREPAND_PATH_ibfk_1` FOREIGN KEY IF NOT EXISTS (`DEPLOYMENT_ID`) REFERENCES `APPLICATION_DEPLOYMENT` (`DEPLOYMENT_ID`) ON DELETE CASCADE;
-ALTER TABLE `LOCAL_SUBMISSION` ADD CONSTRAINT `LOCAL_SUBMISSION_ibfk_1` FOREIGN KEY IF NOT EXISTS (`RESOURCE_JOB_MANAGER_ID`) REFERENCES `RESOURCE_JOB_MANAGER` (`RESOURCE_JOB_MANAGER_ID`);
-ALTER TABLE `MODULE_LOAD_CMD` ADD CONSTRAINT `MODULE_LOAD_CMD_ibfk_1` FOREIGN KEY IF NOT EXISTS (`APP_DEPLOYMENT_ID`) REFERENCES `APPLICATION_DEPLOYMENT` (`DEPLOYMENT_ID`) ON DELETE CASCADE;
-ALTER TABLE `PARALLELISM_COMMAND` ADD CONSTRAINT `PARALLELISM_COMMAND_ibfk_1` FOREIGN KEY IF NOT EXISTS (`RESOURCE_JOB_MANAGER_ID`) REFERENCES `RESOURCE_JOB_MANAGER` (`RESOURCE_JOB_MANAGER_ID`) ON DELETE CASCADE;
-ALTER TABLE `POSTJOB_COMMAND` ADD CONSTRAINT `POSTJOB_COMMAND_ibfk_1` FOREIGN KEY IF NOT EXISTS (`APPDEPLOYMENT_ID`) REFERENCES `APPLICATION_DEPLOYMENT` (`DEPLOYMENT_ID`) ON DELETE CASCADE;
-ALTER TABLE `PREJOB_COMMAND` ADD CONSTRAINT `PREJOB_COMMAND_ibfk_1` FOREIGN KEY IF NOT EXISTS (`APPDEPLOYMENT_ID`) REFERENCES `APPLICATION_DEPLOYMENT` (`DEPLOYMENT_ID`) ON DELETE CASCADE;
-ALTER TABLE `SSH_ACCOUNT_PROVISIONER_CONFIG` ADD CONSTRAINT `SSH_ACCOUNT_PROVISIONER_CONFIG_ibfk_1` FOREIGN KEY IF NOT EXISTS (`GATEWAY_ID`, `RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE_PREFERENCE` (`GATEWAY_ID`, `RESOURCE_ID`) ON DELETE CASCADE;
-ALTER TABLE `SSH_JOB_SUBMISSION` ADD CONSTRAINT `SSH_JOB_SUBMISSION_ibfk_1` FOREIGN KEY IF NOT EXISTS (`RESOURCE_JOB_MANAGER_ID`) REFERENCES `RESOURCE_JOB_MANAGER` (`RESOURCE_JOB_MANAGER_ID`);
--- Note: to deal with STORAGE_INTERFACEs that reference non-existent STORAGE_RESOURCEs, use the following to clean up orphans
--- MariaDB [app_catalog]> create table temp1 as select STORAGE_RESOURCE_ID from STORAGE_INTERFACE si where not exists (select 1 from STORAGE_RESOURCE sr where sr.STORAGE_RESOURCE_ID = si.STORAGE_RESOURCE_ID);
--- MariaDB [app_catalog]> delete from STORAGE_INTERFACE where STORAGE_RESOURCE_ID in (select STORAGE_RESOURCE_ID from temp1);
-ALTER TABLE `STORAGE_INTERFACE` ADD CONSTRAINT `STORAGE_INTERFACE_ibfk_1` FOREIGN KEY IF NOT EXISTS (`STORAGE_RESOURCE_ID`) REFERENCES `STORAGE_RESOURCE` (`STORAGE_RESOURCE_ID`) ON DELETE CASCADE;
-set FOREIGN_KEY_CHECKS=1;
-
--- Older tables that no longer exist, or don't exist with those names
-DROP TABLE IF EXISTS `DATA_STORAGE_INTERFACE`;
-DROP TABLE IF EXISTS `GATEWAY_CLIENT_CREDENTIAL`;
-
--- misnamed column. This migration was only needed in development environment where code with old column name was deployed.
--- UPDATE PARSER_CONNECTOR_INPUT set PARSER_OUTPUT_ID = PARENT_OUTPUT_ID;
--- ALTER TABLE `PARSER_CONNECTOR_INPUT` DROP IF EXISTS `PARENT_OUTPUT_ID`;
--- ALTER TABLE `PARSING_TEMPLATE_INPUT` DROP IF EXISTS `PARSER_INPUT_ID`;
-
-ALTER TABLE `UNICORE_DATAMOVEMENT` DROP IF EXISTS `SECURITY_PROTOCOL`;
-
--- AIRAVATA-3029: Add METADATA to APPLICATION_OUTPUT
-ALTER TABLE `APPLICATION_OUTPUT` ADD COLUMN IF NOT EXISTS METADATA VARCHAR(4096);
-
--- AIRAVATA-3268: add overrideFilename to APPLICATION_INPUT
-ALTER TABLE APPLICATION_INPUT ADD COLUMN IF NOT EXISTS OVERRIDE_FILENAME VARCHAR(255);
-update APPLICATION_INPUT set OVERRIDE_FILENAME = INPUT_VALUE where OVERRIDE_FILENAME is null and DATA_TYPE = 'URI' and INPUT_VALUE is not null and INPUT_VALUE != '';
-update APPLICATION_INPUT set INPUT_VALUE = NULL where OVERRIDE_FILENAME is not null and OVERRIDE_FILENAME != '' and DATA_TYPE = 'URI' and (INPUT_VALUE is not null or INPUT_VALUE = '');
-
--- AIRAVATA-3126
-CREATE TABLE IF NOT EXISTS COMPUTE_RESOURCE_RESERVATION -- ComputeResourceReservationEntity
-    (RESERVATION_ID VARCHAR(255) NOT NULL, END_TIME TIMESTAMP NOT NULL DEFAULT 0, RESERVATION_NAME VARCHAR(255) NOT NULL, START_TIME TIMESTAMP NOT NULL DEFAULT 0, RESOURCE_ID VARCHAR(255) NOT NULL, GROUP_RESOURCE_PROFILE_ID VARCHAR(255) NOT NULL, PRIMARY KEY (RESERVATION_ID)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-CREATE TABLE IF NOT EXISTS COMPUTE_RESOURCE_RESERVATION_QUEUE (RESERVATION_ID VARCHAR(255), QUEUE_NAME VARCHAR(255) NOT NULL
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-CREATE INDEX IF NOT EXISTS I_CMPTN_Q_RESERVATION_ID ON COMPUTE_RESOURCE_RESERVATION_QUEUE (RESERVATION_ID);
-ALTER TABLE COMPUTE_RESOURCE_RESERVATION ADD CONSTRAINT FK_COMPUTE_RESOURCE_RESERVATION FOREIGN KEY IF NOT EXISTS (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID) REFERENCES GROUP_COMPUTE_RESOURCE_PREFERENCE (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID) ON DELETE CASCADE;
-
--- AIRAVATA-3276 Replace JSON configuration: "toggle": ["isRequired"] ->
--- "isRequired": true. Toggling requiredToAddedToCommandLine no longer needed.
-
--- replace toggle with is isRequired
-update APPLICATION_INPUT
-set METADATA = REGEXP_REPLACE(METADATA, '"toggle": \\[[^}]+\\]', CONCAT('"isRequired": ', IF(IS_REQUIRED=1, 'true', 'false')))
--- showOptions has "toggle" but not "isRequired"
-where METADATA rlike '"showOptions": {"toggle": \\[[^}]+\\]'
-  and NOT METADATA rlike '"showOptions": {.*"isRequired": (true|false)'
-;
-
--- remove toggle since isRequired is already there
-update APPLICATION_INPUT
-set METADATA = REGEXP_REPLACE(METADATA, '(, )?"toggle": \\[[^}]+\\](, )?', '')
--- showOptions has BOTH "toggle" and "isRequired"
-where METADATA rlike '"showOptions": {"toggle": \\[[^}]+\\]'
-  and METADATA rlike '"showOptions": {.*"isRequired": (true|false)'
-;
diff --git a/modules/release-migration-scripts/0.18-0.19/DeltaScripts/credential_store_schema_delta.sql b/modules/release-migration-scripts/0.18-0.19/DeltaScripts/credential_store_schema_delta.sql
deleted file mode 100644
index 87f9792fc32..00000000000
--- a/modules/release-migration-scripts/0.18-0.19/DeltaScripts/credential_store_schema_delta.sql
+++ /dev/null
@@ -1,32 +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.
---
-
--- AIRAVATA-2938: bring database schema into sync with registry-refactoring DB init scripts
-use credential_store;
-
-set FOREIGN_KEY_CHECKS=0;
-ALTER TABLE `CREDENTIALS` CHANGE `TIME_PERSISTED` `TIME_PERSISTED` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP;
-ALTER TABLE `CREDENTIALS` CHANGE `DESCRIPTION` `DESCRIPTION` varchar(500) DEFAULT NULL;
-ALTER TABLE `CREDENTIALS` CHANGE `TOKEN_ID` `TOKEN_ID` varchar(100) NOT NULL;
-ALTER TABLE `COMMUNITY_USER` CHANGE `TOKEN_ID` `TOKEN_ID` varchar(100) NOT NULL;
-ALTER TABLE `COMMUNITY_USER` CHANGE `GATEWAY_ID` `GATEWAY_ID` varchar(100) NOT NULL;
-ALTER TABLE `COMMUNITY_USER` CHANGE `COMMUNITY_USER_NAME` `COMMUNITY_USER_NAME` varchar(100) NOT NULL;
-ALTER TABLE `CREDENTIALS` CHANGE `GATEWAY_ID` `GATEWAY_ID` varchar(100) NOT NULL;
-set FOREIGN_KEY_CHECKS=1;
diff --git a/modules/release-migration-scripts/0.18-0.19/DeltaScripts/experimentCatalog_schema_delta.sql b/modules/release-migration-scripts/0.18-0.19/DeltaScripts/experimentCatalog_schema_delta.sql
deleted file mode 100644
index 487a3248883..00000000000
--- a/modules/release-migration-scripts/0.18-0.19/DeltaScripts/experimentCatalog_schema_delta.sql
+++ /dev/null
@@ -1,133 +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.
---
-
-use experiment_catalog;
-
--- AIRAVATA-2768
-alter table EXPERIMENT_INPUT modify METADATA VARCHAR(4096);
-
--- AIRAVATA-2820
-alter table TASK drop column IF EXISTS TASK_INTERNAL_STORE;
-
--- AIRAVATA-2827: OpenJPA 2.4.3 upgrade, convert BIT -> TINYINT(1)
-alter table PROCESS modify column USE_USER_CR_PREF tinyint(1);
-alter table QUEUE_STATUS modify column QUEUE_UP tinyint(1);
-alter table USER_CONFIGURATION_DATA modify column IS_USE_USER_CR_PREF tinyint(1);
-
--- AIRAVATA-2899
-alter table PROCESS_STATUS modify column TIME_OF_STATE_CHANGE TIMESTAMP(6) DEFAULT NOW(6) ON UPDATE NOW(6);
-alter table TASK_STATUS modify column TIME_OF_STATE_CHANGE TIMESTAMP(6) DEFAULT NOW(6) ON UPDATE NOW(6);
-alter table JOB_STATUS modify column TIME_OF_STATE_CHANGE TIMESTAMP(6) DEFAULT NOW(6) ON UPDATE NOW(6);
-
--- AIRAVATA-2872: NOT NULL foreign key columsn
-set FOREIGN_KEY_CHECKS=0;
-alter table USERS modify column GATEWAY_ID VARCHAR(255) NOT NULL;
-alter table GATEWAY_WORKER modify column GATEWAY_ID VARCHAR(255) NOT NULL;
-alter table PROJECT modify column GATEWAY_ID VARCHAR(255) NOT NULL;
-alter table PROJECT_USER modify column PROJECT_ID VARCHAR(255) NOT NULL;
-alter table PROJECT_USER modify column USER_NAME VARCHAR(255) NOT NULL;
-alter table EXPERIMENT modify column PROJECT_ID VARCHAR(255) NOT NULL;
-alter table EXPERIMENT_INPUT modify column EXPERIMENT_ID VARCHAR(255) NOT NULL;
-alter table EXPERIMENT_OUTPUT modify column EXPERIMENT_ID VARCHAR(255) NOT NULL;
-alter table EXPERIMENT_STATUS modify column EXPERIMENT_ID VARCHAR(255) NOT NULL;
-alter table EXPERIMENT_ERROR modify column EXPERIMENT_ID VARCHAR(255) NOT NULL;
-alter table USER_CONFIGURATION_DATA modify column EXPERIMENT_ID VARCHAR(255) NOT NULL;
-alter table PROCESS modify column EXPERIMENT_ID VARCHAR(255) NOT NULL;
-alter table PROCESS_INPUT modify column PROCESS_ID VARCHAR(255) NOT NULL;
-alter table PROCESS_OUTPUT modify column PROCESS_ID VARCHAR(255) NOT NULL;
-alter table PROCESS_STATUS modify column PROCESS_ID VARCHAR(255) NOT NULL;
-alter table PROCESS_ERROR modify column PROCESS_ID VARCHAR(255) NOT NULL;
-alter table PROCESS_RESOURCE_SCHEDULE modify column PROCESS_ID VARCHAR(255) NOT NULL;
-alter table TASK modify column PARENT_PROCESS_ID VARCHAR(255) NOT NULL;
-alter table TASK_STATUS modify column TASK_ID VARCHAR(255) NOT NULL;
-alter table TASK_ERROR modify column TASK_ID VARCHAR(255) NOT NULL;
-alter table JOB modify column TASK_ID VARCHAR(255) NOT NULL;
-alter table JOB_STATUS modify column TASK_ID VARCHAR(255) NOT NULL;
-alter table JOB_STATUS modify column JOB_ID VARCHAR(255) NOT NULL;
-set FOREIGN_KEY_CHECKS=1;
-
--- AIRAVATA-2953
-alter table PROCESS_INPUT modify column METADATA VARCHAR(4096);
-
--- AIRAVATA-2938: bring database schema into sync with registry-refactoring DB init scripts
-DROP TABLE IF EXISTS `COMMUNITY_USER`;
-DROP TABLE IF EXISTS `CREDENTIALS`;
-
-ALTER TABLE `EXPERIMENT_INPUT` CHANGE `IS_READ_ONLY` `IS_READ_ONLY` tinyint(1) DEFAULT NULL;
-ALTER TABLE `GATEWAY` CHANGE `REQUEST_CREATION_TIME` `REQUEST_CREATION_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP;
-ALTER TABLE `NOTIFICATION` CHANGE `CREATION_DATE` `CREATION_DATE` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00';
-ALTER TABLE `NOTIFICATION` CHANGE `EXPIRATION_DATE` `EXPIRATION_DATE` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00';
-ALTER TABLE `NOTIFICATION` CHANGE `PUBLISHED_DATE` `PUBLISHED_DATE` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
-ALTER TABLE `PROCESS_INPUT` CHANGE `IS_READ_ONLY` `IS_READ_ONLY` tinyint(1) DEFAULT NULL;
-ALTER TABLE `EXPERIMENT` DROP IF EXISTS `ARCHIVE`;
-ALTER TABLE `GATEWAY` DROP IF EXISTS `GATEWAY_DOMAIN`;
-ALTER TABLE `PROCESS` DROP IF EXISTS `ARCHIVE`;
-
-set FOREIGN_KEY_CHECKS=0;
-ALTER TABLE `GATEWAY_WORKER` DROP FOREIGN KEY IF EXISTS `GATEWAY_WORKER_ibfk_2`;
-ALTER TABLE `GATEWAY_WORKER` DROP INDEX IF EXISTS `USER_NAME`;
-ALTER TABLE `PROJECT_USER` DROP FOREIGN KEY IF EXISTS `PROJECT_USER_ibfk_2`;
-ALTER TABLE `PROJECT_USER` DROP INDEX IF EXISTS `USER_NAME`;
-ALTER TABLE `PROJECT` DROP FOREIGN KEY IF EXISTS `PROJECT_ibfk_2`;
-ALTER TABLE `PROJECT` DROP INDEX IF EXISTS `USER_NAME`;
-ALTER TABLE `USERS` ADD CONSTRAINT `USERS_ibfk_1` FOREIGN KEY IF NOT EXISTS (`GATEWAY_ID`) REFERENCES `GATEWAY` (`GATEWAY_ID`) ON DELETE CASCADE;
-ALTER TABLE `USERS` ADD PRIMARY KEY IF NOT EXISTS (`GATEWAY_ID`,`USER_NAME`);
-ALTER TABLE `USERS` DROP INDEX IF EXISTS `USER_NAME`;
-set FOREIGN_KEY_CHECKS=1;
-
--- AIRAVATA-2978: Add missing columns to PROCESS_RESOURCE_SCHEDULE
-ALTER TABLE PROCESS_RESOURCE_SCHEDULE ADD COLUMN IF NOT EXISTS STATIC_WORKING_DIR varchar(255);
-ALTER TABLE PROCESS_RESOURCE_SCHEDULE ADD COLUMN IF NOT EXISTS OVERRIDE_ALLOCATION_PROJECT_NUMBER varchar(255);
-ALTER TABLE PROCESS_RESOURCE_SCHEDULE ADD COLUMN IF NOT EXISTS OVERRIDE_LOGIN_USER_NAME varchar(255);
-ALTER TABLE PROCESS_RESOURCE_SCHEDULE ADD COLUMN IF NOT EXISTS OVERRIDE_SCRATCH_LOCATION varchar(255);
-
--- AIRAVATA-3029: Add METADATA to EXPERIMENT_OUTPUT and PROCESS_OUTPUT
-ALTER TABLE `EXPERIMENT_OUTPUT` ADD COLUMN IF NOT EXISTS METADATA VARCHAR(4096);
-ALTER TABLE `PROCESS_OUTPUT` ADD COLUMN IF NOT EXISTS METADATA VARCHAR(4096);
-
-ALTER TABLE `PROCESS` ADD COLUMN IF NOT EXISTS `GROUP_RESOURCE_PROFILE_ID` varchar(255) DEFAULT NULL;
-ALTER TABLE `USER_CONFIGURATION_DATA` ADD IF NOT EXISTS `GROUP_RESOURCE_PROFILE_ID` varchar(255) DEFAULT NULL;
-
--- Copy OAUTH_CLIENT_ID and OAUTH_CLIENT_SECRET from profile_service.GATEWAY
-update GATEWAY g
-inner join profile_service.GATEWAY pg
-on pg.GATEWAY_ID = g.GATEWAY_ID
-set g.OAUTH_CLIENT_ID = pg.OAUTH_CLIENT_ID,
-    g.OAUTH_CLIENT_SECRET = pg.OAUTH_CLIENT_SECRET
-where
-    g.OAUTH_CLIENT_ID is null
-    or g.OAUTH_CLIENT_SECRET is null;
-
--- AIRAVATA-3303 Slashes in experiment id
-set FOREIGN_KEY_CHECKS=0;
-
-update EXPERIMENT set EXPERIMENT_ID = REPLACE(EXPERIMENT_ID, "/", "_") where EXPERIMENT_ID like '%/%';
-update EXPERIMENT_INPUT set EXPERIMENT_ID = REPLACE(EXPERIMENT_ID, "/", "_") where EXPERIMENT_ID like '%/%';
-update EXPERIMENT_OUTPUT set EXPERIMENT_ID = REPLACE(EXPERIMENT_ID, "/", "_") where EXPERIMENT_ID like '%/%';
-update EXPERIMENT_STATUS set EXPERIMENT_ID = REPLACE(EXPERIMENT_ID, "/", "_") where EXPERIMENT_ID like '%/%';
-update EXPERIMENT_ERROR set EXPERIMENT_ID = REPLACE(EXPERIMENT_ID, "/", "_") where EXPERIMENT_ID like '%/%';
-update USER_CONFIGURATION_DATA set EXPERIMENT_ID = REPLACE(EXPERIMENT_ID, "/", "_") where EXPERIMENT_ID like '%/%';
-update PROCESS set EXPERIMENT_ID = REPLACE(EXPERIMENT_ID, "/", "_") where EXPERIMENT_ID like '%/%';
-
-set FOREIGN_KEY_CHECKS=1;
-
--- AIRAVATA-3268: add overrideFilename to EXPERIMENT_INPUT, PROCESS_INPUT
-ALTER TABLE EXPERIMENT_INPUT ADD COLUMN IF NOT EXISTS OVERRIDE_FILENAME VARCHAR(255);
-ALTER TABLE PROCESS_INPUT ADD COLUMN IF NOT EXISTS OVERRIDE_FILENAME VARCHAR(255);
diff --git a/modules/release-migration-scripts/0.18-0.19/DeltaScripts/profile_service_schema_delta.sql b/modules/release-migration-scripts/0.18-0.19/DeltaScripts/profile_service_schema_delta.sql
deleted file mode 100644
index e0ff787f3dc..00000000000
--- a/modules/release-migration-scripts/0.18-0.19/DeltaScripts/profile_service_schema_delta.sql
+++ /dev/null
@@ -1,68 +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.
---
-
-use profile_service;
-
-alter database profile_service character set = 'latin1';
-
--- AIRAVATA-2938: bring database schema into sync with registry-refactoring DB init scripts
-set FOREIGN_KEY_CHECKS=0;
-ALTER TABLE `NSF_DEMOGRAPHIC_RACE` CHANGE COLUMN IF EXISTS RACES RACE varchar(255) NOT NULL;
-ALTER TABLE `NSF_DEMOGRAPHIC_DISABILITY` CHANGE COLUMN IF EXISTS DISABILITIES DISABILITY varchar(255) NOT NULL;
-ALTER TABLE `USER_PROFILE_PHONE` CHANGE COLUMN IF EXISTS PHONES PHONE varchar(255) NOT NULL;
-ALTER TABLE `USER_PROFILE_EMAIL` CHANGE COLUMN IF EXISTS EMAILS EMAIL varchar(255) NOT NULL;
-ALTER TABLE `NSF_DEMOGRAPHIC_ETHNICITY` CHANGE COLUMN IF EXISTS ETHNICITIES ETHNICITY varchar(255) NOT NULL;
-ALTER TABLE `NSF_DEMOGRAPHIC_DISABILITY` ADD PRIMARY KEY IF NOT EXISTS (`AIRAVATA_INTERNAL_USER_ID`,`DISABILITY`);
-ALTER TABLE `NSF_DEMOGRAPHIC_DISABILITY` DROP INDEX IF EXISTS `AIRAVATA_INTERNAL_USER_ID`;
-ALTER TABLE `NSF_DEMOGRAPHIC_ETHNICITY` ADD PRIMARY KEY IF NOT EXISTS (`AIRAVATA_INTERNAL_USER_ID`,`ETHNICITY`);
-ALTER TABLE `NSF_DEMOGRAPHIC_ETHNICITY` DROP INDEX IF EXISTS `AIRAVATA_INTERNAL_USER_ID`;
-ALTER TABLE `NSF_DEMOGRAPHIC_RACE` ADD PRIMARY KEY IF NOT EXISTS (`AIRAVATA_INTERNAL_USER_ID`,`RACE`);
-ALTER TABLE `NSF_DEMOGRAPHIC_RACE` DROP INDEX IF EXISTS `AIRAVATA_INTERNAL_USER_ID`;
-ALTER TABLE `USER_PROFILE_EMAIL` ADD PRIMARY KEY IF NOT EXISTS (`AIRAVATA_INTERNAL_USER_ID`,`EMAIL`);
-ALTER TABLE `USER_PROFILE_EMAIL` DROP INDEX IF EXISTS `AIRAVATA_INTERNAL_USER_ID`;
-ALTER TABLE `USER_PROFILE_LABELED_URI` ADD PRIMARY KEY IF NOT EXISTS (`AIRAVATA_INTERNAL_USER_ID`,`LABELED_URI`);
-ALTER TABLE `USER_PROFILE_LABELED_URI` DROP INDEX IF EXISTS `AIRAVATA_INTERNAL_USER_ID`;
-ALTER TABLE `USER_PROFILE_NATIONALITY` ADD PRIMARY KEY IF NOT EXISTS (`AIRAVATA_INTERNAL_USER_ID`,`NATIONALITY`);
-ALTER TABLE `USER_PROFILE_NATIONALITY` DROP INDEX IF EXISTS `AIRAVATA_INTERNAL_USER_ID`;
-
--- deduplicate phone records
-CREATE TABLE USER_PROFILE_PHONE_TEMP SELECT DISTINCT AIRAVATA_INTERNAL_USER_ID, PHONE FROM USER_PROFILE_PHONE;
-TRUNCATE USER_PROFILE_PHONE;
-INSERT INTO USER_PROFILE_PHONE SELECT * FROM USER_PROFILE_PHONE_TEMP;
-DROP TABLE USER_PROFILE_PHONE_TEMP;
-
-ALTER TABLE `USER_PROFILE_PHONE` ADD PRIMARY KEY IF NOT EXISTS (`AIRAVATA_INTERNAL_USER_ID`,`PHONE`);
-ALTER TABLE `USER_PROFILE_PHONE` DROP INDEX IF EXISTS `AIRAVATA_INTERNAL_USER_ID`;
-ALTER TABLE `NSF_DEMOGRAPHIC_DISABILITY` CHANGE `AIRAVATA_INTERNAL_USER_ID` `AIRAVATA_INTERNAL_USER_ID` varchar(255) NOT NULL;
-ALTER TABLE `NSF_DEMOGRAPHIC_ETHNICITY` CHANGE `AIRAVATA_INTERNAL_USER_ID` `AIRAVATA_INTERNAL_USER_ID` varchar(255) NOT NULL;
-ALTER TABLE `NSF_DEMOGRAPHIC_RACE` CHANGE `AIRAVATA_INTERNAL_USER_ID` `AIRAVATA_INTERNAL_USER_ID` varchar(255) NOT NULL;
-ALTER TABLE `NSF_DEMOGRAPHIC` CHANGE `GENDER` `GENDER` varchar(255) NOT NULL;
-ALTER TABLE `USER_PROFILE_EMAIL` CHANGE `AIRAVATA_INTERNAL_USER_ID` `AIRAVATA_INTERNAL_USER_ID` varchar(255) NOT NULL;
-ALTER TABLE `USER_PROFILE_LABELED_URI` CHANGE `AIRAVATA_INTERNAL_USER_ID` `AIRAVATA_INTERNAL_USER_ID` varchar(255) NOT NULL;
-ALTER TABLE `USER_PROFILE_LABELED_URI` CHANGE `LABELED_URI` `LABELED_URI` varchar(255) NOT NULL;
-ALTER TABLE `USER_PROFILE_NATIONALITY` CHANGE `AIRAVATA_INTERNAL_USER_ID` `AIRAVATA_INTERNAL_USER_ID` varchar(255) NOT NULL;
-ALTER TABLE `USER_PROFILE_NATIONALITY` CHANGE `NATIONALITY` `NATIONALITY` varchar(255) NOT NULL;
-ALTER TABLE `USER_PROFILE_PHONE` CHANGE `AIRAVATA_INTERNAL_USER_ID` `AIRAVATA_INTERNAL_USER_ID` varchar(255) NOT NULL;
-ALTER TABLE `USER_PROFILE_PHONE` ADD PRIMARY KEY IF NOT EXISTS (`AIRAVATA_INTERNAL_USER_ID`,`PHONE`);
-ALTER TABLE `USER_PROFILE` CHANGE `CREATION_TIME` `CREATION_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP;
-ALTER TABLE `USER_PROFILE` CHANGE `GATEWAY_ID` `GATEWAY_ID` varchar(255) NOT NULL;
-ALTER TABLE `USER_PROFILE` CHANGE `LAST_ACCESS_TIME` `LAST_ACCESS_TIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00';
-ALTER TABLE `USER_PROFILE` CHANGE `USER_ID` `USER_ID` varchar(255) NOT NULL;
-set FOREIGN_KEY_CHECKS=1;
diff --git a/modules/release-migration-scripts/0.18-0.19/DeltaScripts/replicaCatalog_schema_delta.sql b/modules/release-migration-scripts/0.18-0.19/DeltaScripts/replicaCatalog_schema_delta.sql
deleted file mode 100644
index b075d324058..00000000000
--- a/modules/release-migration-scripts/0.18-0.19/DeltaScripts/replicaCatalog_schema_delta.sql
+++ /dev/null
@@ -1,46 +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.
---
-
-use replica_catalog;
-
--- AIRAVATA-2872: NOT NULL foreign key columsn
-set FOREIGN_KEY_CHECKS=0;
-alter table DATA_PRODUCT_METADATA modify column PRODUCT_URI VARCHAR(255) NOT NULL;
-alter table DATA_REPLICA_METADATA modify column REPLICA_ID VARCHAR(255) NOT NULL;
-set FOREIGN_KEY_CHECKS=1;
-
--- AIRAVATA-2938: bring database schema into sync with registry-refactoring DB init scripts
--- somehow these workflow tables got created in the replica_catalog schema
-DROP TABLE IF EXISTS `PORT`;
-DROP TABLE IF EXISTS `WORKFLOW_OUTPUT`;
-DROP TABLE IF EXISTS `WORKFLOW_STATUS`;
-DROP TABLE IF EXISTS `WORKFLOW_INPUT`;
-DROP TABLE IF EXISTS `NODE`;
-DROP TABLE IF EXISTS `COMPONENT_STATUS`;
-DROP TABLE IF EXISTS `EDGE`;
-DROP TABLE IF EXISTS `WORKFLOW`;
-set FOREIGN_KEY_CHECKS=0;
-ALTER TABLE `DATA_PRODUCT` CHANGE `PRODUCT_TYPE` `PRODUCT_TYPE` varchar(10) DEFAULT NULL;
-ALTER TABLE `DATA_REPLICA_LOCATION` CHANGE `REPLICA_LOCATION_CATEGORY` `REPLICA_LOCATION_CATEGORY` varchar(26) DEFAULT NULL;
-ALTER TABLE `DATA_REPLICA_LOCATION` CHANGE `REPLICA_PERSISTENT_TYPE` `REPLICA_PERSISTENT_TYPE` varchar(10) DEFAULT NULL;
-set FOREIGN_KEY_CHECKS=1;
-
--- AIRAVATA-3280: Widen FILE_PATH to accommodate longer file paths
-ALTER TABLE `DATA_REPLICA_LOCATION` MODIFY COLUMN `FILE_PATH` VARCHAR(1024);
diff --git a/modules/release-migration-scripts/0.18-0.19/DeltaScripts/sharingCatalog_schema_delta.sql b/modules/release-migration-scripts/0.18-0.19/DeltaScripts/sharingCatalog_schema_delta.sql
deleted file mode 100644
index 33d093f8484..00000000000
--- a/modules/release-migration-scripts/0.18-0.19/DeltaScripts/sharingCatalog_schema_delta.sql
+++ /dev/null
@@ -1,48 +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.
---
-
-use sharing_catalog;
-
--- AIRAVATA-2938: bring database schema into sync with registry-refactoring DB init scripts
-CREATE TABLE IF NOT EXISTS 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
-)ENGINE=InnoDB DEFAULT CHARACTER SET=latin1;
-
-ALTER TABLE `GROUP_ADMIN` ADD CONSTRAINT `GROUP_ADMIN_ibfk_1` FOREIGN KEY IF NOT EXISTS (`ADMIN_ID`, `DOMAIN_ID`) REFERENCES `SHARING_USER` (`USER_ID`, `DOMAIN_ID`) ON DELETE CASCADE ON UPDATE NO ACTION;
-ALTER TABLE `GROUP_ADMIN` ADD KEY IF NOT EXISTS `ADMIN_ID` (`ADMIN_ID`,`DOMAIN_ID`);
-
--- Some SINGLE_USER groups were incorrectly created as MULTI_USER
-update USER_GROUP set GROUP_CARDINALITY = 'SINGLE_USER' where GROUP_CARDINALITY = 'MULTI_USER' and OWNER_ID = GROUP_ID;
-
--- AIRAVATA-3238: add INITIAL_USER_GROUP_ID to DOMAIN
-ALTER TABLE DOMAIN ADD COLUMN IF NOT EXISTS INITIAL_USER_GROUP_ID varchar(255);
-ALTER TABLE DOMAIN ADD CONSTRAINT `DOMAIN_INITIAL_USER_GROUP_ID_FK` FOREIGN KEY IF NOT EXISTS (INITIAL_USER_GROUP_ID, DOMAIN_ID) REFERENCES USER_GROUP(GROUP_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION;
-
--- AIRAVATA-3303 Slashes in experiment id
-set FOREIGN_KEY_CHECKS=0;
-
-update SHARING set ENTITY_ID = REPLACE(ENTITY_ID, "/", "_") where ENTITY_ID in (select ENTITY_ID from ENTITY where ENTITY_ID like '%/%' and ENTITY_TYPE_ID like '%:EXPERIMENT');
-update ENTITY set ENTITY_ID = REPLACE(ENTITY_ID, "/", "_") where ENTITY_ID like '%/%' and ENTITY_TYPE_ID like '%:EXPERIMENT';
-
-set FOREIGN_KEY_CHECKS=1;
diff --git a/modules/release-migration-scripts/0.19-0.20/DeltaScripts/appCatalog_schema_delta.sql b/modules/release-migration-scripts/0.19-0.20/DeltaScripts/appCatalog_schema_delta.sql
deleted file mode 100644
index f95ed582302..00000000000
--- a/modules/release-migration-scripts/0.19-0.20/DeltaScripts/appCatalog_schema_delta.sql
+++ /dev/null
@@ -1,29 +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.
---
-
-use app_catalog;
-
--- AIRAVATA-3327: Remove deprecated reservation fields
-alter table GROUP_COMPUTE_RESOURCE_PREFERENCE drop column IF EXISTS RESERVATION;
-alter table GROUP_COMPUTE_RESOURCE_PREFERENCE drop column IF EXISTS RESERVATION_START_TIME;
-alter table GROUP_COMPUTE_RESOURCE_PREFERENCE drop column IF EXISTS RESERVATION_END_TIME;
-
--- AIRAVATA-3369: Convert USER_FRIENDLY_DESC from VARCHAR to TEXT (CLOB)
-alter table APPLICATION_INPUT modify column USER_FRIENDLY_DESC TEXT;
diff --git a/modules/release-migration-scripts/0.19-0.20/DeltaScripts/credential_store_schema_delta.sql b/modules/release-migration-scripts/0.19-0.20/DeltaScripts/credential_store_schema_delta.sql
deleted file mode 100644
index cd4ce1ff39c..00000000000
--- a/modules/release-migration-scripts/0.19-0.20/DeltaScripts/credential_store_schema_delta.sql
+++ /dev/null
@@ -1,21 +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.
---
-
-use credential_store;
diff --git a/modules/release-migration-scripts/0.19-0.20/DeltaScripts/experimentCatalog_schema_delta.sql b/modules/release-migration-scripts/0.19-0.20/DeltaScripts/experimentCatalog_schema_delta.sql
deleted file mode 100644
index 89e45ddd1f2..00000000000
--- a/modules/release-migration-scripts/0.19-0.20/DeltaScripts/experimentCatalog_schema_delta.sql
+++ /dev/null
@@ -1,35 +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.
---
-
-use experiment_catalog;
-
-CREATE TABLE IF NOT exists `GATEWAY_USAGE_REPORTING_COMMAND` (
-  `GATEWAY_ID` varchar(255) NOT NULL,
-  `COMPUTE_RESOURCE_ID` varchar(255) NOT NULL,
-  `COMMAND` longtext NOT NULL,
-  PRIMARY KEY (`GATEWAY_ID`, `COMPUTE_RESOURCE_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
--- AIRAVATA-3369: Convert USER_FRIENDLY_DESCRIPTION from VARCHAR to TEXT (CLOB)
-alter table EXPERIMENT_INPUT modify column USER_FRIENDLY_DESCRIPTION TEXT;
-alter table PROCESS_INPUT modify column USER_FRIENDLY_DESCRIPTION TEXT;
-
--- AIRAVATA-3322: Index on experiment_status to help statistics queries
-CREATE INDEX IF NOT EXISTS experiment_status_experiment_id_time_of_state_change_state ON EXPERIMENT_STATUS (EXPERIMENT_ID, TIME_OF_STATE_CHANGE, STATE);
diff --git a/modules/release-migration-scripts/0.19-0.20/DeltaScripts/profile_service_schema_delta.sql b/modules/release-migration-scripts/0.19-0.20/DeltaScripts/profile_service_schema_delta.sql
deleted file mode 100644
index cb533cc7713..00000000000
--- a/modules/release-migration-scripts/0.19-0.20/DeltaScripts/profile_service_schema_delta.sql
+++ /dev/null
@@ -1,21 +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.
---
-
-use profile_service;
diff --git a/modules/release-migration-scripts/0.19-0.20/DeltaScripts/replicaCatalog_schema_delta.sql b/modules/release-migration-scripts/0.19-0.20/DeltaScripts/replicaCatalog_schema_delta.sql
deleted file mode 100644
index 942ff54c859..00000000000
--- a/modules/release-migration-scripts/0.19-0.20/DeltaScripts/replicaCatalog_schema_delta.sql
+++ /dev/null
@@ -1,21 +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.
---
-
-use replica_catalog;
diff --git a/modules/release-migration-scripts/0.19-0.20/DeltaScripts/sharingCatalog_schema_delta.sql b/modules/release-migration-scripts/0.19-0.20/DeltaScripts/sharingCatalog_schema_delta.sql
deleted file mode 100644
index 6ddb67cd408..00000000000
--- a/modules/release-migration-scripts/0.19-0.20/DeltaScripts/sharingCatalog_schema_delta.sql
+++ /dev/null
@@ -1,21 +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.
---
-
-use sharing_catalog;
diff --git a/modules/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql b/modules/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql
deleted file mode 100644
index 839c2e17ce7..00000000000
--- a/modules/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql
+++ /dev/null
@@ -1,21 +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.
---
-
-use app_catalog;
diff --git a/modules/release-migration-scripts/next/DeltaScripts/credential_store_schema_delta.sql b/modules/release-migration-scripts/next/DeltaScripts/credential_store_schema_delta.sql
deleted file mode 100644
index cd4ce1ff39c..00000000000
--- a/modules/release-migration-scripts/next/DeltaScripts/credential_store_schema_delta.sql
+++ /dev/null
@@ -1,21 +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.
---
-
-use credential_store;
diff --git a/modules/release-migration-scripts/next/DeltaScripts/experimentCatalog_schema_delta.sql b/modules/release-migration-scripts/next/DeltaScripts/experimentCatalog_schema_delta.sql
deleted file mode 100644
index 95290b3e757..00000000000
--- a/modules/release-migration-scripts/next/DeltaScripts/experimentCatalog_schema_delta.sql
+++ /dev/null
@@ -1,38 +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.
---
-USE experiment_catalog;
-
-CREATE TABLE IF NOT EXISTS 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,
-    STATIC_WORKING_DIR varchar(255),
-    OVERRIDE_LOGIN_USER_NAME varchar(255),
-    OVERRIDE_SCRATCH_LOCATION varchar(255),
-    OVERRIDE_ALLOCATION_PROJECT_NUMBER varchar(255),
-    PARALLEL_GROUP_COUNT INT,
-    PRIMARY KEY (EXPERIMENT_ID, RESOURCE_HOST_ID, QUEUE_NAME),
-    FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
-) ENGINE = InnoDB DEFAULT CHARSET = latin1;
diff --git a/modules/release-migration-scripts/next/DeltaScripts/profile_service_schema_delta.sql b/modules/release-migration-scripts/next/DeltaScripts/profile_service_schema_delta.sql
deleted file mode 100644
index cb533cc7713..00000000000
--- a/modules/release-migration-scripts/next/DeltaScripts/profile_service_schema_delta.sql
+++ /dev/null
@@ -1,21 +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.
---
-
-use profile_service;
diff --git a/modules/release-migration-scripts/next/DeltaScripts/replicaCatalog_schema_delta.sql b/modules/release-migration-scripts/next/DeltaScripts/replicaCatalog_schema_delta.sql
deleted file mode 100644
index 8a23bf06c0b..00000000000
--- a/modules/release-migration-scripts/next/DeltaScripts/replicaCatalog_schema_delta.sql
+++ /dev/null
@@ -1,46 +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.
---
-USE replica_catalog;
-
--- AIRAVATA-3697: Support file names that have UTF8 characters and that are long
-ALTER TABLE
-    DATA_PRODUCT
-MODIFY
-    PRODUCT_NAME text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
-
-ALTER TABLE
-    DATA_PRODUCT
-MODIFY
-    PRODUCT_DESCRIPTION varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
-
-ALTER TABLE
-    DATA_REPLICA_LOCATION
-MODIFY
-    REPLICA_NAME text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
-
-ALTER TABLE
-    DATA_REPLICA_LOCATION
-MODIFY
-    REPLICA_DESCRIPTION varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
-
-ALTER TABLE
-    DATA_REPLICA_LOCATION
-MODIFY
-    FILE_PATH varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
diff --git a/modules/release-migration-scripts/next/DeltaScripts/sharingCatalog_schema_delta.sql b/modules/release-migration-scripts/next/DeltaScripts/sharingCatalog_schema_delta.sql
deleted file mode 100644
index 6ddb67cd408..00000000000
--- a/modules/release-migration-scripts/next/DeltaScripts/sharingCatalog_schema_delta.sql
+++ /dev/null
@@ -1,21 +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.
---
-
-use sharing_catalog;
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 712c36ca7a8..a4cce37e5a1 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
@@ -1,8 +1,9 @@
-CREATE DATABASE IF NOT EXISTS research_catalog;
+-- Research service uses the shared airavata database.
+-- This script ensures the user has access.
 
 CREATE USER IF NOT EXISTS 'airavata'@'%' IDENTIFIED BY '123456';
 ALTER USER 'airavata'@'%' IDENTIFIED BY '123456';
 
-GRANT ALL PRIVILEGES ON *.* TO 'airavata'@'%';
+GRANT ALL PRIVILEGES ON airavata.* TO 'airavata'@'%';
 
-FLUSH PRIVILEGES;
\ No newline at end of file
+FLUSH PRIVILEGES;
diff --git a/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/model/entity/Project.java b/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/model/entity/Project.java
index ca3d67ee876..4afc02aaae8 100644
--- a/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/model/entity/Project.java
+++ b/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/model/entity/Project.java
@@ -40,7 +40,7 @@
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
-@Entity(name = "PROJECT")
+@Entity(name = "RESEARCH_PROJECT")
 @EntityListeners(AuditingEntityListener.class)
 public class Project {
 
diff --git a/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/model/repo/ResourceRepository.java b/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/model/repo/ResourceRepository.java
index 98e7b27a2f7..94b0141baec 100644
--- a/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/model/repo/ResourceRepository.java
+++ b/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/model/repo/ResourceRepository.java
@@ -33,8 +33,7 @@
 @Repository
 public interface ResourceRepository extends JpaRepository<Resource, String> {
 
-    @Query(
-            """
+    @Query("""
                     SELECT r
                     FROM Resource r
                     WHERE TYPE(r) IN :types
@@ -48,8 +47,7 @@ Page<Resource> findAllByTypes(
             @Param("nameSearch") String nameSearch,
             Pageable pageable);
 
-    @Query(
-            """
+    @Query("""
             SELECT DISTINCT r
             FROM Resource r
             JOIN r.authors a
@@ -65,8 +63,7 @@ Page<Resource> findAllByTypesForUser(
             @Param("userId") String userId,
             Pageable pageable);
 
-    @Query(
-            """
+    @Query("""
                     SELECT r
                     FROM Resource r
                     JOIN r.tags t
@@ -86,8 +83,7 @@ Page<Resource> findAllByTypesAndAllTags(
             @Param("nameSearch") String nameSearch,
             Pageable pageable);
 
-    @Query(
-            """
+    @Query("""
             SELECT r
             FROM Resource r
             JOIN r.tags t
@@ -109,8 +105,7 @@ Page<Resource> findAllByTypesAndAllTagsForUser(
             @Param("userId") String userId,
             Pageable pageable);
 
-    @Query(
-            """
+    @Query("""
                     SELECT r
                     FROM Resource r
                     JOIN r.authors a
diff --git a/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/model/repo/TagRepository.java b/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/model/repo/TagRepository.java
index fabfa36d9ef..72d93d1383f 100644
--- a/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/model/repo/TagRepository.java
+++ b/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/model/repo/TagRepository.java
@@ -29,15 +29,12 @@ public interface TagRepository extends JpaRepository<Tag, String> {
 
     Tag findByValue(String value);
 
-    @Query(
-            value =
-                    """
+    @Query(value = """
                       SELECT t.* FROM tag t
                       JOIN resource_tags rt ON t.id = rt.tag_id
                       GROUP BY t.id
                       ORDER BY COUNT(rt.resource_id) DESC
                       LIMIT :limit
-                    """,
-            nativeQuery = true)
+                    """, nativeQuery = true)
     List<Tag> findDistinctByPopularity(@Param("limit") int limit);
 }
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 0652644a64e..8fd8e279972 100644
--- a/modules/research-framework/research-service/src/main/resources/application.yml
+++ b/modules/research-framework/research-service/src/main/resources/application.yml
@@ -20,22 +20,22 @@ grpc:
 
 server:
   port: 18889
-  address: 0.0.0.0
+  address: airavata.localhost
 
 airavata:
   research-hub:
-    url: http://airavata.host:20000
+    url: http://airavata.localhost:20000
     dev-user: "airavata@apache.org"
     adminApiKey: "JUPYTER_ADMIN_API_KEY"
     limit: 10
   research-portal:
-    url: http://airavata.host:5173
-    dev-url: http://airavata.host:5173
+    url: http://airavata.localhost:5173
+    dev-url: http://airavata.localhost:5173
   openid:
-    url: "http://airavata.host:18080/realms/default"
+    url: "http://airavata.localhost:18080/realms/default"
   user-profile:
     server:
-      url: airavata.host
+      url: airavata.localhost
       port: 8962
 
 spring:
@@ -44,7 +44,7 @@ spring:
       max-file-size: 200MB
       max-request-size: 200MB
   datasource:
-    url: "jdbc:mariadb://airavata.host:13306/research_catalog"
+    url: "jdbc:mariadb://airavata.localhost:13306/airavata"
     username: "airavata"
     password: "123456"
     driver-class-name: org.mariadb.jdbc.Driver
diff --git a/modules/research-framework/simexr_mod/setup.sh b/modules/research-framework/simexr_mod/setup.sh
index a7396947c53..c10474f0898 100755
--- a/modules/research-framework/simexr_mod/setup.sh
+++ b/modules/research-framework/simexr_mod/setup.sh
@@ -118,11 +118,11 @@ echo ""
 echo "📋 Next steps:"
 echo "1. Update utils/config.yaml with your OpenAI API key"
 echo "2. Activate the virtual environment: source simexr_venv/bin/activate"
-echo "3. Start the API server: python start_api.py --host 127.0.0.1 --port 8001"
-echo "4. Visit http://127.0.0.1:8001/docs for API documentation"
+echo "3. Start the API server: python start_api.py --host airavata.localhost --port 8001"
+echo "4. Visit http://airavata.localhost:8001/docs for API documentation"
 echo ""
 echo "🔗 Quick start commands:"
 echo "source simexr_venv/bin/activate"
-echo "python start_api.py --host 127.0.0.1 --port 8001"
+echo "python start_api.py --host airavata.localhost --port 8001"
 echo ""
 echo "📖 For more information, see README.md"
diff --git a/modules/restproxy/src/main/resources/application.properties b/modules/restproxy/src/main/resources/application.properties
index 5cd4c154340..6e58c85ea66 100644
--- a/modules/restproxy/src/main/resources/application.properties
+++ b/modules/restproxy/src/main/resources/application.properties
@@ -1,2 +1,2 @@
-restproxy.broker.url=airavata.host:9092
+restproxy.broker.url=airavata.localhost:9092
 server.port=8082
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 8609f5f92e4..31d893ca5a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,8 +73,6 @@ under the License.
         <module>modules/agent-framework/agent-service</module>
         <module>modules/research-framework/research-service</module>
         <module>modules/restproxy</module>
-        <module>modules/registry-db-migrator</module>
-        <module>modules/registry-jpa-generator</module>
         <module>modules/ide-integration</module>
     </modules>
 
@@ -651,7 +649,7 @@ under the License.
                 <configuration>
                     <java>
                         <palantirJavaFormat>
-                            <version>2.70.0</version>
+                            <version>2.89.0</version>
                         </palantirJavaFormat>
                         <licenseHeader>
                             <file>apache-license-header-java.txt</file>
@@ -715,7 +713,7 @@ under the License.
                 <plugin>
                     <groupId>com.diffplug.spotless</groupId>
                     <artifactId>spotless-maven-plugin</artifactId>
-                    <version>2.44.5</version>
+                    <version>3.4.0</version>
                 </plugin>
                 <plugin>
                     <groupId>com.google.code.maven-replacer-plugin</groupId>