airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ramin...@apache.org
Subject [3/5] fixed the data models and created experiment test. AIRAVATA-1017
Date Thu, 20 Feb 2014 17:42:27 GMT
http://git-wip-us.apache.org/repos/asf/airavata/blob/4d309584/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/OrchestratorDataResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/OrchestratorDataResourceTest.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/OrchestratorDataResourceTest.java
index 96dd427..f7e0c3a 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/OrchestratorDataResourceTest.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/OrchestratorDataResourceTest.java
@@ -1,49 +1,49 @@
-package org.apache.airavata.persistance.registry.jpa;
-
-import java.util.UUID;
-
-import org.apache.airavata.common.utils.AiravataJobState;
-import org.apache.airavata.persistance.registry.jpa.resources.*;
-
-public class OrchestratorDataResourceTest extends AbstractResourceTest{
-	private OrchestratorDataResource dataResource;
-    private ExperimentMetadataResource experimentResource;
-    private WorkerResource workerResource;
-//	private String experimentID = UUID.randomUUID().toString();
-	private String applicationName = "echo_test";
-    private GatewayResource gatewayResource;
-	
-	 @Override
-	    public void setUp() throws Exception {
-         super.setUp();
-         gatewayResource = super.getGatewayResource();
-         workerResource = super.getWorkerResource();
-
-         experimentResource = (ExperimentMetadataResource) gatewayResource.create(ResourceType.EXPERIMENT_METADATA);
-         experimentResource.setExpID("testExpID");
-         experimentResource.setExperimentName("testExpID");
-         experimentResource.setExecutionUser(workerResource.getUser());
-         experimentResource.setProject(new ProjectResource(workerResource, gatewayResource, "testProject"));
-         experimentResource.save();
-
-         dataResource = (OrchestratorDataResource) gatewayResource.create(ResourceType.ORCHESTRATOR);
-
-     }
-
-	    public void testSave() throws Exception {
-	        dataResource.setExperimentID("testExpID");
-	        dataResource.setStatus(AiravataJobState.State.CREATED.toString());
-	        dataResource.setApplicationName(applicationName);
-	        dataResource.save();
-	        assertNotNull("Orchestrator data resource created successfully", dataResource);
-	        // Get saved data
-	        assertNotNull("Orchestrator data resource get successfully", gatewayResource.get(ResourceType.ORCHESTRATOR, "testExpID"));
-	    }
-
-	    @Override
-	    public void tearDown() throws Exception {
-	        super.tearDown();
-	    }
-
-
-}
+//package org.apache.airavata.persistance.registry.jpa;
+//
+//import java.util.UUID;
+//
+//import org.apache.airavata.common.utils.AiravataJobState;
+//import org.apache.airavata.persistance.registry.jpa.resources.*;
+//
+//public class OrchestratorDataResourceTest extends AbstractResourceTest{
+//	private OrchestratorDataResource dataResource;
+//    private ExperimentMetadataResource experimentResource;
+//    private WorkerResource workerResource;
+////	private String experimentID = UUID.randomUUID().toString();
+//	private String applicationName = "echo_test";
+//    private GatewayResource gatewayResource;
+//	
+//	 @Override
+//	    public void setUp() throws Exception {
+//         super.setUp();
+//         gatewayResource = super.getGatewayResource();
+//         workerResource = super.getWorkerResource();
+//
+//         experimentResource = (ExperimentMetadataResource) gatewayResource.create(ResourceType.EXPERIMENT_METADATA);
+//         experimentResource.setExpID("testExpID");
+//         experimentResource.setExperimentName("testExpID");
+//         experimentResource.setExecutionUser(workerResource.getUser());
+//         experimentResource.setProject(new ProjectResource(workerResource, gatewayResource, "testProject"));
+//         experimentResource.save();
+//
+//         dataResource = (OrchestratorDataResource) gatewayResource.create(ResourceType.ORCHESTRATOR);
+//
+//     }
+//
+//	    public void testSave() throws Exception {
+//	        dataResource.setExperimentID("testExpID");
+//	        dataResource.setStatus(AiravataJobState.State.CREATED.toString());
+//	        dataResource.setApplicationName(applicationName);
+//	        dataResource.save();
+//	        assertNotNull("Orchestrator data resource created successfully", dataResource);
+//	        // Get saved data
+//	        assertNotNull("Orchestrator data resource get successfully", gatewayResource.get(ResourceType.ORCHESTRATOR, "testExpID"));
+//	    }
+//
+//	    @Override
+//	    public void tearDown() throws Exception {
+//	        super.tearDown();
+//	    }
+//
+//
+//}

