You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2015/08/01 22:16:00 UTC
[5/5] airavata git commit: fixing test failures in
AiravataServerHandlerTest
fixing test failures in AiravataServerHandlerTest
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/50e04f13
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/50e04f13
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/50e04f13
Branch: refs/heads/master
Commit: 50e04f135b201c5f14c7a8bb909e63ff76475e76
Parents: 64a49b9
Author: Supun Nakandala <sc...@apache.org>
Authored: Sun Aug 2 01:45:06 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Sun Aug 2 01:45:06 2015 +0530
----------------------------------------------------------------------
.../handler/AiravataServerHandlerTest.java | 6 +
.../src/test/resources/appcatalog-derby.sql | 461 -------------------
.../src/test/resources/expcatalog-derby.sql | 391 ----------------
.../catalog/resources/WorkerResource.java | 2 +-
.../src/main/resources/appcatalog-derby.sql | 2 +-
.../src/main/resources/appcatalog-mysql.sql | 2 +-
.../src/main/resources/expcatalog-derby.sql | 2 +-
.../src/main/resources/expcatalog-mysql.sql | 2 +-
8 files changed, 11 insertions(+), 857 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/50e04f13/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/AiravataServerHandlerTest.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/AiravataServerHandlerTest.java b/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/AiravataServerHandlerTest.java
index 671298f..48e27b3 100644
--- a/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/AiravataServerHandlerTest.java
+++ b/airavata-api/airavata-api-server/src/test/java/org/apache/airavata/api/server/handler/AiravataServerHandlerTest.java
@@ -25,6 +25,7 @@ import org.apache.airavata.api.server.handler.utils.AppCatInit;
import org.apache.airavata.api.server.handler.utils.ExpCatInit;
import org.apache.airavata.api.server.util.RegistryInitUtil;
import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
+import org.apache.airavata.model.application.io.DataType;
import org.apache.airavata.model.application.io.InputDataObjectType;
import org.apache.airavata.model.application.io.OutputDataObjectType;
import org.apache.airavata.model.experiment.ExperimentModel;
@@ -195,6 +196,7 @@ public class AiravataServerHandlerTest {
InputDataObjectType inputDataObjectType = new InputDataObjectType();
inputDataObjectType.setName("Input_to_Echo");
inputDataObjectType.setValue("Hello World");
+ inputDataObjectType.setType(DataType.STRING);
ComputationalResourceSchedulingModel scheduling = new ComputationalResourceSchedulingModel();
scheduling.setResourceHostId(computeResouceId);
@@ -210,6 +212,7 @@ public class AiravataServerHandlerTest {
ExperimentModel experiment = new ExperimentModel();
experiment.setProjectId(projectId1);
+ experiment.setGatewayId(gatewayId);
experiment.setUserName("TestUser" + TAG);
experiment.setExperimentName("TestExperiment" + TAG);
experiment.setDescription("experiment");
@@ -235,12 +238,14 @@ public class AiravataServerHandlerTest {
OutputDataObjectType outputDataObjectType = new OutputDataObjectType();
outputDataObjectType.setName("Output_to_Echo");
outputDataObjectType.setValue("Hello World");
+ outputDataObjectType.setType(DataType.STRING);
experiment.addToExperimentOutputs(outputDataObjectType);
airavataServerHandler.updateExperiment(new AuthzToken(""), experimentId1, experiment);
//creating more experiments
experiment = new ExperimentModel();
experiment.setProjectId(projectId1);
+ experiment.setGatewayId(gatewayId);
experiment.setUserName("TestUser" + TAG);
experiment.setExperimentName("TestExperiment2" + TAG);
experiment.setDescription("experiment");
@@ -253,6 +258,7 @@ public class AiravataServerHandlerTest {
experiment = new ExperimentModel();
experiment.setProjectId(projectId1);
+ experiment.setGatewayId(gatewayId);
experiment.setUserName("TestUser" + TAG);
experiment.setExperimentName("TestExperiment3" + TAG);
experiment.setDescription("experiment");
http://git-wip-us.apache.org/repos/asf/airavata/blob/50e04f13/airavata-api/airavata-api-server/src/test/resources/appcatalog-derby.sql
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/test/resources/appcatalog-derby.sql b/airavata-api/airavata-api-server/src/test/resources/appcatalog-derby.sql
deleted file mode 100644
index 0b0f0e4..0000000
--- a/airavata-api/airavata-api-server/src/test/resources/appcatalog-derby.sql
+++ /dev/null
@@ -1,461 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-CREATE TABLE COMPUTE_RESOURCE
-(
- RESOURCE_ID VARCHAR (255) NOT NULL,
- HOST_NAME VARCHAR (255) NOT NULL,
- RESOURCE_DESCRIPTION VARCHAR (255),
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- MAX_MEMORY_NODE INTEGER,
- ENABLED SMALLINT,
- PRIMARY KEY (RESOURCE_ID)
-);
-
-CREATE TABLE HOST_ALIAS
-(
- RESOURCE_ID VARCHAR(255),
- ALIAS VARCHAR(255),
- PRIMARY KEY(RESOURCE_ID,ALIAS),
- FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE HOST_IPADDRESS
-(
- RESOURCE_ID VARCHAR(255),
- IP_ADDRESS VARCHAR(255),
- PRIMARY KEY(RESOURCE_ID,IP_ADDRESS),
- FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE GSISSH_SUBMISSION
-(
- SUBMISSION_ID VARCHAR(255),
- RESOURCE_JOB_MANAGER VARCHAR(255),
- SSH_PORT INTEGER,
- INSTALLED_PATH VARCHAR(255),
- MONITOR_MODE VARCHAR(255),
- PRIMARY KEY(SUBMISSION_ID)
-);
-
-CREATE TABLE GSISSH_EXPORT
-(
- SUBMISSION_ID VARCHAR(255),
- EXPORT VARCHAR(255),
- PRIMARY KEY(SUBMISSION_ID, EXPORT),
- FOREIGN KEY (SUBMISSION_ID) REFERENCES GSISSH_SUBMISSION(SUBMISSION_ID) ON DELETE CASCADE
-);
-
-
-
-CREATE TABLE GLOBUS_SUBMISSION
-(
- SUBMISSION_ID VARCHAR(255),
- RESOURCE_JOB_MANAGER VARCHAR(255),
- SECURITY_PROTOCAL VARCHAR(255),
- PRIMARY KEY(SUBMISSION_ID)
-);
-
-CREATE TABLE UNICORE_SUBMISSION
-(
- SUBMISSION_ID VARCHAR(255),
- SECURITY_PROTOCAL VARCHAR(255),
- UNICORE_ENDPOINT_URL VARCHAR(255),
- PRIMARY KEY(SUBMISSION_ID)
-);
-
-CREATE TABLE UNICORE_DATAMOVEMENT
-(
- DATAMOVEMENT_ID VARCHAR(255),
- SECURITY_PROTOCAL VARCHAR(255),
- UNICORE_ENDPOINT_URL VARCHAR(255),
- PRIMARY KEY(DATAMOVEMENT_ID)
-);
-
-
-CREATE TABLE GLOBUS_GK_ENDPOINT
-(
- SUBMISSION_ID VARCHAR(255),
- ENDPOINT VARCHAR(255),
- PRIMARY KEY(SUBMISSION_ID, ENDPOINT),
- FOREIGN KEY (SUBMISSION_ID) REFERENCES GLOBUS_SUBMISSION(SUBMISSION_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE RESOURCE_JOB_MANAGER
-(
- RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL,
- PUSH_MONITORING_ENDPOINT VARCHAR (255),
- JOB_MANAGER_BIN_PATH VARCHAR (255),
- RESOURCE_JOB_MANAGER_TYPE VARCHAR (255) NOT NULL,
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (RESOURCE_JOB_MANAGER_ID)
-);
-
-
-
-CREATE TABLE SSH_JOB_SUBMISSION
-(
- RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL,
- JOB_SUBMISSION_INTERFACE_ID VARCHAR (255) NOT NULL,
- ALTERNATIVE_SSH_HOSTNAME VARCHAR (255),
- SECURITY_PROTOCOL VARCHAR (255) NOT NULL,
- SSH_PORT INTEGER,
- MONITOR_MODE VARCHAR (255),
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (JOB_SUBMISSION_INTERFACE_ID),
- FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID)
-);
-
-CREATE TABLE SCP_DATA_MOVEMENT
-(
- QUEUE_DESCRIPTION VARCHAR (255),
- DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
- SECURITY_PROTOCOL VARCHAR (255) NOT NULL,
- ALTERNATIVE_SCP_HOSTNAME VARCHAR (255),
- SSH_PORT INTEGER,
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID)
-);
-
-CREATE TABLE GRIDFTP_DATA_MOVEMENT
-(
- DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
- SECURITY_PROTOCOL VARCHAR (255) NOT NULL,
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID)
-);
-
-CREATE TABLE GRIDFTP_ENDPOINT
-(
- ENDPOINT VARCHAR (255) NOT NULL,
- DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
- PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID,ENDPOINT),
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- FOREIGN KEY (DATA_MOVEMENT_INTERFACE_ID) REFERENCES GRIDFTP_DATA_MOVEMENT(DATA_MOVEMENT_INTERFACE_ID) ON DELETE CASCADE
-);
-
---CREATE TABLE JOB_SUBMISSION_PROTOCOL
---(
--- RESOURCE_ID VARCHAR(255),
--- SUBMISSION_ID VARCHAR(255),
--- JOB_TYPE VARCHAR(255),
--- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
--- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
--- PRIMARY KEY(RESOURCE_ID,SUBMISSION_ID,JOB_TYPE),
--- FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
---);
---
---CREATE TABLE DATA_MOVEMENT_PROTOCOL
---(
--- RESOURCE_ID VARCHAR(255),
--- DATA_MOVE_ID VARCHAR(255),
--- DATA_MOVE_TYPE VARCHAR(255),
--- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
--- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
--- PRIMARY KEY(RESOURCE_ID,DATA_MOVE_ID,DATA_MOVE_TYPE),
--- FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
---);
-
-CREATE TABLE APPLICATION_MODULE
-(
- MODULE_ID VARCHAR(255),
- MODULE_NAME VARCHAR(255),
- MODULE_VERSION VARCHAR(255),
- MODULE_DESC VARCHAR(255),
- GATEWAY_ID VARCHAR (255),
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY(MODULE_ID)
-);
-
-CREATE TABLE APPLICATION_DEPLOYMENT
-(
- DEPLOYMENT_ID VARCHAR(255),
- APP_MODULE_ID VARCHAR(255),
- COMPUTE_HOSTID VARCHAR(255),
- EXECUTABLE_PATH VARCHAR(255),
- PARALLELISM VARCHAR(255),
- APPLICATION_DESC VARCHAR(255),
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- GATEWAY_ID VARCHAR(255),
- PRIMARY KEY(DEPLOYMENT_ID),
- FOREIGN KEY (COMPUTE_HOSTID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE,
- FOREIGN KEY (APP_MODULE_ID) REFERENCES APPLICATION_MODULE(MODULE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE MODULE_LOAD_CMD
-(
- CMD VARCHAR (255) NOT NULL,
- APP_DEPLOYMENT_ID VARCHAR (255) NOT NULL,
- PRIMARY KEY (APP_DEPLOYMENT_ID,CMD),
- FOREIGN KEY (APP_DEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE PREJOB_COMMAND
-(
- APPDEPLOYMENT_ID VARCHAR(255),
- COMMAND VARCHAR(255),
- PRIMARY KEY(APPDEPLOYMENT_ID, COMMAND),
- FOREIGN KEY (APPDEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE POSTJOB_COMMAND
-(
- APPDEPLOYMENT_ID VARCHAR(255),
- COMMAND VARCHAR(255),
- PRIMARY KEY(APPDEPLOYMENT_ID, COMMAND),
- FOREIGN KEY (APPDEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE LIBRARY_PREPAND_PATH
-(
- DEPLOYMENT_ID VARCHAR(255),
- NAME VARCHAR(255),
- VALUE VARCHAR(255),
- PRIMARY KEY(DEPLOYMENT_ID, NAME),
- FOREIGN KEY (DEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE LIBRARY_APEND_PATH
-(
- DEPLOYMENT_ID VARCHAR(255),
- NAME VARCHAR(255),
- VALUE VARCHAR(255),
- PRIMARY KEY(DEPLOYMENT_ID, NAME),
- FOREIGN KEY (DEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE APP_ENVIRONMENT
-(
- DEPLOYMENT_ID VARCHAR(255),
- NAME VARCHAR(255),
- VALUE VARCHAR(255),
- PRIMARY KEY(DEPLOYMENT_ID, NAME),
- FOREIGN KEY (DEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE APPLICATION_INTERFACE
-(
- INTERFACE_ID VARCHAR(255),
- APPLICATION_NAME VARCHAR(255),
- APPLICATION_DESCRIPTION VARCHAR(255),
- GATEWAY_ID VARCHAR(255),
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY(INTERFACE_ID)
-);
-
-CREATE TABLE APP_MODULE_MAPPING
-(
- INTERFACE_ID VARCHAR(255),
- MODULE_ID VARCHAR(255),
- PRIMARY KEY(INTERFACE_ID, MODULE_ID),
- FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE(INTERFACE_ID) ON DELETE CASCADE,
- FOREIGN KEY (MODULE_ID) REFERENCES APPLICATION_MODULE(MODULE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE APPLICATION_INPUT
-(
- INTERFACE_ID VARCHAR(255),
- INPUT_KEY VARCHAR(255),
- INPUT_VALUE VARCHAR(255),
- DATA_TYPE VARCHAR(255),
- METADATA VARCHAR(255),
- APP_ARGUMENT VARCHAR(255),
- STANDARD_INPUT SMALLINT,
- INPUT_ORDER INTEGER,
- IS_REQUIRED SMALLINT,
- REQUIRED_TO_COMMANDLINE SMALLINT,
- DATA_STAGED SMALLINT,
- USER_FRIENDLY_DESC VARCHAR(255),
- PRIMARY KEY(INTERFACE_ID,INPUT_KEY),
- FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE(INTERFACE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE APPLICATION_OUTPUT
-(
- INTERFACE_ID VARCHAR(255),
- 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),
- PRIMARY KEY(INTERFACE_ID,OUTPUT_KEY),
- FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE(INTERFACE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE GATEWAY_PROFILE
-(
- GATEWAY_ID VARCHAR(255),
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY(GATEWAY_ID)
-);
-
-CREATE TABLE COMPUTE_RESOURCE_PREFERENCE
-(
- GATEWAY_ID VARCHAR(255),
- RESOURCE_ID VARCHAR(255),
- 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),
- PRIMARY KEY(GATEWAY_ID,RESOURCE_ID),
- FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE,
- FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY_PROFILE(GATEWAY_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE 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,
- PRIMARY KEY (COMPUTE_RESOURCE_ID,QUEUE_NAME),
- FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE COMPUTE_RESOURCE_FILE_SYSTEM
-(
- COMPUTE_RESOURCE_ID VARCHAR (255) NOT NULL,
- PATH VARCHAR (255),
- FILE_SYSTEM VARCHAR (255) NOT NULL,
- PRIMARY KEY (COMPUTE_RESOURCE_ID,FILE_SYSTEM),
- FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
- );
-
-CREATE TABLE JOB_SUBMISSION_INTERFACE
-(
- JOB_SUBMISSION_INTERFACE_ID VARCHAR (255) NOT NULL,
- COMPUTE_RESOURCE_ID VARCHAR (255) NOT NULL,
- JOB_SUBMISSION_PROTOCOL VARCHAR (255) NOT NULL,
- PRIORITY_ORDER INTEGER,
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (COMPUTE_RESOURCE_ID,JOB_SUBMISSION_INTERFACE_ID),
- FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE DATA_MOVEMENT_INTERFACE
-(
- COMPUTE_RESOURCE_ID VARCHAR (255) NOT NULL,
- DATA_MOVEMENT_PROTOCOL VARCHAR (255) NOT NULL,
- DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
- PRIORITY_ORDER INTEGER,
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (COMPUTE_RESOURCE_ID,DATA_MOVEMENT_INTERFACE_ID),
- FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE JOB_MANAGER_COMMAND
-(
- RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL,
- COMMAND_TYPE VARCHAR (255) NOT NULL,
- COMMAND VARCHAR (255),
- PRIMARY KEY (RESOURCE_JOB_MANAGER_ID,COMMAND_TYPE),
- FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE LOCAL_SUBMISSION
-(
- RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL,
- JOB_SUBMISSION_INTERFACE_ID VARCHAR (255) NOT NULL,
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (JOB_SUBMISSION_INTERFACE_ID),
- FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID)
- );
-
-CREATE TABLE LOCAL_DATA_MOVEMENT
-(
- DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
- PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID)
-);
-
-CREATE TABLE WORKFLOW
-(
- WF_TEMPLATE_ID VARCHAR (255) NOT NULL,
- WF_NAME VARCHAR (255) NOT NULL,
- GRAPH CLOB,
- OWNER VARCHAR(255),
- GATEWAY_ID VARCHAR(255),
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- IMAGE BLOB,
- PRIMARY KEY (WF_TEMPLATE_ID)
-);
-
-CREATE TABLE WORKFLOW_INPUT
-(
- WF_TEMPLATE_ID VARCHAR(255),
- INPUT_KEY VARCHAR(255),
- INPUT_VALUE CLOB,
- DATA_TYPE VARCHAR(255),
- METADATA VARCHAR(255),
- APP_ARGUMENT VARCHAR(255),
- STANDARD_INPUT SMALLINT,
- USER_FRIENDLY_DESC VARCHAR(255),
- PRIMARY KEY(WF_TEMPLATE_ID,INPUT_KEY),
- FOREIGN KEY (WF_TEMPLATE_ID) REFERENCES WORKFLOW(WF_TEMPLATE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE WORKFLOW_OUTPUT
-(
- WF_TEMPLATE_ID VARCHAR(255),
- OUTPUT_KEY VARCHAR(255),
- OUTPUT_VALUE CLOB,
- DATA_TYPE VARCHAR(255),
- PRIMARY KEY(WF_TEMPLATE_ID,OUTPUT_KEY),
- FOREIGN KEY (WF_TEMPLATE_ID) REFERENCES WORKFLOW(WF_TEMPLATE_ID) ON DELETE CASCADE
-);
-
-
-
-CREATE TABLE CONFIGURATION
-(
- CONFIG_KEY VARCHAR(255),
- CONFIG_VAL VARCHAR(255),
- PRIMARY KEY(CONFIG_KEY, CONFIG_VAL)
-);
-
-INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL) VALUES('app_catalog_version', '0.15');
-
-
-
http://git-wip-us.apache.org/repos/asf/airavata/blob/50e04f13/airavata-api/airavata-api-server/src/test/resources/expcatalog-derby.sql
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/test/resources/expcatalog-derby.sql b/airavata-api/airavata-api-server/src/test/resources/expcatalog-derby.sql
deleted file mode 100644
index 7ab3755..0000000
--- a/airavata-api/airavata-api-server/src/test/resources/expcatalog-derby.sql
+++ /dev/null
@@ -1,391 +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),
- PRIMARY KEY (GATEWAY_ID)
-);
-
-CREATE TABLE CONFIGURATION
-(
- CONFIG_KEY VARCHAR(255),
- CONFIG_VAL VARCHAR(255),
- EXPIRE_DATE TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- CATEGORY_ID VARCHAR (255),
- PRIMARY KEY(CONFIG_KEY, CONFIG_VAL, CATEGORY_ID)
-);
-
-INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL, EXPIRE_DATE, CATEGORY_ID) VALUES('registry.version', '0.15', CURRENT_TIMESTAMP ,'SYSTEM');
-
-CREATE TABLE USERS
-(
- USER_NAME VARCHAR(255),
- PASSWORD VARCHAR(255),
- PRIMARY KEY(USER_NAME)
-);
-
-CREATE TABLE GATEWAY_WORKER
-(
- GATEWAY_ID VARCHAR(255),
- USER_NAME VARCHAR(255),
- PRIMARY KEY (GATEWAY_ID, USER_NAME),
- FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID) ON DELETE CASCADE,
- FOREIGN KEY (USER_NAME) REFERENCES USERS(USER_NAME) ON DELETE CASCADE
-);
-
-CREATE TABLE PROJECT
-(
- GATEWAY_ID VARCHAR(255),
- USER_NAME VARCHAR(255) NOT NULL,
- PROJECT_ID VARCHAR(255),
- PROJECT_NAME VARCHAR(255) NOT NULL,
- DESCRIPTION VARCHAR(255),
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- PRIMARY KEY (PROJECT_ID),
- FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID) ON DELETE CASCADE,
- FOREIGN KEY (USER_NAME) REFERENCES USERS(USER_NAME) ON DELETE CASCADE
-);
-
-CREATE TABLE PROJECT_USER
-(
- PROJECT_ID VARCHAR(255),
- USER_NAME VARCHAR(255),
- PRIMARY KEY (PROJECT_ID,USER_NAME),
- FOREIGN KEY (PROJECT_ID) REFERENCES PROJECT(PROJECT_ID) ON DELETE CASCADE,
- FOREIGN KEY (USER_NAME) REFERENCES USERS(USER_NAME) ON DELETE CASCADE
-);
-
-CREATE TABLE EXPERIMENT
-(
- EXPERIMENT_ID VARCHAR(255),
- GATEWAY_ID VARCHAR(255),
- EXECUTION_USER VARCHAR(255) NOT NULL,
- PROJECT_ID VARCHAR(255) NOT NULL,
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- EXPERIMENT_NAME VARCHAR(255) NOT NULL,
- EXPERIMENT_DESCRIPTION VARCHAR(255),
- APPLICATION_ID VARCHAR(255),
- APPLICATION_VERSION VARCHAR(255),
- WORKFLOW_TEMPLATE_ID VARCHAR(255),
- WORKFLOW_TEMPLATE_VERSION VARCHAR(255),
- WORKFLOW_EXECUTION_ID VARCHAR(255),
- ALLOW_NOTIFICATION SMALLINT,
- GATEWAY_EXECUTION_ID VARCHAR(255),
- PRIMARY KEY(EXPERIMENT_ID),
- FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID) ON DELETE CASCADE,
- FOREIGN KEY (EXECUTION_USER) REFERENCES USERS(USER_NAME) ON DELETE CASCADE,
- FOREIGN KEY (PROJECT_ID) REFERENCES PROJECT(PROJECT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE EXPERIMENT_INPUT
-(
- EXPERIMENT_ID VARCHAR(255),
- INPUT_KEY VARCHAR(255) NOT NULL,
- DATA_TYPE VARCHAR(255),
- METADATA VARCHAR(255),
- APP_ARGUMENT VARCHAR(255),
- STANDARD_INPUT SMALLINT,
- USER_FRIENDLY_DESC VARCHAR(255),
- VALUE CLOB,
- INPUT_ORDER INTEGER,
- IS_REQUIRED SMALLINT,
- REQUIRED_TO_COMMANDLINE SMALLINT,
- DATA_STAGED SMALLINT,
- PRIMARY KEY(EXPERIMENT_ID,INPUT_KEY),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE EXPERIMENT_OUTPUT
-(
- EXPERIMENT_ID VARCHAR(255),
- OUTPUT_KEY VARCHAR(255) NOT NULL,
- DATA_TYPE VARCHAR(255),
- VALUE CLOB,
- IS_REQUIRED SMALLINT,
- REQUIRED_TO_COMMANDLINE SMALLINT,
- DATA_MOVEMENT SMALLINT,
- DATA_NAME_LOCATION VARCHAR(255),
- SEARCH_QUERY VARCHAR(255),
- APP_ARGUMENT VARCHAR(255),
- PRIMARY KEY(EXPERIMENT_ID,OUTPUT_KEY),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
-);
-
-
-CREATE TABLE WORKFLOW_NODE_DETAIL
-(
- EXPERIMENT_ID VARCHAR(255) NOT NULL,
- NODE_INSTANCE_ID VARCHAR(255),
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- NODE_NAME VARCHAR(255) NOT NULL,
- EXECUTION_UNIT VARCHAR(255) NOT NULL,
- EXECUTION_UNIT_DATA VARCHAR(255),
- PRIMARY KEY(NODE_INSTANCE_ID),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE TASK_DETAIL
-(
- TASK_ID VARCHAR(255),
- NODE_INSTANCE_ID VARCHAR(255),
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- APPLICATION_ID VARCHAR(255),
- APPLICATION_VERSION VARCHAR(255),
- APPLICATION_DEPLOYMENT_ID VARCHAR(255),
- ALLOW_NOTIFICATION SMALLINT,
- PRIMARY KEY(TASK_ID),
- FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE NOTIFICATION_EMAIL
-(
- EMAIL_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY,
- EXPERIMENT_ID VARCHAR(255),
- TASK_ID VARCHAR(255),
- EMAIL_ADDRESS VARCHAR(255),
- PRIMARY KEY(EMAIL_ID),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE,
- FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE ERROR_DETAIL
-(
- ERROR_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY,
- EXPERIMENT_ID VARCHAR(255),
- TASK_ID VARCHAR(255),
- NODE_INSTANCE_ID VARCHAR(255),
- JOB_ID VARCHAR(255),
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- ACTUAL_ERROR_MESSAGE CLOB,
- USER_FRIEDNLY_ERROR_MSG VARCHAR(255),
- TRANSIENT_OR_PERSISTENT SMALLINT,
- ERROR_CATEGORY VARCHAR(255),
- CORRECTIVE_ACTION VARCHAR(255),
- ACTIONABLE_GROUP VARCHAR(255),
- PRIMARY KEY(ERROR_ID),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE,
- FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE,
- FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE APPLICATION_INPUT
-(
- TASK_ID VARCHAR(255),
- INPUT_KEY VARCHAR(255) NOT NULL,
- DATA_TYPE VARCHAR(255),
- METADATA VARCHAR(255),
- APP_ARGUMENT VARCHAR(255),
- STANDARD_INPUT SMALLINT,
- USER_FRIENDLY_DESC VARCHAR(255),
- VALUE CLOB,
- INPUT_ORDER INTEGER,
- IS_REQUIRED SMALLINT,
- REQUIRED_TO_COMMANDLINE SMALLINT,
- DATA_STAGED SMALLINT,
- PRIMARY KEY(TASK_ID,INPUT_KEY),
- FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE APPLICATION_OUTPUT
-(
- TASK_ID VARCHAR(255),
- OUTPUT_KEY VARCHAR(255) NOT NULL,
- DATA_TYPE VARCHAR(255),
- VALUE CLOB,
- IS_REQUIRED SMALLINT,
- REQUIRED_TO_COMMANDLINE SMALLINT,
- DATA_MOVEMENT SMALLINT,
- DATA_NAME_LOCATION VARCHAR(255),
- SEARCH_QUERY VARCHAR(255),
- APP_ARGUMENT VARCHAR(255),
- PRIMARY KEY(TASK_ID,OUTPUT_KEY),
- FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE NODE_INPUT
-(
- NODE_INSTANCE_ID VARCHAR(255),
- INPUT_KEY VARCHAR(255) NOT NULL,
- DATA_TYPE VARCHAR(255),
- METADATA VARCHAR(255),
- APP_ARGUMENT VARCHAR(255),
- STANDARD_INPUT SMALLINT,
- USER_FRIENDLY_DESC VARCHAR(255),
- VALUE VARCHAR(255),
- INPUT_ORDER INTEGER,
- IS_REQUIRED SMALLINT,
- REQUIRED_TO_COMMANDLINE SMALLINT,
- DATA_STAGED SMALLINT,
- PRIMARY KEY(NODE_INSTANCE_ID,INPUT_KEY),
- FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE NODE_OUTPUT
-(
- NODE_INSTANCE_ID VARCHAR(255),
- OUTPUT_KEY VARCHAR(255) NOT NULL,
- DATA_TYPE VARCHAR(255),
- VALUE 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),
- PRIMARY KEY(NODE_INSTANCE_ID,OUTPUT_KEY),
- FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE JOB_DETAIL
-(
- JOB_ID VARCHAR(255),
- TASK_ID VARCHAR(255),
- JOB_DESCRIPTION CLOB NOT NULL,
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- COMPUTE_RESOURCE_CONSUMED VARCHAR(255),
- JOBNAME VARCHAR (255),
- WORKING_DIR VARCHAR(255),
- PRIMARY KEY (TASK_ID, JOB_ID),
- FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE DATA_TRANSFER_DETAIL
-(
- TRANSFER_ID VARCHAR(255),
- TASK_ID VARCHAR(255),
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- TRANSFER_DESC VARCHAR(255) NOT NULL,
- PRIMARY KEY(TRANSFER_ID),
- FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE STATUS
-(
- STATUS_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY,
- EXPERIMENT_ID VARCHAR(255),
- NODE_INSTANCE_ID VARCHAR(255),
- TRANSFER_ID VARCHAR(255),
- TASK_ID VARCHAR(255),
- JOB_ID VARCHAR(255),
- STATE VARCHAR(255),
- STATUS_UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- STATUS_TYPE VARCHAR(255),
- PRIMARY KEY(STATUS_ID),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE,
- FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE,
- FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE,
- FOREIGN KEY (TRANSFER_ID) REFERENCES DATA_TRANSFER_DETAIL(TRANSFER_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE CONFIG_DATA
-(
- EXPERIMENT_ID VARCHAR(255),
- AIRAVATA_AUTO_SCHEDULE SMALLINT NOT NULL,
- OVERRIDE_MANUAL_SCHEDULE_PARAMS SMALLINT NOT NULL,
- SHARE_EXPERIMENT SMALLINT,
- USER_DN VARCHAR(255),
- GENERATE_CERT SMALLINT,
- PRIMARY KEY(EXPERIMENT_ID)
-);
-
-CREATE TABLE COMPUTATIONAL_RESOURCE_SCHEDULING
-(
- RESOURCE_SCHEDULING_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY,
- EXPERIMENT_ID VARCHAR(255),
- TASK_ID VARCHAR(255),
- RESOURCE_HOST_ID VARCHAR(255),
- CPU_COUNT INTEGER,
- NODE_COUNT INTEGER,
- NO_OF_THREADS INTEGER,
- QUEUE_NAME VARCHAR(255),
- WALLTIME_LIMIT INTEGER,
- JOB_START_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- TOTAL_PHYSICAL_MEMORY INTEGER,
- COMPUTATIONAL_PROJECT_ACCOUNT VARCHAR(255),
- CHESSIS_NAME VARCHAR(255),
- PRIMARY KEY(RESOURCE_SCHEDULING_ID),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE,
- FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE ADVANCE_INPUT_DATA_HANDLING
-(
- INPUT_DATA_HANDLING_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY,
- EXPERIMENT_ID VARCHAR(255),
- TASK_ID VARCHAR(255),
- WORKING_DIR_PARENT VARCHAR(255),
- UNIQUE_WORKING_DIR VARCHAR(255),
- STAGE_INPUT_FILES_TO_WORKING_DIR SMALLINT,
- CLEAN_AFTER_JOB SMALLINT,
- PRIMARY KEY(INPUT_DATA_HANDLING_ID),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE,
- FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE ADVANCE_OUTPUT_DATA_HANDLING
-(
- OUTPUT_DATA_HANDLING_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY,
- EXPERIMENT_ID VARCHAR(255),
- TASK_ID VARCHAR(255),
- OUTPUT_DATA_DIR VARCHAR(255),
- DATA_REG_URL VARCHAR (255),
- PERSIST_OUTPUT_DATA SMALLINT,
- PRIMARY KEY(OUTPUT_DATA_HANDLING_ID),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE,
- FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE QOS_PARAM
-(
- QOS_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY,
- EXPERIMENT_ID VARCHAR(255),
- TASK_ID VARCHAR(255),
- START_EXECUTION_AT VARCHAR(255),
- EXECUTE_BEFORE VARCHAR(255),
- NO_OF_RETRIES INTEGER,
- PRIMARY KEY(QOS_ID),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE,
- FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE COMMUNITY_USER
-(
- GATEWAY_ID VARCHAR(256) NOT NULL,
- COMMUNITY_USER_NAME VARCHAR(256) NOT NULL,
- TOKEN_ID VARCHAR(256) NOT NULL,
- COMMUNITY_USER_EMAIL VARCHAR(256) NOT NULL,
- PRIMARY KEY (GATEWAY_ID, COMMUNITY_USER_NAME, TOKEN_ID)
-);
-
-CREATE TABLE CREDENTIALS
-(
- GATEWAY_ID VARCHAR(256) NOT NULL,
- TOKEN_ID VARCHAR(256) NOT NULL,
- CREDENTIAL BLOB NOT NULL,
- PORTAL_USER_ID VARCHAR(256) NOT NULL,
- TIME_PERSISTED TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- PRIMARY KEY (GATEWAY_ID, TOKEN_ID)
-);
-
-
http://git-wip-us.apache.org/repos/asf/airavata/blob/50e04f13/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
index 6488afb..6fc1822 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
@@ -594,7 +594,7 @@ public class WorkerResource extends AbstractExpCatResource {
EntityManager em = null;
try {
String query = "SELECT e FROM ExperimentSummary e " +
- "WHERE e.expId=s.expId AND ";
+ "WHERE ";
if (filters.get(ExperimentStatusConstants.STATE) != null) {
String experimentState = ExperimentState.valueOf(filters.get(ExperimentStatusConstants.STATE)).toString();
query += "e.state='" + experimentState + "' AND ";
http://git-wip-us.apache.org/repos/asf/airavata/blob/50e04f13/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql b/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
index 0b0f0e4..b3af3f7 100644
--- a/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
+++ b/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
@@ -455,7 +455,7 @@ CREATE TABLE CONFIGURATION
PRIMARY KEY(CONFIG_KEY, CONFIG_VAL)
);
-INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL) VALUES('app_catalog_version', '0.15');
+INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL) VALUES('app_catalog_version', '0.16');
http://git-wip-us.apache.org/repos/asf/airavata/blob/50e04f13/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql b/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
index 9599efc..5e869df 100644
--- a/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
+++ b/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
@@ -450,5 +450,5 @@ CREATE TABLE CONFIGURATION
PRIMARY KEY(CONFIG_KEY, CONFIG_VAL)
);
-INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL) VALUES('app_catalog_version', '0.15');
+INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL) VALUES('app_catalog_version', '0.16');
http://git-wip-us.apache.org/repos/asf/airavata/blob/50e04f13/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql b/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
index ac8c913..80334e5 100644
--- a/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
+++ b/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
@@ -329,4 +329,4 @@ CREATE TABLE CONFIGURATION
PRIMARY KEY(CONFIG_KEY, CONFIG_VAL, CATEGORY_ID)
);
-INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL, EXPIRE_DATE, CATEGORY_ID) VALUES('registry.version', '0.15', CURRENT_TIMESTAMP ,'SYSTEM');
\ No newline at end of file
+INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL, EXPIRE_DATE, CATEGORY_ID) VALUES('registry.version', '0.16', CURRENT_TIMESTAMP ,'SYSTEM');
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/50e04f13/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql b/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
index ffb5d16..1c8dc48 100644
--- a/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
+++ b/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
@@ -332,4 +332,4 @@ CREATE TABLE CONFIGURATION
PRIMARY KEY(CONFIG_KEY, CONFIG_VAL, CATEGORY_ID)
);
-INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL, EXPIRE_DATE, CATEGORY_ID) VALUES('registry.version', '0.15', NOW() ,'SYSTEM');
\ No newline at end of file
+INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL, EXPIRE_DATE, CATEGORY_ID) VALUES('registry.version', '0.16', NOW() ,'SYSTEM');
\ No newline at end of file