Updated Branches:
refs/heads/master 0f06c3c55 -> 10b41d864
http://git-wip-us.apache.org/repos/asf/airavata/blob/10b41d86/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkerResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkerResourceTest.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkerResourceTest.java
index 245273d..502ac6d 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkerResourceTest.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkerResourceTest.java
@@ -31,7 +31,7 @@ public class WorkerResourceTest extends AbstractResourceTest {
private WorkerResource workerResource;
private ProjectResource testProject;
private UserWorkflowResource userWorkflowResource;
- private ExperimentResource experimentResource;
+ private ExperimentMetadataResource experimentResource;
@Override
public void setUp() throws Exception {
@@ -41,7 +41,7 @@ public class WorkerResourceTest extends AbstractResourceTest {
testProject = workerResource.createProject("testProject");
userWorkflowResource = workerResource.createWorkflowTemplate("workflow1");
- experimentResource = (ExperimentResource) workerResource.create(ResourceType.EXPERIMENT);
+ experimentResource = (ExperimentMetadataResource) workerResource.create(ResourceType.EXPERIMENT_METADATA);
testProject.setGateway(gatewayResource);
testProject.save();
@@ -52,12 +52,13 @@ public class WorkerResourceTest extends AbstractResourceTest {
experimentResource.setGateway(gatewayResource);
experimentResource.setExpID("testExpID");
+ experimentResource.setExperimentName("testExpID");
experimentResource.setProject(testProject);
- Calendar calender = Calendar.getInstance();
- java.util.Date d = calender.getTime();
- Timestamp currentTime = new Timestamp(d.getTime());
- experimentResource.setSubmittedDate(currentTime);
+ experimentResource.setExecutionUser(workerResource.getUser());
+ experimentResource.setSubmittedDate(getCurrentTimestamp());
experimentResource.save();
+
+
}
public void testCreate() throws Exception {
@@ -68,13 +69,13 @@ public class WorkerResourceTest extends AbstractResourceTest {
public void testGet() throws Exception {
assertNotNull("project resource retrieved successfully", workerResource.get(ResourceType.PROJECT, "testProject"));
assertNotNull("user workflow retrieved successfully", workerResource.get(ResourceType.USER_WORKFLOW, "workflow1"));
- assertNotNull("experiment retrieved successfully", workerResource.get(ResourceType.EXPERIMENT, "testExpID"));
+ assertNotNull("experiment retrieved successfully", workerResource.get(ResourceType.EXPERIMENT_METADATA, "testExpID"));
}
public void testGetList() throws Exception {
assertNotNull("project resources retrieved successfully", workerResource.get(ResourceType.PROJECT));
assertNotNull("user workflows retrieved successfully", workerResource.get(ResourceType.USER_WORKFLOW));
- assertNotNull("experiments retrieved successfully", workerResource.get(ResourceType.EXPERIMENT));
+ assertNotNull("experiments retrieved successfully", workerResource.get(ResourceType.EXPERIMENT_METADATA));
}
@@ -87,29 +88,28 @@ public class WorkerResourceTest extends AbstractResourceTest {
}
public void testRemove() throws Exception {
- workerResource.removeProject("testProject");
workerResource.removeWorkflowTemplate("workflow1");
- workerResource.removeExperiment("testExpID");
+// workerResource.removeExperiment("testExpID");
+// workerResource.removeProject("testProject");
- assertTrue("project has been removed successfully", !workerResource.isProjectExists("testProject"));
- assertTrue("experiment has been removed successfully", !workerResource.isExperimentExists("testExpID"));
assertTrue("user workflow has been removed successfully", !workerResource.isWorkflowTemplateExists("workflow1"));
-
- testProject.setGateway(gatewayResource);
- testProject.save();
-
- userWorkflowResource.setGateway(gatewayResource);
- userWorkflowResource.setContent("testContent");
- userWorkflowResource.save();
-
- experimentResource.setGateway(gatewayResource);
- experimentResource.setExpID("testExpID");
- experimentResource.setProject(testProject);
- Calendar calender = Calendar.getInstance();
- java.util.Date d = calender.getTime();
- Timestamp currentTime = new Timestamp(d.getTime());
- experimentResource.setSubmittedDate(currentTime);
- experimentResource.save();
+// assertTrue("experiment has been removed successfully", !workerResource.isExperimentExists("testExpID"));
+
+// assertTrue("project has been removed successfully", !workerResource.isProjectExists("testProject"));
+
+
+// testProject.setGateway(gatewayResource);
+// testProject.save();
+//
+// userWorkflowResource.setGateway(gatewayResource);
+// userWorkflowResource.setContent("testContent");
+// userWorkflowResource.save();
+//
+// experimentResource.setGateway(gatewayResource);
+// experimentResource.setExpID("testExpID");
+// experimentResource.setProject(testProject);
+// experimentResource.setSubmittedDate(getCurrentTimestamp());
+// experimentResource.save();
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/10b41d86/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkflowDataResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkflowDataResourceTest.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkflowDataResourceTest.java
index 95518b6..3ddf9b1 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkflowDataResourceTest.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkflowDataResourceTest.java
@@ -27,7 +27,7 @@ import java.sql.Timestamp;
import java.util.Calendar;
public class WorkflowDataResourceTest extends AbstractResourceTest {
- private ExperimentDataResource experimentDataResource;
+ private ExperimentMetadataResource experimentResource;
private WorkflowDataResource workflowDataResource;
private NodeDataResource nodeDataResource;
private GramDataResource gramDataResource;
@@ -38,18 +38,14 @@ public class WorkflowDataResourceTest extends AbstractResourceTest {
GatewayResource gatewayResource = super.getGatewayResource();
WorkerResource workerResource = super.getWorkerResource();
- ExperimentResource experimentResource = (ExperimentResource) gatewayResource.create(ResourceType.EXPERIMENT);
+ experimentResource = (ExperimentMetadataResource) gatewayResource.create(ResourceType.EXPERIMENT_METADATA);
experimentResource.setExpID("testExpID");
- experimentResource.setWorker(workerResource);
+ experimentResource.setExperimentName("testExpID");
+ experimentResource.setExecutionUser(workerResource.getUser());
experimentResource.setProject(new ProjectResource(workerResource, gatewayResource, "testProject"));
experimentResource.save();
- experimentDataResource = (ExperimentDataResource) experimentResource.create(ResourceType.EXPERIMENT_DATA);
- experimentDataResource.setExpName("testExpID");
- experimentDataResource.setUserName(workerResource.getUser());
- experimentDataResource.save();
-
- workflowDataResource = (WorkflowDataResource) experimentDataResource.create(ResourceType.WORKFLOW_DATA);
+ workflowDataResource = (WorkflowDataResource) experimentResource.create(ResourceType.WORKFLOW_DATA);
workflowDataResource.setWorkflowInstanceID("testWFInstance");
workflowDataResource.setTemplateName("testTemplate");
workflowDataResource.setExperimentID("testExpID");
@@ -98,7 +94,7 @@ public class WorkflowDataResourceTest extends AbstractResourceTest {
}
public void testSave() throws Exception {
- assertTrue("workflow data saved successfully", experimentDataResource.isWorkflowInstancePresent("testWFInstance"));
+ assertTrue("workflow data saved successfully", experimentResource.isExists(ResourceType.WORKFLOW_DATA, "testWFInstance"));
}
@Override
http://git-wip-us.apache.org/repos/asf/airavata/blob/10b41d86/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java
index 848faf0..f2a2987 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java
@@ -43,7 +43,7 @@ import java.util.StringTokenizer;
public class Initialize {
private static final Logger logger = LoggerFactory.getLogger(Initialize.class);
public static final String DERBY_SERVER_MODE_SYS_PROPERTY = "derby.drda.startNetworkServer";
- public String scriptName = "data-derby.sql";
+ public String scriptName = "airavata-registry-derby.sql";
private NetworkServerControl server;
private static final String delimiter = ";";
public static final String PERSISTANT_DATA = "Configuration";
http://git-wip-us.apache.org/repos/asf/airavata/blob/10b41d86/modules/registry/airavata-jpa-registry/src/test/resources/airavata-registry-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/resources/airavata-registry-derby.sql b/modules/registry/airavata-jpa-registry/src/test/resources/airavata-registry-derby.sql
new file mode 100644
index 0000000..c5a9065
--- /dev/null
+++ b/modules/registry/airavata-jpa-registry/src/test/resources/airavata-registry-derby.sql
@@ -0,0 +1,317 @@
+/*
+ *
+ * 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_NAME VARCHAR(255),
+ OWNER VARCHAR(255),
+ PRIMARY KEY (GATEWAY_NAME)
+);
+
+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.12', CURRENT_TIMESTAMP ,'SYSTEM');
+
+CREATE TABLE USERS
+(
+ USER_NAME VARCHAR(255),
+ PASSWORD VARCHAR(255),
+ PRIMARY KEY(USER_NAME)
+);
+
+CREATE TABLE GATEWAY_WORKER
+(
+ GATEWAY_NAME VARCHAR(255),
+ USER_NAME VARCHAR(255),
+ PRIMARY KEY (GATEWAY_NAME, USER_NAME),
+ FOREIGN KEY (GATEWAY_NAME) REFERENCES GATEWAY(GATEWAY_NAME) ON DELETE CASCADE,
+ FOREIGN KEY (USER_NAME) REFERENCES USERS(USER_NAME) ON DELETE CASCADE
+);
+
+CREATE TABLE PROJECT
+(
+ GATEWAY_NAME VARCHAR(255),
+ USER_NAME VARCHAR(255),
+ PROJECT_NAME VARCHAR(255),
+ PRIMARY KEY (PROJECT_NAME),
+ FOREIGN KEY (GATEWAY_NAME) REFERENCES GATEWAY(GATEWAY_NAME) ON DELETE CASCADE,
+ FOREIGN KEY (USER_NAME) REFERENCES USERS(USER_NAME) ON DELETE CASCADE
+);
+
+CREATE TABLE PUBLISHED_WORKFLOW
+(
+ GATEWAY_NAME VARCHAR(255),
+ CREATED_USER VARCHAR(255),
+ PUBLISH_WORKFLOW_NAME VARCHAR(255),
+ VERSION VARCHAR(255),
+ PUBLISHED_DATE TIMESTAMP DEFAULT '0000-00-00 00:00:00',
+ PATH VARCHAR (255),
+ WORKFLOW_CONTENT BLOB,
+ PRIMARY KEY(GATEWAY_NAME, PUBLISH_WORKFLOW_NAME),
+ FOREIGN KEY (GATEWAY_NAME) REFERENCES GATEWAY(GATEWAY_NAME) ON DELETE CASCADE,
+ FOREIGN KEY (CREATED_USER) REFERENCES USERS(USER_NAME) ON DELETE CASCADE
+);
+
+CREATE TABLE USER_WORKFLOW
+(
+ GATEWAY_NAME VARCHAR(255),
+ OWNER VARCHAR(255),
+ TEMPLATE_NAME VARCHAR(255),
+ LAST_UPDATED_TIME TIMESTAMP DEFAULT CURRENT TIMESTAMP,
+ PATH VARCHAR (255),
+ WORKFLOW_GRAPH BLOB,
+ PRIMARY KEY(GATEWAY_NAME, OWNER, TEMPLATE_NAME),
+ FOREIGN KEY (GATEWAY_NAME) REFERENCES GATEWAY(GATEWAY_NAME) ON DELETE CASCADE,
+ FOREIGN KEY (OWNER) REFERENCES USERS(USER_NAME) ON DELETE CASCADE
+);
+
+CREATE TABLE HOST_DESCRIPTOR
+(
+ GATEWAY_NAME VARCHAR(255),
+ UPDATED_USER VARCHAR(255),
+ HOST_DESCRIPTOR_ID VARCHAR(255),
+ HOST_DESCRIPTOR_XML BLOB,
+ PRIMARY KEY(GATEWAY_NAME, HOST_DESCRIPTOR_ID),
+ FOREIGN KEY (GATEWAY_NAME) REFERENCES GATEWAY(GATEWAY_NAME) ON DELETE CASCADE,
+ FOREIGN KEY (UPDATED_USER) REFERENCES USERS(USER_NAME) ON DELETE CASCADE
+);
+
+CREATE TABLE SERVICE_DESCRIPTOR
+(
+ GATEWAY_NAME VARCHAR(255),
+ UPDATED_USER VARCHAR(255),
+ SERVICE_DESCRIPTOR_ID VARCHAR(255),
+ SERVICE_DESCRIPTOR_XML BLOB,
+ PRIMARY KEY(GATEWAY_NAME,SERVICE_DESCRIPTOR_ID),
+ FOREIGN KEY (GATEWAY_NAME) REFERENCES GATEWAY(GATEWAY_NAME) ON DELETE CASCADE,
+ FOREIGN KEY (UPDATED_USER) REFERENCES USERS(USER_NAME) ON DELETE CASCADE
+);
+
+CREATE TABLE APPLICATION_DESCRIPTOR
+(
+ GATEWAY_NAME VARCHAR(255),
+ UPDATED_USER VARCHAR(255),
+ APPLICATION_DESCRIPTOR_ID VARCHAR(255),
+ HOST_DESCRIPTOR_ID VARCHAR(255),
+ SERVICE_DESCRIPTOR_ID VARCHAR(255),
+ APPLICATION_DESCRIPTOR_XML BLOB,
+ PRIMARY KEY(GATEWAY_NAME,APPLICATION_DESCRIPTOR_ID),
+ FOREIGN KEY (GATEWAY_NAME) REFERENCES GATEWAY(GATEWAY_NAME) ON DELETE CASCADE,
+ FOREIGN KEY (UPDATED_USER) REFERENCES USERS(USER_NAME) ON DELETE CASCADE
+);
+
+CREATE TABLE EXPERIMENT_METADATA
+(
+ EXPERIMENT_ID VARCHAR(255) NOT NULL,
+ EXPERIMENT_NAME VARCHAR(255) NOT NULL,
+ DESCRIPTION VARCHAR(255),
+ SUBMITTED_DATE TIMESTAMP DEFAULT CURRENT TIMESTAMP,
+ EXECUTION_USER VARCHAR(255),
+ GATEWAY_NAME VARCHAR(255),
+ PROJECT_NAME VARCHAR(255),
+ SHARE_EXPERIMENT SMALLINT,
+ PRIMARY KEY (EXPERIMENT_ID),
+ FOREIGN KEY (GATEWAY_NAME) REFERENCES GATEWAY(GATEWAY_NAME) ON DELETE CASCADE,
+ FOREIGN KEY (PROJECT_NAME) REFERENCES PROJECT(PROJECT_NAME) ON DELETE CASCADE
+);
+
+CREATE TABLE EXPERIMENT_SUMMARY
+(
+ EXPERIMENT_ID VARCHAR(255) NOT NULL,
+ STATUS VARCHAR(255),
+ LAST_UPDATED_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ PRIMARY KEY(EXPERIMENT_ID),
+ FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT_METADATA(EXPERIMENT_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE EXPERIMENT_CONFIGURATION_DATA
+(
+ EXPERIMENT_ID VARCHAR(255) NOT NULL,
+ RESOURCE_HOST_ID VARCHAR (255),
+ TOTAL_CPU_COUNT INTEGER,
+ NODE_COUNT INTEGER,
+ NUMBER_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),
+ AIRAVATA_AUTO_SCHEDULE SMALLINT,
+ OVERRIDE_MANUAL_SCHEDULE_PARAMS SMALLINT,
+ WORKING_DIR VARCHAR(255),
+ STAGE_INPUT_FILES_TO_WORKING_DIR SMALLINT,
+ OUTPUT_DATA_DIR VARCHAR(255),
+ DATA_REG_URL VARCHAR (255),
+ PERSIST_OUTPUT_DATA SMALLINT,
+ CLEAN_AFTER_JOB SMALLINT,
+ EXPERIMENT_CONFIG_DATA BLOB,
+ PRIMARY KEY (EXPERIMENT_ID),
+ FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT_METADATA(EXPERIMENT_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE EXPERIMENT_INPUT
+(
+ EXPERIMENT_ID VARCHAR(255) NOT NULL,
+ EX_KEY VARCHAR (255) NOT NULL,
+ VALUE VARCHAR (255),
+ PRIMARY KEY (EXPERIMENT_ID, EX_KEY),
+ FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT_METADATA(EXPERIMENT_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE EXPERIMENT_OUTPUT
+(
+ EXPERIMENT_ID VARCHAR(255) NOT NULL,
+ EX_KEY VARCHAR (255) NOT NULL,
+ VALUE VARCHAR (255),
+ PRIMARY KEY (EXPERIMENT_ID, EX_KEY),
+ FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT_METADATA(EXPERIMENT_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE WORKFLOW_DATA
+(
+ EXPERIMENT_ID VARCHAR(255),
+ WORKFLOW_INSTANCE_ID VARCHAR(255),
+ TEMPLATE_NAME VARCHAR(255),
+ STATUS VARCHAR(255),
+ START_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
+ LAST_UPDATE_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ PRIMARY KEY(WORKFLOW_INSTANCE_ID),
+ FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT_METADATA(EXPERIMENT_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE NODE_DATA
+(
+ WORKFLOW_INSTANCE_ID VARCHAR(255),
+ NODE_ID VARCHAR(255),
+ NODE_TYPE VARCHAR(255),
+ INPUTS BLOB,
+ OUTPUTS BLOB,
+ STATUS VARCHAR(255),
+ START_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
+ LAST_UPDATE_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ EXECUTION_INDEX INTEGER NOT NULL,
+ PRIMARY KEY(WORKFLOW_INSTANCE_ID, NODE_ID, EXECUTION_INDEX),
+ FOREIGN KEY (WORKFLOW_INSTANCE_ID) REFERENCES WORKFLOW_DATA(WORKFLOW_INSTANCE_ID) ON DELETE CASCADE
+);
+
+-- need to remove this in future
+CREATE TABLE GRAM_DATA
+(
+ WORKFLOW_INSTANCE_ID VARCHAR(255),
+ NODE_ID VARCHAR(255),
+ RSL BLOB,
+ INVOKED_HOST VARCHAR(255),
+ LOCAL_JOB_ID VARCHAR(255),
+ PRIMARY KEY(WORKFLOW_INSTANCE_ID, NODE_ID),
+ FOREIGN KEY (WORKFLOW_INSTANCE_ID) REFERENCES WORKFLOW_DATA(WORKFLOW_INSTANCE_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE GFAC_JOB_DATA
+(
+ EXPERIMENT_ID VARCHAR(255),
+ WORKFLOW_INSTANCE_ID VARCHAR(255),
+ NODE_ID VARCHAR(255),
+ APPLICATION_DESC_ID VARCHAR(255),
+ HOST_DESC_ID VARCHAR(255),
+ SERVICE_DESC_ID VARCHAR(255),
+ JOB_DATA CLOB,
+ LOCAL_JOB_ID VARCHAR(255) NOT NULL,
+ 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_METADATA(EXPERIMENT_ID),
+ FOREIGN KEY (WORKFLOW_INSTANCE_ID) REFERENCES WORKFLOW_DATA(WORKFLOW_INSTANCE_ID)
+);
+
+CREATE TABLE GFAC_JOB_STATUS
+(
+ LOCAL_JOB_ID VARCHAR(255) NOT NULL,
+ 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)
+);
+
+
+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)
+);
+
+CREATE TABLE EXECUTION_ERROR
+(
+ ERROR_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+ EXPERIMENT_ID VARCHAR(255),
+ WORKFLOW_INSTANCE_ID VARCHAR(255),
+ NODE_ID VARCHAR(255),
+ GFAC_JOB_ID VARCHAR(255),
+ SOURCE_TYPE VARCHAR(255),
+ ERROR_DATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ ERROR_MSG CLOB,
+ ERROR_DESC 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_INSTANCE_ID) REFERENCES WORKFLOW_DATA(WORKFLOW_INSTANCE_ID) ON DELETE CASCADE,
+ FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT_METADATA(EXPERIMENT_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE ORCHESTRATOR
+(
+ EXPERIMENT_ID VARCHAR(255) NOT NULL,
+ USERNAME VARCHAR(255),
+ STATUS VARCHAR(255),
+ STATE VARCHAR(255),
+ GFAC_EPR VARCHAR(255),
+ APPLICATION_NAME VARCHAR(255),
+ JOBREQUEST CLOB,
+ SUBMITTED_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
+ STATUS_UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
+ PRIMARY KEY (EXPERIMENT_ID),
+ FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT_METADATA(EXPERIMENT_ID) ON DELETE CASCADE
+);
+
+
http://git-wip-us.apache.org/repos/asf/airavata/blob/10b41d86/modules/registry/airavata-jpa-registry/src/test/resources/data-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/resources/data-derby.sql b/modules/registry/airavata-jpa-registry/src/test/resources/data-derby.sql
deleted file mode 100644
index 9e8fc18..0000000
--- a/modules/registry/airavata-jpa-registry/src/test/resources/data-derby.sql
+++ /dev/null
@@ -1,292 +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_name varchar(255),
- owner varchar(255),
- PRIMARY KEY (gateway_name)
-);
-
-
-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.11', CURRENT_TIMESTAMP ,'SYSTEM');
-
-create table Users
-(
- user_name varchar(255),
- password varchar(255),
- PRIMARY KEY(user_name)
-);
-
-create table Gateway_Worker
-(
- gateway_name varchar(255),
- user_name varchar(255),
- PRIMARY KEY (gateway_name, user_name),
- FOREIGN KEY (gateway_name) REFERENCES Gateway(gateway_name) ON DELETE CASCADE,
- FOREIGN KEY (user_name) REFERENCES Users(user_name) ON DELETE CASCADE
-
-);
-
-create table Project
-(
- gateway_name varchar(255),
- user_name varchar(255),
- project_name varchar(255),
- PRIMARY KEY (project_name),
- FOREIGN KEY (gateway_name) REFERENCES Gateway(gateway_name) ON DELETE CASCADE,
- FOREIGN KEY (user_name) REFERENCES Users(user_name) ON DELETE CASCADE
-);
-
-create table Published_Workflow
-(
- gateway_name varchar(255),
- created_user varchar(255),
- publish_workflow_name varchar(255),
- version varchar(255),
- published_date TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- path varchar (255),
- workflow_content BLOB,
- PRIMARY KEY(gateway_name, publish_workflow_name),
- FOREIGN KEY (gateway_name) REFERENCES Gateway(gateway_name) ON DELETE CASCADE,
- FOREIGN KEY (created_user) REFERENCES Users(user_name) ON DELETE CASCADE
-);
-
-create table User_Workflow
-
-(
- gateway_name varchar(255),
- owner varchar(255),
- template_name varchar(255),
- last_updated_date TIMESTAMP DEFAULT CURRENT TIMESTAMP,
- path varchar (255),
- workflow_graph BLOB,
- PRIMARY KEY(gateway_name, owner, template_name),
- FOREIGN KEY (gateway_name) REFERENCES Gateway(gateway_name) ON DELETE CASCADE,
- FOREIGN KEY (owner) REFERENCES Users(user_name) ON DELETE CASCADE
-);
-
-
-create table Host_Descriptor
-(
- gateway_name varchar(255),
- updated_user varchar(255),
- host_descriptor_ID varchar(255),
- host_descriptor_xml BLOB,
- PRIMARY KEY(gateway_name, host_descriptor_ID),
- FOREIGN KEY (gateway_name) REFERENCES Gateway(gateway_name) ON DELETE CASCADE,
- FOREIGN KEY (updated_user) REFERENCES Users(user_name) ON DELETE CASCADE
-);
-
-create table Service_Descriptor
-(
- gateway_name varchar(255),
- updated_user varchar(255),
- service_descriptor_ID varchar(255),
- service_descriptor_xml BLOB,
- PRIMARY KEY(gateway_name,service_descriptor_ID),
- FOREIGN KEY (gateway_name) REFERENCES Gateway(gateway_name) ON DELETE CASCADE,
- FOREIGN KEY (updated_user) REFERENCES Users(user_name) ON DELETE CASCADE
-);
-
-create table Application_Descriptor
-(
- gateway_name varchar(255),
- updated_user varchar(255),
- application_descriptor_ID varchar(255),
- host_descriptor_ID varchar(255),
- service_descriptor_ID varchar(255),
- application_descriptor_xml BLOB,
- PRIMARY KEY(gateway_name,application_descriptor_ID),
- FOREIGN KEY (gateway_name) REFERENCES Gateway(gateway_name) ON DELETE CASCADE,
- FOREIGN KEY (updated_user) REFERENCES Users(user_name) ON DELETE CASCADE
-);
-
-create table Experiment
-(
- project_name varchar(255),
- gateway_name varchar(255),
- user_name varchar(255),
- experiment_ID varchar(255),
- submitted_date TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY(experiment_ID),
- FOREIGN KEY (gateway_name) REFERENCES Gateway(gateway_name) ON DELETE CASCADE,
- FOREIGN KEY (project_name) REFERENCES Project(project_name) ON DELETE CASCADE,
- FOREIGN KEY (user_name) REFERENCES Users(user_name) ON DELETE CASCADE
-);
-
-create table Experiment_Data
-(
- experiment_ID varchar(255),
- name varchar(255),
- username varchar(255),
- PRIMARY KEY (experiment_ID)
-);
-
-create table Experiment_Metadata
-(
- experiment_ID varchar(255),
- metadata BLOB,
- PRIMARY KEY (experiment_ID)
-);
-
-
-create table Workflow_Data
-(
- experiment_ID varchar(255),
- workflow_instanceID varchar(255),
- template_name varchar(255),
- status varchar(255),
- start_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- last_update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- PRIMARY KEY(workflow_instanceID),
- FOREIGN KEY (experiment_ID) REFERENCES Experiment_Data(experiment_ID) ON DELETE CASCADE
-);
-
-create table Node_Data
-(
- workflow_instanceID varchar(255),
- node_id varchar(255),
- node_type varchar(255),
- inputs BLOB,
- outputs BLOB,
- status varchar(255),
- start_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- last_update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- execution_index int NOT NULL,
- PRIMARY KEY(workflow_instanceID, node_id, execution_index),
- FOREIGN KEY (workflow_instanceID) REFERENCES Workflow_Data(workflow_instanceID) ON DELETE CASCADE
-);
-
-create table Gram_Data
-(
- workflow_instanceID varchar(255),
- node_id varchar(255),
- rsl BLOB,
- invoked_host varchar(255),
- local_Job_ID varchar(255),
- PRIMARY KEY(workflow_instanceID, node_id),
- FOREIGN KEY (workflow_instanceID) REFERENCES Workflow_Data(workflow_instanceID) 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)
-);
-
-CREATE TABLE COMMUNITY_USER
-(
- GATEWAY_NAME VARCHAR(256) NOT NULL,
- COMMUNITY_USER_NAME VARCHAR(256) NOT NULL,
- COMMUNITY_USER_EMAIL VARCHAR(256) NOT NULL,
- PRIMARY KEY (GATEWAY_NAME, COMMUNITY_USER_NAME)
-);
-
-
-CREATE TABLE CREDENTIALS
-(
- GATEWAY_NAME VARCHAR(256) NOT NULL,
- COMMUNITY_USER_NAME VARCHAR(256) NOT NULL,
- CREDENTIAL BLOB NOT NULL,
- PRIVATE_KEY BLOB NOT NULL,
- NOT_BEFORE VARCHAR(256) NOT NULL,
- NOT_AFTER VARCHAR(256) NOT NULL,
- LIFETIME INTEGER NOT NULL,
- REQUESTING_PORTAL_USER_NAME VARCHAR(256) NOT NULL,
- REQUESTED_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (GATEWAY_NAME, COMMUNITY_USER_NAME)
-);
-
-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 Orchestrator
-(
- experiment_ID varchar(255) NOT NULL,
- username varchar(255),
- status varchar(255),
- state varchar(255),
- gfacEPR varchar(255),
- applicationName varchar(255),
- jobRequest CLOB,
- submitted_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- status_update_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (experiment_ID)
-);
--- CREATE TABLE openjpa_sequence_table
--- (
--- id SMALLINT NOT NULL,
--- sequence_value BIGINT,
--- PRIMARY KEY (id)
--- );
-
-
-
-
-
http://git-wip-us.apache.org/repos/asf/airavata/blob/10b41d86/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/AiravataRegistryAPITest.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/AiravataRegistryAPITest.java b/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/AiravataRegistryAPITest.java
index 67e889f..b075075 100644
--- a/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/AiravataRegistryAPITest.java
+++ b/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/AiravataRegistryAPITest.java
@@ -1154,46 +1154,46 @@ public class AiravataRegistryAPITest extends TestCase {
}
- public void testGetExperimentMetadata() throws Exception {
- Calendar c = Calendar.getInstance();
- java.util.Date date = c.getTime();
- Date currentTime = new Date(date.getTime());
- WorkspaceProject workspaceProject = null;
- if(!registry.isWorkspaceProjectExists("testProject")) {
- workspaceProject = new WorkspaceProject("testProject", registry);
- registry.addWorkspaceProject(workspaceProject);
- }
- AiravataExperiment experiment = new AiravataExperiment();
- experiment.setExperimentId("testExp");
- experiment.setSubmittedDate(currentTime);
- registry.addExperiment("testProject", experiment);
- registry.updateExperimentMetadata("testExp", "testMetadata");
-
- assertTrue("experiment metadata retrieved successfully", registry.getExperimentMetadata("testExp").equals("testMetadata"));
- registry.removeExperiment("testExp");
- registry.deleteWorkspaceProject("testProject");
- }
-
+// public void testGetExperimentMetadata() throws Exception {
+// Calendar c = Calendar.getInstance();
+// java.util.Date date = c.getTime();
+// Date currentTime = new Date(date.getTime());
+// WorkspaceProject workspaceProject = null;
+// if(!registry.isWorkspaceProjectExists("testProject")) {
+// workspaceProject = new WorkspaceProject("testProject", registry);
+// registry.addWorkspaceProject(workspaceProject);
+// }
+// AiravataExperiment experiment = new AiravataExperiment();
+// experiment.setExperimentId("testExp");
+// experiment.setSubmittedDate(currentTime);
+// registry.addExperiment("testProject", experiment);
+// registry.updateExperimentMetadata("testExp", "testMetadata");
+//
+// assertTrue("experiment metadata retrieved successfully", registry.getExperimentMetadata("testExp").equals("testMetadata"));
+// registry.removeExperiment("testExp");
+// registry.deleteWorkspaceProject("testProject");
+// }
- public void testUpdateExperimentMetadata() throws Exception {
- Calendar c = Calendar.getInstance();
- java.util.Date date = c.getTime();
- Date currentTime = new Date(date.getTime());
- WorkspaceProject workspaceProject = null;
- if(!registry.isWorkspaceProjectExists("testProject")) {
- workspaceProject = new WorkspaceProject("testProject", registry);
- registry.addWorkspaceProject(workspaceProject);
- }
- AiravataExperiment experiment = new AiravataExperiment();
- experiment.setExperimentId("testExp");
- experiment.setSubmittedDate(currentTime);
- registry.addExperiment("testProject", experiment);
- registry.updateExperimentMetadata("testExp", "testMetadata");
- assertTrue("experiment metadata updated successfully", registry.getExperimentMetadata("testExp").equals("testMetadata"));
- registry.removeExperiment("testExp");
- registry.deleteWorkspaceProject("testProject");
- }
+// public void testUpdateExperimentMetadata() throws Exception {
+// Calendar c = Calendar.getInstance();
+// java.util.Date date = c.getTime();
+// Date currentTime = new Date(date.getTime());
+// WorkspaceProject workspaceProject = null;
+// if(!registry.isWorkspaceProjectExists("testProject")) {
+// workspaceProject = new WorkspaceProject("testProject", registry);
+// registry.addWorkspaceProject(workspaceProject);
+// }
+// AiravataExperiment experiment = new AiravataExperiment();
+// experiment.setExperimentId("testExp");
+// experiment.setSubmittedDate(currentTime);
+// registry.addExperiment("testProject", experiment);
+// registry.updateExperimentMetadata("testExp", "testMetadata");
+//
+// assertTrue("experiment metadata updated successfully", registry.getExperimentMetadata("testExp").equals("testMetadata"));
+// registry.removeExperiment("testExp");
+// registry.deleteWorkspaceProject("testProject");
+// }
public void testGetWorkflowExecutionTemplateName() throws Exception {
http://git-wip-us.apache.org/repos/asf/airavata/blob/10b41d86/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/util/Initialize.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/util/Initialize.java b/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/util/Initialize.java
index 9299690..95238a6 100644
--- a/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/util/Initialize.java
+++ b/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/util/Initialize.java
@@ -164,7 +164,7 @@ public class Initialize {
BufferedReader reader = null;
try{
- InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("data-derby.sql");
+ InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("airavata-registry-derby.sql");
reader = new BufferedReader(new InputStreamReader(inputStream));
String line;
while ((line = reader.readLine()) != null) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/10b41d86/modules/registry/airavata-registry-test/src/test/resources/airavata-registry-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-registry-test/src/test/resources/airavata-registry-derby.sql b/modules/registry/airavata-registry-test/src/test/resources/airavata-registry-derby.sql
new file mode 100644
index 0000000..c5a9065
--- /dev/null
+++ b/modules/registry/airavata-registry-test/src/test/resources/airavata-registry-derby.sql
@@ -0,0 +1,317 @@
+/*
+ *
+ * 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_NAME VARCHAR(255),
+ OWNER VARCHAR(255),
+ PRIMARY KEY (GATEWAY_NAME)
+);
+
+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.12', CURRENT_TIMESTAMP ,'SYSTEM');
+
+CREATE TABLE USERS
+(
+ USER_NAME VARCHAR(255),
+ PASSWORD VARCHAR(255),
+ PRIMARY KEY(USER_NAME)
+);
+
+CREATE TABLE GATEWAY_WORKER
+(
+ GATEWAY_NAME VARCHAR(255),
+ USER_NAME VARCHAR(255),
+ PRIMARY KEY (GATEWAY_NAME, USER_NAME),
+ FOREIGN KEY (GATEWAY_NAME) REFERENCES GATEWAY(GATEWAY_NAME) ON DELETE CASCADE,
+ FOREIGN KEY (USER_NAME) REFERENCES USERS(USER_NAME) ON DELETE CASCADE
+);
+
+CREATE TABLE PROJECT
+(
+ GATEWAY_NAME VARCHAR(255),
+ USER_NAME VARCHAR(255),
+ PROJECT_NAME VARCHAR(255),
+ PRIMARY KEY (PROJECT_NAME),
+ FOREIGN KEY (GATEWAY_NAME) REFERENCES GATEWAY(GATEWAY_NAME) ON DELETE CASCADE,
+ FOREIGN KEY (USER_NAME) REFERENCES USERS(USER_NAME) ON DELETE CASCADE
+);
+
+CREATE TABLE PUBLISHED_WORKFLOW
+(
+ GATEWAY_NAME VARCHAR(255),
+ CREATED_USER VARCHAR(255),
+ PUBLISH_WORKFLOW_NAME VARCHAR(255),
+ VERSION VARCHAR(255),
+ PUBLISHED_DATE TIMESTAMP DEFAULT '0000-00-00 00:00:00',
+ PATH VARCHAR (255),
+ WORKFLOW_CONTENT BLOB,
+ PRIMARY KEY(GATEWAY_NAME, PUBLISH_WORKFLOW_NAME),
+ FOREIGN KEY (GATEWAY_NAME) REFERENCES GATEWAY(GATEWAY_NAME) ON DELETE CASCADE,
+ FOREIGN KEY (CREATED_USER) REFERENCES USERS(USER_NAME) ON DELETE CASCADE
+);
+
+CREATE TABLE USER_WORKFLOW
+(
+ GATEWAY_NAME VARCHAR(255),
+ OWNER VARCHAR(255),
+ TEMPLATE_NAME VARCHAR(255),
+ LAST_UPDATED_TIME TIMESTAMP DEFAULT CURRENT TIMESTAMP,
+ PATH VARCHAR (255),
+ WORKFLOW_GRAPH BLOB,
+ PRIMARY KEY(GATEWAY_NAME, OWNER, TEMPLATE_NAME),
+ FOREIGN KEY (GATEWAY_NAME) REFERENCES GATEWAY(GATEWAY_NAME) ON DELETE CASCADE,
+ FOREIGN KEY (OWNER) REFERENCES USERS(USER_NAME) ON DELETE CASCADE
+);
+
+CREATE TABLE HOST_DESCRIPTOR
+(
+ GATEWAY_NAME VARCHAR(255),
+ UPDATED_USER VARCHAR(255),
+ HOST_DESCRIPTOR_ID VARCHAR(255),
+ HOST_DESCRIPTOR_XML BLOB,
+ PRIMARY KEY(GATEWAY_NAME, HOST_DESCRIPTOR_ID),
+ FOREIGN KEY (GATEWAY_NAME) REFERENCES GATEWAY(GATEWAY_NAME) ON DELETE CASCADE,
+ FOREIGN KEY (UPDATED_USER) REFERENCES USERS(USER_NAME) ON DELETE CASCADE
+);
+
+CREATE TABLE SERVICE_DESCRIPTOR
+(
+ GATEWAY_NAME VARCHAR(255),
+ UPDATED_USER VARCHAR(255),
+ SERVICE_DESCRIPTOR_ID VARCHAR(255),
+ SERVICE_DESCRIPTOR_XML BLOB,
+ PRIMARY KEY(GATEWAY_NAME,SERVICE_DESCRIPTOR_ID),
+ FOREIGN KEY (GATEWAY_NAME) REFERENCES GATEWAY(GATEWAY_NAME) ON DELETE CASCADE,
+ FOREIGN KEY (UPDATED_USER) REFERENCES USERS(USER_NAME) ON DELETE CASCADE
+);
+
+CREATE TABLE APPLICATION_DESCRIPTOR
+(
+ GATEWAY_NAME VARCHAR(255),
+ UPDATED_USER VARCHAR(255),
+ APPLICATION_DESCRIPTOR_ID VARCHAR(255),
+ HOST_DESCRIPTOR_ID VARCHAR(255),
+ SERVICE_DESCRIPTOR_ID VARCHAR(255),
+ APPLICATION_DESCRIPTOR_XML BLOB,
+ PRIMARY KEY(GATEWAY_NAME,APPLICATION_DESCRIPTOR_ID),
+ FOREIGN KEY (GATEWAY_NAME) REFERENCES GATEWAY(GATEWAY_NAME) ON DELETE CASCADE,
+ FOREIGN KEY (UPDATED_USER) REFERENCES USERS(USER_NAME) ON DELETE CASCADE
+);
+
+CREATE TABLE EXPERIMENT_METADATA
+(
+ EXPERIMENT_ID VARCHAR(255) NOT NULL,
+ EXPERIMENT_NAME VARCHAR(255) NOT NULL,
+ DESCRIPTION VARCHAR(255),
+ SUBMITTED_DATE TIMESTAMP DEFAULT CURRENT TIMESTAMP,
+ EXECUTION_USER VARCHAR(255),
+ GATEWAY_NAME VARCHAR(255),
+ PROJECT_NAME VARCHAR(255),
+ SHARE_EXPERIMENT SMALLINT,
+ PRIMARY KEY (EXPERIMENT_ID),
+ FOREIGN KEY (GATEWAY_NAME) REFERENCES GATEWAY(GATEWAY_NAME) ON DELETE CASCADE,
+ FOREIGN KEY (PROJECT_NAME) REFERENCES PROJECT(PROJECT_NAME) ON DELETE CASCADE
+);
+
+CREATE TABLE EXPERIMENT_SUMMARY
+(
+ EXPERIMENT_ID VARCHAR(255) NOT NULL,
+ STATUS VARCHAR(255),
+ LAST_UPDATED_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ PRIMARY KEY(EXPERIMENT_ID),
+ FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT_METADATA(EXPERIMENT_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE EXPERIMENT_CONFIGURATION_DATA
+(
+ EXPERIMENT_ID VARCHAR(255) NOT NULL,
+ RESOURCE_HOST_ID VARCHAR (255),
+ TOTAL_CPU_COUNT INTEGER,
+ NODE_COUNT INTEGER,
+ NUMBER_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),
+ AIRAVATA_AUTO_SCHEDULE SMALLINT,
+ OVERRIDE_MANUAL_SCHEDULE_PARAMS SMALLINT,
+ WORKING_DIR VARCHAR(255),
+ STAGE_INPUT_FILES_TO_WORKING_DIR SMALLINT,
+ OUTPUT_DATA_DIR VARCHAR(255),
+ DATA_REG_URL VARCHAR (255),
+ PERSIST_OUTPUT_DATA SMALLINT,
+ CLEAN_AFTER_JOB SMALLINT,
+ EXPERIMENT_CONFIG_DATA BLOB,
+ PRIMARY KEY (EXPERIMENT_ID),
+ FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT_METADATA(EXPERIMENT_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE EXPERIMENT_INPUT
+(
+ EXPERIMENT_ID VARCHAR(255) NOT NULL,
+ EX_KEY VARCHAR (255) NOT NULL,
+ VALUE VARCHAR (255),
+ PRIMARY KEY (EXPERIMENT_ID, EX_KEY),
+ FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT_METADATA(EXPERIMENT_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE EXPERIMENT_OUTPUT
+(
+ EXPERIMENT_ID VARCHAR(255) NOT NULL,
+ EX_KEY VARCHAR (255) NOT NULL,
+ VALUE VARCHAR (255),
+ PRIMARY KEY (EXPERIMENT_ID, EX_KEY),
+ FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT_METADATA(EXPERIMENT_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE WORKFLOW_DATA
+(
+ EXPERIMENT_ID VARCHAR(255),
+ WORKFLOW_INSTANCE_ID VARCHAR(255),
+ TEMPLATE_NAME VARCHAR(255),
+ STATUS VARCHAR(255),
+ START_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
+ LAST_UPDATE_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ PRIMARY KEY(WORKFLOW_INSTANCE_ID),
+ FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT_METADATA(EXPERIMENT_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE NODE_DATA
+(
+ WORKFLOW_INSTANCE_ID VARCHAR(255),
+ NODE_ID VARCHAR(255),
+ NODE_TYPE VARCHAR(255),
+ INPUTS BLOB,
+ OUTPUTS BLOB,
+ STATUS VARCHAR(255),
+ START_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
+ LAST_UPDATE_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ EXECUTION_INDEX INTEGER NOT NULL,
+ PRIMARY KEY(WORKFLOW_INSTANCE_ID, NODE_ID, EXECUTION_INDEX),
+ FOREIGN KEY (WORKFLOW_INSTANCE_ID) REFERENCES WORKFLOW_DATA(WORKFLOW_INSTANCE_ID) ON DELETE CASCADE
+);
+
+-- need to remove this in future
+CREATE TABLE GRAM_DATA
+(
+ WORKFLOW_INSTANCE_ID VARCHAR(255),
+ NODE_ID VARCHAR(255),
+ RSL BLOB,
+ INVOKED_HOST VARCHAR(255),
+ LOCAL_JOB_ID VARCHAR(255),
+ PRIMARY KEY(WORKFLOW_INSTANCE_ID, NODE_ID),
+ FOREIGN KEY (WORKFLOW_INSTANCE_ID) REFERENCES WORKFLOW_DATA(WORKFLOW_INSTANCE_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE GFAC_JOB_DATA
+(
+ EXPERIMENT_ID VARCHAR(255),
+ WORKFLOW_INSTANCE_ID VARCHAR(255),
+ NODE_ID VARCHAR(255),
+ APPLICATION_DESC_ID VARCHAR(255),
+ HOST_DESC_ID VARCHAR(255),
+ SERVICE_DESC_ID VARCHAR(255),
+ JOB_DATA CLOB,
+ LOCAL_JOB_ID VARCHAR(255) NOT NULL,
+ 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_METADATA(EXPERIMENT_ID),
+ FOREIGN KEY (WORKFLOW_INSTANCE_ID) REFERENCES WORKFLOW_DATA(WORKFLOW_INSTANCE_ID)
+);
+
+CREATE TABLE GFAC_JOB_STATUS
+(
+ LOCAL_JOB_ID VARCHAR(255) NOT NULL,
+ 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)
+);
+
+
+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)
+);
+
+CREATE TABLE EXECUTION_ERROR
+(
+ ERROR_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+ EXPERIMENT_ID VARCHAR(255),
+ WORKFLOW_INSTANCE_ID VARCHAR(255),
+ NODE_ID VARCHAR(255),
+ GFAC_JOB_ID VARCHAR(255),
+ SOURCE_TYPE VARCHAR(255),
+ ERROR_DATE TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ ERROR_MSG CLOB,
+ ERROR_DESC 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_INSTANCE_ID) REFERENCES WORKFLOW_DATA(WORKFLOW_INSTANCE_ID) ON DELETE CASCADE,
+ FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT_METADATA(EXPERIMENT_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE ORCHESTRATOR
+(
+ EXPERIMENT_ID VARCHAR(255) NOT NULL,
+ USERNAME VARCHAR(255),
+ STATUS VARCHAR(255),
+ STATE VARCHAR(255),
+ GFAC_EPR VARCHAR(255),
+ APPLICATION_NAME VARCHAR(255),
+ JOBREQUEST CLOB,
+ SUBMITTED_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
+ STATUS_UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
+ PRIMARY KEY (EXPERIMENT_ID),
+ FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT_METADATA(EXPERIMENT_ID) ON DELETE CASCADE
+);
+
+
http://git-wip-us.apache.org/repos/asf/airavata/blob/10b41d86/modules/registry/airavata-registry-test/src/test/resources/data-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-registry-test/src/test/resources/data-derby.sql b/modules/registry/airavata-registry-test/src/test/resources/data-derby.sql
deleted file mode 100644
index df6bfaa..0000000
--- a/modules/registry/airavata-registry-test/src/test/resources/data-derby.sql
+++ /dev/null
@@ -1,283 +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_name varchar(255),
- owner varchar(255),
- PRIMARY KEY (gateway_name)
-);
-
-
-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.11', CURRENT_TIMESTAMP ,'SYSTEM');
-
-create table Users
-(
- user_name varchar(255),
- password varchar(255),
- PRIMARY KEY(user_name)
-);
-
-create table Gateway_Worker
-(
- gateway_name varchar(255),
- user_name varchar(255),
- PRIMARY KEY (gateway_name, user_name),
- FOREIGN KEY (gateway_name) REFERENCES Gateway(gateway_name) ON DELETE CASCADE,
- FOREIGN KEY (user_name) REFERENCES Users(user_name) ON DELETE CASCADE
-
-);
-
-create table Project
-(
- gateway_name varchar(255),
- user_name varchar(255),
- project_name varchar(255),
- PRIMARY KEY (project_name),
- FOREIGN KEY (gateway_name) REFERENCES Gateway(gateway_name) ON DELETE CASCADE,
- FOREIGN KEY (user_name) REFERENCES Users(user_name) ON DELETE CASCADE
-);
-
-create table Published_Workflow
-(
- gateway_name varchar(255),
- created_user varchar(255),
- publish_workflow_name varchar(255),
- version varchar(255),
- published_date TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- path varchar (255),
- workflow_content BLOB,
- PRIMARY KEY(gateway_name, publish_workflow_name),
- FOREIGN KEY (gateway_name) REFERENCES Gateway(gateway_name) ON DELETE CASCADE,
- FOREIGN KEY (created_user) REFERENCES Users(user_name) ON DELETE CASCADE
-);
-
-create table User_Workflow
-
-(
- gateway_name varchar(255),
- owner varchar(255),
- template_name varchar(255),
- last_updated_date TIMESTAMP DEFAULT CURRENT TIMESTAMP,
- path varchar (255),
- workflow_graph BLOB,
- PRIMARY KEY(gateway_name, owner, template_name),
- FOREIGN KEY (gateway_name) REFERENCES Gateway(gateway_name) ON DELETE CASCADE,
- FOREIGN KEY (owner) REFERENCES Users(user_name) ON DELETE CASCADE
-);
-
-
-create table Host_Descriptor
-(
- gateway_name varchar(255),
- updated_user varchar(255),
- host_descriptor_ID varchar(255),
- host_descriptor_xml BLOB,
- PRIMARY KEY(gateway_name, host_descriptor_ID),
- FOREIGN KEY (gateway_name) REFERENCES Gateway(gateway_name) ON DELETE CASCADE,
- FOREIGN KEY (updated_user) REFERENCES Users(user_name) ON DELETE CASCADE
-);
-
-create table Service_Descriptor
-(
- gateway_name varchar(255),
- updated_user varchar(255),
- service_descriptor_ID varchar(255),
- service_descriptor_xml BLOB,
- PRIMARY KEY(gateway_name,service_descriptor_ID),
- FOREIGN KEY (gateway_name) REFERENCES Gateway(gateway_name) ON DELETE CASCADE,
- FOREIGN KEY (updated_user) REFERENCES Users(user_name) ON DELETE CASCADE
-);
-
-create table Application_Descriptor
-(
- gateway_name varchar(255),
- updated_user varchar(255),
- application_descriptor_ID varchar(255),
- host_descriptor_ID varchar(255),
- service_descriptor_ID varchar(255),
- application_descriptor_xml BLOB,
- PRIMARY KEY(gateway_name,application_descriptor_ID),
- FOREIGN KEY (gateway_name) REFERENCES Gateway(gateway_name) ON DELETE CASCADE,
- FOREIGN KEY (updated_user) REFERENCES Users(user_name) ON DELETE CASCADE
-);
-
-create table Experiment
-(
- project_name varchar(255),
- gateway_name varchar(255),
- user_name varchar(255),
- experiment_ID varchar(255),
- submitted_date TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY(experiment_ID),
- FOREIGN KEY (gateway_name) REFERENCES Gateway(gateway_name) ON DELETE CASCADE,
- FOREIGN KEY (project_name) REFERENCES Project(project_name) ON DELETE CASCADE,
- FOREIGN KEY (user_name) REFERENCES Users(user_name) ON DELETE CASCADE
-);
-
-create table Experiment_Data
-(
- experiment_ID varchar(255),
- name varchar(255),
- username varchar(255),
- PRIMARY KEY (experiment_ID)
-);
-
-create table Experiment_Metadata
-(
- experiment_ID varchar(255),
- metadata BLOB,
- PRIMARY KEY (experiment_ID)
-);
-
-
-create table Workflow_Data
-(
- experiment_ID varchar(255),
- workflow_instanceID varchar(255),
- template_name varchar(255),
- status varchar(255),
- start_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- last_update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- PRIMARY KEY(workflow_instanceID),
- FOREIGN KEY (experiment_ID) REFERENCES Experiment_Data(experiment_ID) ON DELETE CASCADE
-);
-
-create table Node_Data
-(
- workflow_instanceID varchar(255),
- node_id varchar(255),
- node_type varchar(255),
- inputs BLOB,
- outputs BLOB,
- status varchar(255),
- start_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- last_update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- execution_index int NOT NULL,
- PRIMARY KEY(workflow_instanceID, node_id, execution_index),
- FOREIGN KEY (workflow_instanceID) REFERENCES Workflow_Data(workflow_instanceID) ON DELETE CASCADE
-);
-
-create table Gram_Data
-(
- workflow_instanceID varchar(255),
- node_id varchar(255),
- rsl BLOB,
- invoked_host varchar(255),
- local_Job_ID varchar(255),
- PRIMARY KEY(workflow_instanceID, node_id),
- FOREIGN KEY (workflow_instanceID) REFERENCES Workflow_Data(workflow_instanceID) 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)
-);
-
-CREATE TABLE COMMUNITY_USER
-(
- GATEWAY_NAME VARCHAR(256) NOT NULL,
- COMMUNITY_USER_NAME VARCHAR(256) NOT NULL,
- COMMUNITY_USER_EMAIL VARCHAR(256) NOT NULL,
- PRIMARY KEY (GATEWAY_NAME, COMMUNITY_USER_NAME)
-);
-
-
-CREATE TABLE CREDENTIALS
-(
- GATEWAY_NAME VARCHAR(256) NOT NULL,
- COMMUNITY_USER_NAME VARCHAR(256) NOT NULL,
- CREDENTIAL BLOB NOT NULL,
- PRIVATE_KEY BLOB NOT NULL,
- NOT_BEFORE VARCHAR(256) NOT NULL,
- NOT_AFTER VARCHAR(256) NOT NULL,
- LIFETIME INTEGER NOT NULL,
- REQUESTING_PORTAL_USER_NAME VARCHAR(256) NOT NULL,
- REQUESTED_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (GATEWAY_NAME, COMMUNITY_USER_NAME)
-);
-
-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 Orchestrator_Data
-(
- experiment_ID varchar(255) NOT NULL,
- username varchar(255),
- status varchar(255),
- state varchar(255),
- gfacEPR varchar(255),
- applicationName varchar(255),
- jobRequest CLOB,
- PRIMARY KEY (experiment_ID)
-);
-
-
-
-
http://git-wip-us.apache.org/repos/asf/airavata/blob/10b41d86/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dc54c26..1ae708a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
<tomcat.version>7.0.41</tomcat.version>
<cargo.version>1.3.1</cargo.version>
<oa4mp.version>1.0.6</oa4mp.version>
- <antrun.version>1.6</antrun.version>
+ <antrun.version>1.7</antrun.version>
<bouncy.castle.version>1.45</bouncy.castle.version>
<jglobus.version>2.0.6</jglobus.version>
<ebay.cors.filter>1.0.0</ebay.cors.filter>
|