http://git-wip-us.apache.org/repos/asf/airavata/blob/4d309584/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ProjectResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ProjectResourceTest.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ProjectResourceTest.java
index 8c0ce32..ca419ec 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ProjectResourceTest.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ProjectResourceTest.java
@@ -1,81 +1,81 @@
-/*
-*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements.  See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership.  The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License.  You may obtain a copy of the License at
-*
-*   http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied.  See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*
-*/
-
-package org.apache.airavata.persistance.registry.jpa;
-
-import org.apache.airavata.persistance.registry.jpa.resources.*;
-
-import java.sql.Timestamp;
-import java.util.Calendar;
-
-public class ProjectResourceTest extends AbstractResourceTest {
-    private GatewayResource gatewayResource;
-    private WorkerResource workerResource;
-    private ProjectResource projectResource;
-    private ExperimentMetadataResource experimentResource;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        gatewayResource = super.getGatewayResource();
-        workerResource = super.getWorkerResource();
-        projectResource = workerResource.createProject("testProject");
-        projectResource.setGateway(gatewayResource);
-        projectResource.setWorker(workerResource);
-        projectResource.save();
-
-        experimentResource = projectResource.createExperiment("testExpID");
-        experimentResource.setGateway(gatewayResource);
-        experimentResource.setExperimentName("testExpID");
-        experimentResource.setExecutionUser(workerResource.getUser());
-        experimentResource.setSubmittedDate(getCurrentTimestamp());
-        experimentResource.setProject(projectResource);
-        experimentResource.save();
-    }
-
-    public void testCreate() throws Exception {
-        assertNotNull("experiment resource created successfully", experimentResource);
-    }
-
-    public void testGet() throws Exception {
-        ExperimentMetadataResource experiment = projectResource.getExperiment("testExpID");
-        assertNotNull("experiment resource retrieved successfully", experiment);
-    }
-
-    public void testGetList() throws Exception {
-        assertNotNull("experiment resources retrieved successfully", projectResource.getExperiments());
-    }
-
-    public void testSave() throws Exception {
-        assertTrue("Project saved successfully", workerResource.isProjectExists("testProject"));
-    }
-
-
-//    public void testRemove() throws Exception {
-//        projectResource.removeExperiment("testExpID");
-//        assertFalse("experiment removed successfully", projectResource.isExperimentExists("testExpID"));
+///*
+//*
+//* Licensed to the Apache Software Foundation (ASF) under one
+//* or more contributor license agreements.  See the NOTICE file
+//* distributed with this work for additional information
+//* regarding copyright ownership.  The ASF licenses this file
+//* to you under the Apache License, Version 2.0 (the
+//* "License"); you may not use this file except in compliance
+//* with the License.  You may obtain a copy of the License at
+//*
+//*   http://www.apache.org/licenses/LICENSE-2.0
+//*
+//* Unless required by applicable law or agreed to in writing,
+//* software distributed under the License is distributed on an
+//* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+//* KIND, either express or implied.  See the License for the
+//* specific language governing permissions and limitations
+//* under the License.
+//*
+//*/
+//
+//package org.apache.airavata.persistance.registry.jpa;
+//
+//import org.apache.airavata.persistance.registry.jpa.resources.*;
+//
+//import java.sql.Timestamp;
+//import java.util.Calendar;
+//
+//public class ProjectResourceTest extends AbstractResourceTest {
+//    private GatewayResource gatewayResource;
+//    private WorkerResource workerResource;
+//    private ProjectResource projectResource;
+//    private ExperimentResource experimentResource;
+//
+//    @Override
+//    public void setUp() throws Exception {
+//        super.setUp();
+//        gatewayResource = super.getGatewayResource();
+//        workerResource = super.getWorkerResource();
+//        projectResource = workerResource.createProject("testProject");
+//        projectResource.setGateway(gatewayResource);
+//        projectResource.setWorker(workerResource);
+//        projectResource.save();
+//
+//        experimentResource = projectResource.createExperiment("testExpID");
+//        experimentResource.setGateway(gatewayResource);
+//        experimentResource.setExperimentName("testExpID");
+//        experimentResource.setExecutionUser(workerResource.getUser());
+//        experimentResource.setSubmittedDate(getCurrentTimestamp());
+//        experimentResource.setProject(projectResource);
+//        experimentResource.save();
 //    }
-
-    @Override
-    public void tearDown() throws Exception {
-        super.tearDown();
-    }
-}
+//
+//    public void testCreate() throws Exception {
+//        assertNotNull("experiment resource created successfully", experimentResource);
+//    }
+//
+//    public void testGet() throws Exception {
+//        ExperimentMetadataResource experiment = projectResource.getExperiment("testExpID");
+//        assertNotNull("experiment resource retrieved successfully", experiment);
+//    }
+//
+//    public void testGetList() throws Exception {
+//        assertNotNull("experiment resources retrieved successfully", projectResource.getExperiments());
+//    }
+//
+//    public void testSave() throws Exception {
+//        assertTrue("Project saved successfully", workerResource.isProjectExists("testProject"));
+//    }
+//
+//
+////    public void testRemove() throws Exception {
+////        projectResource.removeExperiment("testExpID");
+////        assertFalse("experiment removed successfully", projectResource.isExperimentExists("testExpID"));
+////    }
+//
+//    @Override
+//    public void tearDown() throws Exception {
+//        super.tearDown();
+//    }
+//}

http://git-wip-us.apache.org/repos/asf/airavata/blob/4d309584/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 502ac6d..876452f 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
@@ -1,103 +1,48 @@
-/*
-*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements.  See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership.  The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License.  You may obtain a copy of the License at
-*
-*   http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied.  See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*
-*/
-
-package org.apache.airavata.persistance.registry.jpa;
-
-import org.apache.airavata.persistance.registry.jpa.resources.*;
-
-import java.sql.Timestamp;
-import java.util.Calendar;
-
-public class WorkerResourceTest extends AbstractResourceTest {
-    private GatewayResource gatewayResource;
-    private WorkerResource workerResource;
-    private ProjectResource testProject;
-    private UserWorkflowResource userWorkflowResource;
-    private ExperimentMetadataResource experimentResource;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        gatewayResource = super.getGatewayResource();
-        workerResource = super.getWorkerResource();
-
-        testProject = workerResource.createProject("testProject");
-        userWorkflowResource = workerResource.createWorkflowTemplate("workflow1");
-        experimentResource = (ExperimentMetadataResource) workerResource.create(ResourceType.EXPERIMENT_METADATA);
-
-        testProject.setGateway(gatewayResource);
-        testProject.save();
-
-        userWorkflowResource.setGateway(gatewayResource);
-        userWorkflowResource.setContent("testContent");
-        userWorkflowResource.save();
-
-        experimentResource.setGateway(gatewayResource);
-        experimentResource.setExpID("testExpID");
-        experimentResource.setExperimentName("testExpID");
-        experimentResource.setProject(testProject);
-        experimentResource.setExecutionUser(workerResource.getUser());
-        experimentResource.setSubmittedDate(getCurrentTimestamp());
-        experimentResource.save();
-
-
-    }
-
-    public void testCreate() throws Exception {
-        assertNotNull("project resource created successfully", testProject);
-        assertNotNull("user workflow created successfully", userWorkflowResource);
-    }
-
-    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_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_METADATA));
-
-    }
-
-    public void testSave() throws Exception {
-        workerResource.save();
-        assertTrue("worker resource saved successfully", gatewayResource.isExists(ResourceType.USER, "admin"));
-        //remove
-//        ResourceUtils.removeGatewayWorker(gatewayResource, userResource);
-//        gatewayResource.remove(ResourceType.USER, "testUser");
-    }
-
-    public void testRemove() throws Exception {
-        workerResource.removeWorkflowTemplate("workflow1");
-//        workerResource.removeExperiment("testExpID");
-//        workerResource.removeProject("testProject");
-
-        assertTrue("user workflow has been removed successfully", !workerResource.isWorkflowTemplateExists("workflow1"));
-//        assertTrue("experiment has been removed successfully", !workerResource.isExperimentExists("testExpID"));
-
-//        assertTrue("project has been removed successfully", !workerResource.isProjectExists("testProject"));
-
-
+///*
+//*
+//* Licensed to the Apache Software Foundation (ASF) under one
+//* or more contributor license agreements.  See the NOTICE file
+//* distributed with this work for additional information
+//* regarding copyright ownership.  The ASF licenses this file
+//* to you under the Apache License, Version 2.0 (the
+//* "License"); you may not use this file except in compliance
+//* with the License.  You may obtain a copy of the License at
+//*
+//*   http://www.apache.org/licenses/LICENSE-2.0
+//*
+//* Unless required by applicable law or agreed to in writing,
+//* software distributed under the License is distributed on an
+//* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+//* KIND, either express or implied.  See the License for the
+//* specific language governing permissions and limitations
+//* under the License.
+//*
+//*/
+//
+//package org.apache.airavata.persistance.registry.jpa;
+//
+//import org.apache.airavata.persistance.registry.jpa.resources.*;
+//
+//import java.sql.Timestamp;
+//import java.util.Calendar;
+//
+//public class WorkerResourceTest extends AbstractResourceTest {
+//    private GatewayResource gatewayResource;
+//    private WorkerResource workerResource;
+//    private ProjectResource testProject;
+//    private UserWorkflowResource userWorkflowResource;
+//    private ExperimentMetadataResource experimentResource;
+//
+//    @Override
+//    public void setUp() throws Exception {
+//        super.setUp();
+//        gatewayResource = super.getGatewayResource();
+//        workerResource = super.getWorkerResource();
+//
+//        testProject = workerResource.createProject("testProject");
+//        userWorkflowResource = workerResource.createWorkflowTemplate("workflow1");
+//        experimentResource = (ExperimentMetadataResource) workerResource.create(ResourceType.EXPERIMENT_METADATA);
+//
 //        testProject.setGateway(gatewayResource);
 //        testProject.save();
 //
@@ -107,16 +52,71 @@ public class WorkerResourceTest extends AbstractResourceTest {
 //
 //        experimentResource.setGateway(gatewayResource);
 //        experimentResource.setExpID("testExpID");
+//        experimentResource.setExperimentName("testExpID");
 //        experimentResource.setProject(testProject);
+//        experimentResource.setExecutionUser(workerResource.getUser());
 //        experimentResource.setSubmittedDate(getCurrentTimestamp());
 //        experimentResource.save();
-
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-
-}
+//
+//
+//    }
+//
+//    public void testCreate() throws Exception {
+//        assertNotNull("project resource created successfully", testProject);
+//        assertNotNull("user workflow created successfully", userWorkflowResource);
+//    }
+//
+//    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_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_METADATA));
+//
+//    }
+//
+//    public void testSave() throws Exception {
+//        workerResource.save();
+//        assertTrue("worker resource saved successfully", gatewayResource.isExists(ResourceType.USER, "admin"));
+//        //remove
+////        ResourceUtils.removeGatewayWorker(gatewayResource, userResource);
+////        gatewayResource.remove(ResourceType.USER, "testUser");
+//    }
+//
+//    public void testRemove() throws Exception {
+//        workerResource.removeWorkflowTemplate("workflow1");
+////        workerResource.removeExperiment("testExpID");
+////        workerResource.removeProject("testProject");
+//
+//        assertTrue("user workflow has been removed successfully", !workerResource.isWorkflowTemplateExists("workflow1"));
+////        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();
+//
+//    }
+//
+//    @Override
+//    public void tearDown() throws Exception {
+//        super.tearDown();
+//    }
+//
+//
+//}

http://git-wip-us.apache.org/repos/asf/airavata/blob/4d309584/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 3ddf9b1..9c3b107 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
@@ -1,106 +1,106 @@
-/*
-*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements.  See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership.  The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License.  You may obtain a copy of the License at
-*
-*   http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied.  See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*
-*/
-
-package org.apache.airavata.persistance.registry.jpa;
-
-import org.apache.airavata.persistance.registry.jpa.resources.*;
-
-import java.sql.Timestamp;
-import java.util.Calendar;
-
-public class WorkflowDataResourceTest extends AbstractResourceTest {
-    private ExperimentMetadataResource experimentResource;
-    private WorkflowDataResource workflowDataResource;
-    private NodeDataResource nodeDataResource;
-    private GramDataResource gramDataResource;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        GatewayResource gatewayResource = super.getGatewayResource();
-        WorkerResource workerResource = super.getWorkerResource();
-
-        experimentResource = (ExperimentMetadataResource) gatewayResource.create(ResourceType.EXPERIMENT_METADATA);
-        experimentResource.setExpID("testExpID");
-        experimentResource.setExperimentName("testExpID");
-        experimentResource.setExecutionUser(workerResource.getUser());
-        experimentResource.setProject(new ProjectResource(workerResource, gatewayResource, "testProject"));
-        experimentResource.save();
-
-        workflowDataResource = (WorkflowDataResource) experimentResource.create(ResourceType.WORKFLOW_DATA);
-        workflowDataResource.setWorkflowInstanceID("testWFInstance");
-        workflowDataResource.setTemplateName("testTemplate");
-        workflowDataResource.setExperimentID("testExpID");
-        Calendar calender = Calendar.getInstance();
-        java.util.Date d = calender.getTime();
-        Timestamp timestamp = new Timestamp(d.getTime());
-        workflowDataResource.setLastUpdatedTime(timestamp);
-        workflowDataResource.save();
-
-        nodeDataResource = workflowDataResource.createNodeData("testNodeID");
-        gramDataResource = workflowDataResource.createGramData("testNodeID");
-
-        nodeDataResource.setWorkflowDataResource(workflowDataResource);
-        nodeDataResource.setInputs("testInput");
-        nodeDataResource.setOutputs("testOutput");
-        nodeDataResource.setStatus("testStatus");
-        nodeDataResource.save();
-
-        gramDataResource.setRsl("testRSL");
-        gramDataResource.setWorkflowDataResource(workflowDataResource);
-        gramDataResource.save();
-    }
-
-    public void testCreate() throws Exception {
-        assertNotNull("node data resource created successfully", nodeDataResource);
-        assertNotNull("gram data resource created successfully", gramDataResource);
-    }
-
-    public void testGet() throws Exception {
-        assertNotNull("Node data retrieved successfully", workflowDataResource.getNodeData("testNodeID"));
-        assertNotNull("Gram data retrieved successfully", workflowDataResource.getGramData("testNodeID"));
-    }
-
-    public void testGetList() throws Exception {
-        assertNotNull("Node data retrieved successfully", workflowDataResource.getNodeData());
-        assertNotNull("Gram data retrieved successfully", workflowDataResource.getGramData());
-    }
-
-    public void testRemove() throws Exception {
-        workflowDataResource.removeNodeData("testNodeID");
-        workflowDataResource.removeGramData("testNodeID");
-
-        assertTrue("node date removed successfully", !workflowDataResource.isNodeExists("testNodeID"));
-        assertTrue("gram date removed successfully", !workflowDataResource.isGramDataExists("testNodeID"));
-
-    }
-
-    public void testSave() throws Exception {
-        assertTrue("workflow data saved successfully", experimentResource.isExists(ResourceType.WORKFLOW_DATA, "testWFInstance"));
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-
-}
+///*
+//*
+//* Licensed to the Apache Software Foundation (ASF) under one
+//* or more contributor license agreements.  See the NOTICE file
+//* distributed with this work for additional information
+//* regarding copyright ownership.  The ASF licenses this file
+//* to you under the Apache License, Version 2.0 (the
+//* "License"); you may not use this file except in compliance
+//* with the License.  You may obtain a copy of the License at
+//*
+//*   http://www.apache.org/licenses/LICENSE-2.0
+//*
+//* Unless required by applicable law or agreed to in writing,
+//* software distributed under the License is distributed on an
+//* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+//* KIND, either express or implied.  See the License for the
+//* specific language governing permissions and limitations
+//* under the License.
+//*
+//*/
+//
+//package org.apache.airavata.persistance.registry.jpa;
+//
+//import org.apache.airavata.persistance.registry.jpa.resources.*;
+//
+//import java.sql.Timestamp;
+//import java.util.Calendar;
+//
+//public class WorkflowDataResourceTest extends AbstractResourceTest {
+//    private ExperimentMetadataResource experimentResource;
+//    private WorkflowDataResource workflowDataResource;
+//    private NodeDataResource nodeDataResource;
+//    private GramDataResource gramDataResource;
+//
+//    @Override
+//    public void setUp() throws Exception {
+//        super.setUp();
+//        GatewayResource gatewayResource = super.getGatewayResource();
+//        WorkerResource workerResource = super.getWorkerResource();
+//
+//        experimentResource = (ExperimentMetadataResource) gatewayResource.create(ResourceType.EXPERIMENT_METADATA);
+//        experimentResource.setExpID("testExpID");
+//        experimentResource.setExperimentName("testExpID");
+//        experimentResource.setExecutionUser(workerResource.getUser());
+//        experimentResource.setProject(new ProjectResource(workerResource, gatewayResource, "testProject"));
+//        experimentResource.save();
+//
+//        workflowDataResource = (WorkflowDataResource) experimentResource.create(ResourceType.WORKFLOW_DATA);
+//        workflowDataResource.setWorkflowInstanceID("testWFInstance");
+//        workflowDataResource.setTemplateName("testTemplate");
+//        workflowDataResource.setExperimentID("testExpID");
+//        Calendar calender = Calendar.getInstance();
+//        java.util.Date d = calender.getTime();
+//        Timestamp timestamp = new Timestamp(d.getTime());
+//        workflowDataResource.setLastUpdatedTime(timestamp);
+//        workflowDataResource.save();
+//
+//        nodeDataResource = workflowDataResource.createNodeData("testNodeID");
+//        gramDataResource = workflowDataResource.createGramData("testNodeID");
+//
+//        nodeDataResource.setWorkflowDataResource(workflowDataResource);
+//        nodeDataResource.setInputs("testInput");
+//        nodeDataResource.setOutputs("testOutput");
+//        nodeDataResource.setStatus("testStatus");
+//        nodeDataResource.save();
+//
+//        gramDataResource.setRsl("testRSL");
+//        gramDataResource.setWorkflowDataResource(workflowDataResource);
+//        gramDataResource.save();
+//    }
+//
+//    public void testCreate() throws Exception {
+//        assertNotNull("node data resource created successfully", nodeDataResource);
+//        assertNotNull("gram data resource created successfully", gramDataResource);
+//    }
+//
+//    public void testGet() throws Exception {
+//        assertNotNull("Node data retrieved successfully", workflowDataResource.getNodeData("testNodeID"));
+//        assertNotNull("Gram data retrieved successfully", workflowDataResource.getGramData("testNodeID"));
+//    }
+//
+//    public void testGetList() throws Exception {
+//        assertNotNull("Node data retrieved successfully", workflowDataResource.getNodeData());
+//        assertNotNull("Gram data retrieved successfully", workflowDataResource.getGramData());
+//    }
+//
+//    public void testRemove() throws Exception {
+//        workflowDataResource.removeNodeData("testNodeID");
+//        workflowDataResource.removeGramData("testNodeID");
+//
+//        assertTrue("node date removed successfully", !workflowDataResource.isNodeExists("testNodeID"));
+//        assertTrue("gram date removed successfully", !workflowDataResource.isGramDataExists("testNodeID"));
+//
+//    }
+//
+//    public void testSave() throws Exception {
+//        assertTrue("workflow data saved successfully", experimentResource.isExists(ResourceType.WORKFLOW_DATA, "testWFInstance"));
+//    }
+//
+//    @Override
+//    public void tearDown() throws Exception {
+//        super.tearDown();
+//    }
+//
+//
+//}

http://git-wip-us.apache.org/repos/asf/airavata/blob/4d309584/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 f2a2987..e811e2e 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
@@ -297,7 +297,7 @@ public class Initialize {
         try {
             System.setProperty(DERBY_SERVER_MODE_SYS_PROPERTY, "true");
             server = new NetworkServerControl(InetAddress.getByName(Utils.getHost()),
-                    20000,
+            		Utils.getPort(),
                     Utils.getJDBCUser(), Utils.getJDBCPassword());
             java.io.PrintWriter consoleWriter = new java.io.PrintWriter(System.out, true);
             server.start(consoleWriter);

http://git-wip-us.apache.org/repos/asf/airavata/blob/4d309584/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
index 04e25c0..b25dcad 100644
--- 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
@@ -21,7 +21,7 @@
 CREATE TABLE GATEWAY
 (
         GATEWAY_NAME VARCHAR(255),
-	      OWNER VARCHAR(255),
+	    OWNER VARCHAR(255),
         PRIMARY KEY (GATEWAY_NAME)
 );
 
@@ -124,147 +124,237 @@ CREATE TABLE APPLICATION_DESCRIPTOR
          FOREIGN KEY (UPDATED_USER) REFERENCES USERS(USER_NAME) ON DELETE CASCADE
 );
 
-CREATE TABLE EXPERIMENT_METADATA
+CREATE TABLE EXPERIMENT
 (
-          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
+        EXPERIMENT_ID VARCHAR(255),
+        GATEWAY_NAME VARCHAR(255),
+        EXECUTION_USER VARCHAR(255),
+        PROJECT_NAME VARCHAR(255),
+        CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+        EXPERIMENT_NAME VARCHAR(255),
+        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),
+        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
+CREATE TABLE EXPERIMENT_INPUT
 (
-          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
+        EXPERIMENT_ID VARCHAR(255),
+        INPUT_KEY VARCHAR(255),
+        INPUT_TYPE VARCHAR(255),
+        METADATA VARCHAR(255),
+        VALUE VARCHAR(255),
+        PRIMARY KEY(EXPERIMENT_ID,INPUT_KEY),
+        FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
 );
 
-CREATE TABLE EXPERIMENT_CONFIGURATION_DATA
+CREATE TABLE EXPERIMENT_OUTPUT
 (
-          EXPERIMENT_ID VARCHAR(255) NOT NULL,
-          APPLICATION_ID VARCHAR(255),
-          APPLICATION_VERSION VARCHAR(255),
-          WORKFLOW_TEMPLATE_ID VARCHAR(255),
-          WORKFLOW_TEMPLATE_VERSION VARCHAR(255),
-          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_PARENT VARCHAR(255),
-          UNIQUE_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,
-          START_EXECUTION_AT VARCHAR(255),
-          EXECUTE_BEFORE VARCHAR(255),
-          NUMBER_OF_RETRIES INTEGER,
-          EXPERIMENT_CONFIG_DATA BLOB,
-          PRIMARY KEY (EXPERIMENT_ID),
-          FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT_METADATA(EXPERIMENT_ID) ON DELETE CASCADE
+        EXPERIMENT_ID VARCHAR(255),
+        OUTPUT_KEY VARCHAR(255),
+        OUTPUT_KEY_TYPE VARCHAR(255),
+        METADATA VARCHAR(255),
+        VALUE VARCHAR(255),
+        PRIMARY KEY(EXPERIMENT_ID,OUTPUT_KEY),
+        FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
 );
 
-CREATE TABLE EXPERIMENT_INPUT
+
+CREATE TABLE WORKFLOW_NODE_DETAIL
 (
-        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
+        EXPERIMENT_ID VARCHAR(255),
+        NODE_INSTANCE_ID VARCHAR(255),
+        CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+        NODE_NAME VARCHAR(255),
+        PRIMARY KEY(NODE_INSTANCE_ID),
+        FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
 );
 
-CREATE TABLE EXPERIMENT_OUTPUT
+CREATE TABLE TASK_DETAIL
 (
-        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
+        TASK_ID VARCHAR(255),
+        NODE_INSTANCE_ID VARCHAR(255),
+        CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,,
+        APPLICATION_ID VARCHAR(255),
+        APPLICATION_VERSION VARCHAR(255),
+        PRIMARY KEY(TASK_ID),
+        FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE
 );
 
-CREATE TABLE WORKFLOW_DATA
+CREATE TABLE ERROR_DETAIL
 (
-       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
+         ERROR_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+         EXPERIMENT_ID VARCHAR(255),
+         TASK_ID VARCHAR(255),
+         NODE_INSTANCE_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),
+        INPUT_KEY_TYPE VARCHAR(255),
+        METADATA VARCHAR(255),
+        VALUE VARCHAR(255),
+        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),
+        OUTPUT_KEY_TYPE VARCHAR(255),
+        METADATA VARCHAR(255),
+        VALUE 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),
+       INPUT_KEY_TYPE VARCHAR(255),
+       METADATA VARCHAR(255),
+       VALUE VARCHAR(255),
+       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),
+       OUTPUT_KEY_TYPE VARCHAR(255),
+       METADATA VARCHAR(255),
+       VALUE 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 NODE_DATA
+CREATE TABLE JOB_DETAIL
 (
-       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
+        JOB_ID VARCHAR(255),
+        TASK_ID VARCHAR(255),
+        JOB_DESCRIPTION VARCHAR(255),
+        CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+        PRIMARY KEY (TASK_ID, JOB_ID),
+        FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
 );
 
--- need to remove this in future
-CREATE TABLE GRAM_DATA
+CREATE TABLE DATA_TRANSFER_DETAIL
 (
-       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
+        TRANSFER_ID VARCHAR(255),
+        TASK_ID VARCHAR(255),
+        CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+        TRANSFER_DESC VARCHAR(255),
+        PRIMARY KEY(TRANSFER_ID),
+        FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
 );
 
-CREATE TABLE GFAC_JOB_DATA
+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,
+        OVERRIDE_MANUAL_SCHEDULE_PARAMS SMALLINT,
+        SHARE_EXPERIMENT 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),
+        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),
-       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)
+       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 GFAC_JOB_STATUS
+CREATE TABLE ADVANCE_OUTPUT_DATA_HANDLING
 (
-       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)
+       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
 (
@@ -275,7 +365,6 @@ CREATE TABLE COMMUNITY_USER
         PRIMARY KEY (GATEWAY_NAME, COMMUNITY_USER_NAME, TOKEN_ID)
 );
 
-
 CREATE TABLE CREDENTIALS
 (
         GATEWAY_ID VARCHAR(256) NOT NULL,
@@ -284,42 +373,4 @@ CREATE TABLE CREDENTIALS
         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
-);
-
-
+);
\ No newline at end of file


Mime
View raw message