airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject [6/8] new datamodels for AIRAVATA-1017
Date Mon, 17 Feb 2014 19:30:03 GMT
http://git-wip-us.apache.org/repos/asf/airavata/blob/a0c1cbde/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Execution_Error.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Execution_Error.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Execution_Error.java
deleted file mode 100644
index fa34ede..0000000
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Execution_Error.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-package org.apache.airavata.persistance.registry.jpa.model;
-
-import java.sql.Timestamp;
-
-import javax.persistence.*;
-
-@Entity
-@Table(name="EXECUTION_ERROR")
-public class Execution_Error {
-    @Id @GeneratedValue
-    @Column(name = "ERROR_ID")
-    private int error_id;
-
-    @Column(name = "EXPERIMENT_ID")
-    private String experiment_ID;
-    @Column(name = "WORKFLOW_INSTANCE_ID")
-    private String workflow_instanceID;
-    @Column(name = "NODE_ID")
-    private String node_id;
-    @Column(name = "GFAC_JOB_ID")
-    private String gfacJobID;
-    @Column(name = "SOURCE_TYPE")
-    private String source_type;
-    @Column(name = "ERROR_DATE")
-    private Timestamp error_date;
-
-    @Column(name = "ERROR_REPORTER")
-    private String error_reporter;
-    @Column(name = "ERROR_LOCATION")
-    private String error_location;
-    @Column(name = "ACTION_TAKEN")
-    private String action_taken;
-    @Column(name = "ERROR_REFERENCE")
-    private int error_reference;
-
-    @ManyToOne()
-    @JoinColumn(name = "EXPERIMENT_ID")
-    private Experiment_Metadata experiment_metadata;
-
-    @ManyToOne()
-    @JoinColumn(name = "WORKFLOW_INSTANCE_ID")
-    private Workflow_Data workflow_Data;
-
-    @Lob
-    @Column(name = "ERROR_MSG")
-    private String error_msg;
-    @Lob
-    @Column(name = "ERROR_DESC")
-    private String error_des;
-    @Column(name = "ERROR_CODE")
-    private String error_code;
-
-    public String getWorkflow_instanceID() {
-        return workflow_instanceID;
-    }
-
-    public String getNode_id() {
-        return node_id;
-    }
-
-    public Workflow_Data getWorkflow_Data() {
-        return workflow_Data;
-    }
-
-    public String getError_msg() {
-        return error_msg;
-    }
-
-    public String getError_des() {
-        return error_des;
-    }
-
-    public String getError_code() {
-        return error_code;
-    }
-
-    public void setWorkflow_instanceID(String workflow_instanceID) {
-        this.workflow_instanceID = workflow_instanceID;
-    }
-
-    public void setNode_id(String node_id) {
-        this.node_id = node_id;
-    }
-
-    public void setWorkflow_Data(Workflow_Data workflow_Data) {
-        this.workflow_Data = workflow_Data;
-    }
-
-    public void setError_msg(String error_msg) {
-        this.error_msg = error_msg;
-    }
-
-    public void setError_des(String error_des) {
-        this.error_des = error_des;
-    }
-
-    public void setError_code(String error_code) {
-        this.error_code = error_code;
-    }
-
-    public int getError_id() {
-        return error_id;
-    }
-
-    public String getExperiment_ID() {
-        return experiment_ID;
-    }
-
-    public String getGfacJobID() {
-        return gfacJobID;
-    }
-
-    public String getSource_type() {
-        return source_type;
-    }
-
-    public Timestamp getError_date() {
-        return error_date;
-    }
-
-    public Experiment_Metadata getExperiment_MetaData() {
-        return experiment_metadata;
-    }
-
-    public void setError_id(int error_id) {
-        this.error_id = error_id;
-    }
-
-    public void setExperiment_ID(String experiment_ID) {
-        this.experiment_ID = experiment_ID;
-    }
-
-    public void setGfacJobID(String gfacJobID) {
-        this.gfacJobID = gfacJobID;
-    }
-
-    public void setSource_type(String source_type) {
-        this.source_type = source_type;
-    }
-
-    public void setError_date(Timestamp error_date) {
-        this.error_date = error_date;
-    }
-
-    public void setExperiment_Metadata(Experiment_Metadata experiment_metadata) {
-        this.experiment_metadata = experiment_metadata;
-    }
-
-    public String getError_reporter() {
-        return error_reporter;
-    }
-
-    public String getError_location() {
-        return error_location;
-    }
-
-    public String getAction_taken() {
-        return action_taken;
-    }
-
-    public Experiment_Metadata getExperiment_Metadata() {
-        return experiment_metadata;
-    }
-
-    public void setError_reporter(String error_reporter) {
-        this.error_reporter = error_reporter;
-    }
-
-    public void setError_location(String error_location) {
-        this.error_location = error_location;
-    }
-
-    public void setAction_taken(String action_taken) {
-        this.action_taken = action_taken;
-    }
-
-    public int getError_reference() {
-        return error_reference;
-    }
-
-    public void setError_reference(int error_reference) {
-        this.error_reference = error_reference;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/a0c1cbde/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment.java
index 0577a3d..c83440b 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment.java
@@ -1,91 +1,176 @@
-///*
-// *
-// * 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.model;
-//
-//import javax.persistence.*;
-//import java.sql.Timestamp;
-//
-///**
-// * @deprecated use Experiment_Metadata instead
-// */
-//
-//@Entity
-//public class Experiment {
-//    @Id
-//    private String experiment_ID;
-//    private Timestamp submitted_date;
-//    private String user_name;
-//    private String gateway_name;
-//    private String project_name;
-//
-//    @ManyToOne(cascade= CascadeType.MERGE)
-//    @JoinColumn(name = "user_name")
-//    private Users user;
-//
-//    @ManyToOne(cascade=CascadeType.MERGE)
-//    @JoinColumn(name = "gateway_name")
-//    private Gateway gateway;
-//
-//    @ManyToOne(cascade=CascadeType.MERGE)
-//    @JoinColumn(name = "project_name")
-//    private Project project;
-//
-//    public String getExperiment_ID() {
-//        return experiment_ID;
-//    }
-//
-//    public Timestamp getSubmitted_date() {
-//        return submitted_date;
-//    }
-//
-//    public Users getUser() {
-//        return user;
-//    }
-//
-//    public Project getProject() {
-//        return project;
-//    }
-//
-//    public void setExperiment_ID(String experiment_ID) {
-//        this.experiment_ID = experiment_ID;
-//    }
-//
-//    public void setSubmitted_date(Timestamp submitted_date) {
-//        this.submitted_date = submitted_date;
-//    }
-//
-//    public void setUser(Users user) {
-//        this.user = user;
-//    }
-//
-//    public void setProject(Project project) {
-//        this.project = project;
-//    }
-//
-//    public Gateway getGateway() {
-//        return gateway;
-//    }
-//
-//    public void setGateway(Gateway gateway) {
-//        this.gateway = gateway;
-//    }
-//}
+/*
+*
+* 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.model;
+
+import javax.persistence.*;
+import java.sql.Timestamp;
+
+@Entity
+@Table(name = "EXPERIMENT")
+public class Experiment {
+    @Id
+    @Column(name = "EXPERIMENT_ID")
+    private String expId;
+    @Column(name = "GATEWAY_NAME")
+    private String gatewayName;
+    @Column(name = "EXECUTION_USER")
+    private String executionUser;
+    @Column(name = "PROJECT_NAME")
+    private String projectName;
+    @Column(name = "CREATION_TIME")
+    private Timestamp creationTime;
+    @Column(name = "EXPERIMENT_NAME")
+    private String expName;
+    @Column(name = "EXPERIMENT_DESCRIPTION")
+    private String expDesc;
+    @Column(name = "APPLICATION_ID")
+    private String applicationId;
+    @Column(name = "APPLICATION_VERSION")
+    private String appVersion;
+    @Column(name = "WORKFLOW_TEMPLATE_ID")
+    private String workflowTemplateId;
+    @Column(name = "WORKFLOW_TEMPLATE_VERSION")
+    private String workflowTemplateVersion;
+    @Column(name = "WORKFLOW_EXECUTION_ID")
+    private String workflowExecutionId;
+
+
+    @ManyToOne(cascade=CascadeType.MERGE)
+    @JoinColumn(name = "gateway_name")
+    private Gateway gateway;
+
+    @ManyToOne(cascade=CascadeType.MERGE)
+    @JoinColumn(name = "project_name")
+    private Project project;
+
+    public String getExpId() {
+        return expId;
+    }
+
+    public void setExpId(String expId) {
+        this.expId = expId;
+    }
+
+    public String getGatewayName() {
+        return gatewayName;
+    }
+
+    public void setGatewayName(String gatewayName) {
+        this.gatewayName = gatewayName;
+    }
+
+    public String getExecutionUser() {
+        return executionUser;
+    }
+
+    public void setExecutionUser(String executionUser) {
+        this.executionUser = executionUser;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public Timestamp getCreationTime() {
+        return creationTime;
+    }
+
+    public void setCreationTime(Timestamp creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    public String getExpName() {
+        return expName;
+    }
+
+    public void setExpName(String expName) {
+        this.expName = expName;
+    }
+
+    public String getExpDesc() {
+        return expDesc;
+    }
+
+    public void setExpDesc(String expDesc) {
+        this.expDesc = expDesc;
+    }
+
+    public String getApplicationId() {
+        return applicationId;
+    }
+
+    public void setApplicationId(String applicationId) {
+        this.applicationId = applicationId;
+    }
+
+    public String getAppVersion() {
+        return appVersion;
+    }
+
+    public void setAppVersion(String appVersion) {
+        this.appVersion = appVersion;
+    }
+
+    public String getWorkflowTemplateId() {
+        return workflowTemplateId;
+    }
+
+    public void setWorkflowTemplateId(String workflowTemplateId) {
+        this.workflowTemplateId = workflowTemplateId;
+    }
+
+    public String getWorkflowTemplateVersion() {
+        return workflowTemplateVersion;
+    }
+
+    public void setWorkflowTemplateVersion(String workflowTemplateVersion) {
+        this.workflowTemplateVersion = workflowTemplateVersion;
+    }
+
+    public String getWorkflowExecutionId() {
+        return workflowExecutionId;
+    }
+
+    public void setWorkflowExecutionId(String workflowExecutionId) {
+        this.workflowExecutionId = workflowExecutionId;
+    }
+
+    public Gateway getGateway() {
+        return gateway;
+    }
+
+    public void setGateway(Gateway gateway) {
+        this.gateway = gateway;
+    }
+
+    public Project getProject() {
+        return project;
+    }
+
+    public void setProject(Project project) {
+        this.project = project;
+    }
+}

http://git-wip-us.apache.org/repos/asf/airavata/blob/a0c1cbde/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ExperimentConfigData.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ExperimentConfigData.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ExperimentConfigData.java
new file mode 100644
index 0000000..ef7d38e
--- /dev/null
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ExperimentConfigData.java
@@ -0,0 +1,82 @@
+/*
+ *
+ * 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.model;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "CONFIG_DATA")
+public class ExperimentConfigData {
+    @Id
+    @Column(name = "EXPERIMENT_ID")
+    private String expId;
+    @Column(name = "AIRAVATA_AUTO_SCHEDULE")
+    private boolean airavataAutoSchedule;
+    @Column(name = "OVERRIDE_MANUAL_SCHEDULE_PARAMS")
+    private boolean overrideManualParams;
+    @Column(name = "SHARE_EXPERIMENT")
+    private boolean shareExp;
+
+    @ManyToOne(cascade= CascadeType.MERGE)
+    @JoinColumn(name = "EXPERIMENT_ID")
+    private Experiment experiment;
+
+    public String getExpId() {
+        return expId;
+    }
+
+    public void setExpId(String expId) {
+        this.expId = expId;
+    }
+
+    public boolean isAiravataAutoSchedule() {
+        return airavataAutoSchedule;
+    }
+
+    public void setAiravataAutoSchedule(boolean airavataAutoSchedule) {
+        this.airavataAutoSchedule = airavataAutoSchedule;
+    }
+
+    public boolean isOverrideManualParams() {
+        return overrideManualParams;
+    }
+
+    public void setOverrideManualParams(boolean overrideManualParams) {
+        this.overrideManualParams = overrideManualParams;
+    }
+
+    public boolean isShareExp() {
+        return shareExp;
+    }
+
+    public void setShareExp(boolean shareExp) {
+        this.shareExp = shareExp;
+    }
+
+    public Experiment getExperiment() {
+        return experiment;
+    }
+
+    public void setExperiment(Experiment experiment) {
+        this.experiment = experiment;
+    }
+}

http://git-wip-us.apache.org/repos/asf/airavata/blob/a0c1cbde/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Configuration_Data.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Configuration_Data.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Configuration_Data.java
deleted file mode 100644
index 509f8f4..0000000
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Configuration_Data.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.persistance.registry.jpa.model;
-
-import javax.persistence.*;
-import java.sql.Timestamp;
-
-@Entity
-@Table(name ="EXPERIMENT_CONFIGURATION_DATA")
-public class Experiment_Configuration_Data {
-    @Id
-    @Column(name = "EXPERIMENT_ID")
-    private String experiment_id;
-    @ManyToOne
-    @JoinColumn(name = "EXPERIMENT_ID")
-    private Experiment_Metadata experiment_metadata;
-    @Column(name = "RESOURCE_HOST_ID")
-    private String resource_host_id;
-    @Column(name = "TOTAL_CPU_COUNT")
-    private int total_cpu_count;
-    @Column(name = "NODE_COUNT")
-    private int node_count;
-    @Column(name = "NUMBER_OF_THREADS")
-    private int number_of_threads;
-    @Column(name = "QUEUE_NAME")
-    private String queue_name;
-    @Column(name = "WALLTIME_LIMIT")
-    private int walltime_limit;
-    @Column(name = "JOB_START_TIME")
-    private Timestamp job_start_time;
-    @Column(name = "TOTAL_PHYSICAL_MEMORY")
-    private int total_physical_memory;
-    @Column(name = "COMPUTATIONAL_PROJECT_ACCOUNT")
-    private String computational_project_account;
-    @Column(name = "AIRAVATA_AUTO_SCHEDULE")
-    private boolean airavata_auto_schedule;
-    @Column(name = "OVERRIDE_MANUAL_SCHEDULE_PARAMS")
-    private boolean override_manual_schedule;
-    @Column(name = "UNIQUE_WORKING_DIR")
-    private String unique_working_dir;
-    @Column(name = "STAGE_INPUT_FILES_TO_WORKING_DIR")
-    private boolean stage_input_files_to_working_dir;
-    @Column(name = "OUTPUT_DATA_DIR")
-    private String output_data_dir;
-    @Column(name = "DATA_REG_URL")
-    private String data_reg_url;
-    @Column(name = "PERSIST_OUTPUT_DATA")
-    private boolean persist_output_data;
-    @Column(name = "CLEAN_AFTER_JOB")
-    private boolean clean_after_job;
-    @Column(name = "APPLICATION_ID")
-    private String application_id;
-    @Column(name = "APPLICATION_VERSION")
-    private String application_version;
-    @Column(name = "WORKFLOW_TEMPLATE_ID")
-    private String workflow_template_id;
-    @Column(name = "WORKFLOW_TEMPLATE_VERSION")
-    private String workflow_template_version;
-    @Column(name = "WORKING_DIR_PARENT")
-    private String working_dir_parent;
-    @Column(name = "START_EXECUTION_AT")
-    private String start_execution_at;
-    @Column(name = "EXECUTE_BEFORE")
-    private String execute_before;
-    @Column(name = "NUMBER_OF_RETRIES")
-    private int number_of_retries;
-
-    @Lob
-    @Column(name = "EXPERIMENT_CONFIG_DATA")
-    private byte[] experiment_config_data;
-
-    public Experiment_Metadata getExperiment_metadata() {
-        return experiment_metadata;
-    }
-
-    public void setExperiment_metadata(Experiment_Metadata experiment_metadata) {
-        this.experiment_metadata = experiment_metadata;
-    }
-
-    public String getResource_host_id() {
-        return resource_host_id;
-    }
-
-    public void setResource_host_id(String resource_host_id) {
-        this.resource_host_id = resource_host_id;
-    }
-
-    public int getTotal_cpu_count() {
-        return total_cpu_count;
-    }
-
-    public void setTotal_cpu_count(int total_cpu_count) {
-        this.total_cpu_count = total_cpu_count;
-    }
-
-    public int getNode_count() {
-        return node_count;
-    }
-
-    public void setNode_count(int node_count) {
-        this.node_count = node_count;
-    }
-
-    public int getNumber_of_threads() {
-        return number_of_threads;
-    }
-
-    public void setNumber_of_threads(int number_of_threads) {
-        this.number_of_threads = number_of_threads;
-    }
-
-    public String getQueue_name() {
-        return queue_name;
-    }
-
-    public void setQueue_name(String queue_name) {
-        this.queue_name = queue_name;
-    }
-
-    public int getWalltime_limit() {
-        return walltime_limit;
-    }
-
-    public void setWalltime_limit(int walltime_limit) {
-        this.walltime_limit = walltime_limit;
-    }
-
-    public Timestamp getJob_start_time() {
-        return job_start_time;
-    }
-
-    public void setJob_start_time(Timestamp job_start_time) {
-        this.job_start_time = job_start_time;
-    }
-
-    public int getTotal_physical_memory() {
-        return total_physical_memory;
-    }
-
-    public void setTotal_physical_memory(int total_physical_memory) {
-        this.total_physical_memory = total_physical_memory;
-    }
-
-    public String getComputational_project_account() {
-        return computational_project_account;
-    }
-
-    public void setComputational_project_account(String computational_project_account) {
-        this.computational_project_account = computational_project_account;
-    }
-
-    public boolean isAiravata_auto_schedule() {
-        return airavata_auto_schedule;
-    }
-
-    public void setAiravata_auto_schedule(boolean airavata_auto_schedule) {
-        this.airavata_auto_schedule = airavata_auto_schedule;
-    }
-
-    public boolean isOverride_manual_schedule() {
-        return override_manual_schedule;
-    }
-
-    public void setOverride_manual_schedule(boolean override_manual_schedule) {
-        this.override_manual_schedule = override_manual_schedule;
-    }
-
-    public boolean isStage_input_files_to_working_dir() {
-        return stage_input_files_to_working_dir;
-    }
-
-    public void setStage_input_files_to_working_dir(boolean stage_input_files_to_working_dir) {
-        this.stage_input_files_to_working_dir = stage_input_files_to_working_dir;
-    }
-
-    public String getOutput_data_dir() {
-        return output_data_dir;
-    }
-
-    public void setOutput_data_dir(String output_data_dir) {
-        this.output_data_dir = output_data_dir;
-    }
-
-    public String getData_reg_url() {
-        return data_reg_url;
-    }
-
-    public void setData_reg_url(String data_reg_url) {
-        this.data_reg_url = data_reg_url;
-    }
-
-    public boolean isPersist_output_data() {
-        return persist_output_data;
-    }
-
-    public void setPersist_output_data(boolean persist_output_data) {
-        this.persist_output_data = persist_output_data;
-    }
-
-    public boolean isClean_after_job() {
-        return clean_after_job;
-    }
-
-    public void setClean_after_job(boolean clean_after_job) {
-        this.clean_after_job = clean_after_job;
-    }
-
-    public byte[] getExperiment_config_data() {
-        return experiment_config_data;
-    }
-
-    public void setExperiment_config_data(byte[] experiment_config_data) {
-        this.experiment_config_data = experiment_config_data;
-    }
-
-    public String getUnique_working_dir() {
-        return unique_working_dir;
-    }
-
-    public void setUnique_working_dir(String unique_working_dir) {
-        this.unique_working_dir = unique_working_dir;
-    }
-
-    public String getApplication_id() {
-        return application_id;
-    }
-
-    public void setApplication_id(String application_id) {
-        this.application_id = application_id;
-    }
-
-    public String getApplication_version() {
-        return application_version;
-    }
-
-    public void setApplication_version(String application_version) {
-        this.application_version = application_version;
-    }
-
-    public String getWorkflow_template_id() {
-        return workflow_template_id;
-    }
-
-    public void setWorkflow_template_id(String workflow_template_id) {
-        this.workflow_template_id = workflow_template_id;
-    }
-
-    public String getWorkflow_template_version() {
-        return workflow_template_version;
-    }
-
-    public void setWorkflow_template_version(String workflow_template_version) {
-        this.workflow_template_version = workflow_template_version;
-    }
-
-    public String getWorking_dir_parent() {
-        return working_dir_parent;
-    }
-
-    public void setWorking_dir_parent(String working_dir_parent) {
-        this.working_dir_parent = working_dir_parent;
-    }
-
-    public String getStart_execution_at() {
-        return start_execution_at;
-    }
-
-    public void setStart_execution_at(String start_execution_at) {
-        this.start_execution_at = start_execution_at;
-    }
-
-    public String getExecute_before() {
-        return execute_before;
-    }
-
-    public void setExecute_before(String execute_before) {
-        this.execute_before = execute_before;
-    }
-
-    public int getNumber_of_retries() {
-        return number_of_retries;
-    }
-
-    public void setNumber_of_retries(int number_of_retries) {
-        this.number_of_retries = number_of_retries;
-    }
-
-    public String getExperiment_id() {
-        return experiment_id;
-    }
-
-    public void setExperiment_id(String experiment_id) {
-        this.experiment_id = experiment_id;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/a0c1cbde/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Data.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Data.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Data.java
deleted file mode 100644
index d070fe8..0000000
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Data.java
+++ /dev/null
@@ -1,66 +0,0 @@
-///*
-// *
-// * Licensed to the Apache Software Foundation (ASF) under one
-// * or more contributor license agreements.  See the NOTICE file
-// * distributed with this work for additional information
-// * regarding copyright ownership.  The ASF licenses this file
-// * to you under the Apache License, Version 2.0 (the
-// * "License"); you may not use this file except in compliance
-// * with the License.  You may obtain a copy of the License at
-// *
-// *   http://www.apache.org/licenses/LICENSE-2.0
-// *
-// * Unless required by applicable law or agreed to in writing,
-// * software distributed under the License is distributed on an
-// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// * KIND, either express or implied.  See the License for the
-// * specific language governing permissions and limitations
-// * under the License.
-// *
-//*/
-//package org.apache.airavata.persistance.registry.jpa.model;
-//
-//import javax.persistence.Entity;
-//import javax.persistence.Id;
-//
-///**
-// * @deprecated user Experiment_Configuration_Data
-// */
-//@Entity
-//public class Experiment_Data {
-//	@Id
-//	private String experiment_ID;
-//	private String name;
-//    private String username;
-//
-//	/*@OneToMany(cascade=CascadeType.ALL, mappedBy = "Experiment_Data")
-//	private final List<Workflow_Data> workflows = new ArrayList<Workflow_Data>();*/
-//
-//	public String getExperiment_ID() {
-//		return experiment_ID;
-//	}
-//
-//	public void setExperiment_ID(String experiment_ID) {
-//		this.experiment_ID = experiment_ID;
-//	}
-//
-//	public String getName() {
-//		return name;
-//	}
-//
-//	public void setName(String name) {
-//		this.name = name;
-//	}
-//
-//    public String getUsername() {
-//        return username;
-//    }
-//
-//    public void setUsername(String username) {
-//        this.username = username;
-//    }
-//
-//    /*public List<Workflow_Data> getWorkflows() {
-//        return workflows;
-//    }*/
-//}

http://git-wip-us.apache.org/repos/asf/airavata/blob/a0c1cbde/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Input.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Input.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Input.java
index cbdd6dd..0b40b46 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Input.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Input.java
@@ -32,15 +32,21 @@ public class Experiment_Input {
     private String experiment_id;
 
     @Id
-    @Column(name = "EX_KEY")
+    @Column(name = "INPUT_KEY")
     private String ex_key;
 
     @Column(name = "VALUE")
     private String value;
 
+    @Column(name = "INPUT_TYPE")
+    private String inputType;
+
+    @Column(name = "METADATA")
+    private String metadata;
+
     @ManyToOne
     @JoinColumn(name = "EXPERIMENT_ID")
-    private Experiment_Metadata experiment_metadata;
+    private Experiment experiment;
 
     public String getExperiment_id() {
         return experiment_id;
@@ -50,14 +56,6 @@ public class Experiment_Input {
         this.experiment_id = experiment_id;
     }
 
-    public Experiment_Metadata getExperiment_metadata() {
-        return experiment_metadata;
-    }
-
-    public void setExperiment_metadata(Experiment_Metadata experiment_metadata) {
-        this.experiment_metadata = experiment_metadata;
-    }
-
     public String getEx_key() {
         return ex_key;
     }
@@ -73,4 +71,28 @@ public class Experiment_Input {
     public void setValue(String value) {
         this.value = value;
     }
+
+    public String getInputType() {
+        return inputType;
+    }
+
+    public void setInputType(String inputType) {
+        this.inputType = inputType;
+    }
+
+    public String getMetadata() {
+        return metadata;
+    }
+
+    public void setMetadata(String metadata) {
+        this.metadata = metadata;
+    }
+
+    public Experiment getExperiment() {
+        return experiment;
+    }
+
+    public void setExperiment(Experiment experiment) {
+        this.experiment = experiment;
+    }
 }

http://git-wip-us.apache.org/repos/asf/airavata/blob/a0c1cbde/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Metadata.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Metadata.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Metadata.java
deleted file mode 100644
index 0732caf..0000000
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Metadata.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-package org.apache.airavata.persistance.registry.jpa.model;
-
-import javax.persistence.*;
-import java.sql.Timestamp;
-
-@Entity
-@Table(name ="EXPERIMENT_METADATA")
-public class Experiment_Metadata {
-    @Id
-    @Column(name = "EXPERIMENT_ID")
-    private String experiment_id;
-    @Column(name = "EXPERIMENT_NAME")
-    private String experiment_name;
-    @Column(name = "DESCRIPTION")
-    private String description;
-    @Column(name = "SUBMITTED_DATE")
-    private Timestamp submitted_date;
-    @Column(name = "EXECUTION_USER" )
-    private String execution_user;
-    @Column(name = "GATEWAY_NAME")
-    private String gateway_name;
-    @Column(name = "PROJECT_NAME")
-    private String project_name;
-
-
-//    @ManyToOne(cascade= CascadeType.MERGE)
-//    @JoinColumn(name = "EXECUTION_USER", referencedColumnName = "USER_NAME" )
-//    private Users user;
-
-    @ManyToOne(cascade=CascadeType.MERGE)
-    @JoinColumn(name = "GATEWAY_NAME")
-    private Gateway gateway;
-
-    @ManyToOne(cascade=CascadeType.MERGE)
-    @JoinColumn(name = "PROJECT_NAME")
-    private Project project;
-
-    private boolean share_experiment;
-
-    public String getExecution_user() {
-        return execution_user;
-    }
-
-    public void setExecution_user(String execution_user) {
-        this.execution_user = execution_user;
-    }
-
-    public String getGateway_name() {
-        return gateway_name;
-    }
-
-    public void setGateway_name(String gateway_name) {
-        this.gateway_name = gateway_name;
-    }
-
-    public String getProject_name() {
-        return project_name;
-    }
-
-    public void setProject_name(String project_name) {
-        this.project_name = project_name;
-    }
-
-    public String getExperiment_id() {
-        return experiment_id;
-    }
-
-    public void setExperiment_id(String experiment_id) {
-        this.experiment_id = experiment_id;
-    }
-
-    public String getExperiment_name() {
-        return experiment_name;
-    }
-
-    public void setExperiment_name(String experiment_name) {
-        this.experiment_name = experiment_name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Timestamp getSubmitted_date() {
-        return submitted_date;
-    }
-
-    public void setSubmitted_date(Timestamp submitted_date) {
-        this.submitted_date = submitted_date;
-    }
-
-//    public Users getUser() {
-//        return user;
-//    }
-//
-//    public void setUser(Users user) {
-//        this.user = user;
-//    }
-
-    public Gateway getGateway() {
-        return gateway;
-    }
-
-    public void setGateway(Gateway gateway) {
-        this.gateway = gateway;
-    }
-
-    public Project getProject() {
-        return project;
-    }
-
-    public void setProject(Project project) {
-        this.project = project;
-    }
-
-    public boolean isShare_experiment() {
-        return share_experiment;
-    }
-
-    public void setShare_experiment(boolean share_experiment) {
-        this.share_experiment = share_experiment;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/a0c1cbde/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Output.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Output.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Output.java
index 57f1d2c..4c9e055 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Output.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Output.java
@@ -32,14 +32,18 @@ public class Experiment_Output {
     private String experiment_id;
 
     @Id
-    @Column(name = "EX_KEY")
+    @Column(name = "OUTPUT_KEY")
     private String ex_key;
     @Column(name = "VALUE")
     private String value;
+    @Column(name = "METADATA")
+    private String metadata;
+    @Column(name = "OUTPUT_KEY_TYPE")
+    private String outputKeyType;
 
     @ManyToOne
     @JoinColumn(name = "EXPERIMENT_ID")
-    private Experiment_Metadata experiment_metadata;
+    private Experiment experiment;
 
     public String getExperiment_id() {
         return experiment_id;
@@ -49,14 +53,6 @@ public class Experiment_Output {
         this.experiment_id = experiment_id;
     }
 
-    public Experiment_Metadata getExperiment_metadata() {
-        return experiment_metadata;
-    }
-
-    public void setExperiment_metadata(Experiment_Metadata experiment_metadata) {
-        this.experiment_metadata = experiment_metadata;
-    }
-
     public String getEx_key() {
         return ex_key;
     }
@@ -72,4 +68,28 @@ public class Experiment_Output {
     public void setValue(String value) {
         this.value = value;
     }
+
+    public String getMetadata() {
+        return metadata;
+    }
+
+    public void setMetadata(String metadata) {
+        this.metadata = metadata;
+    }
+
+    public String getOutputKeyType() {
+        return outputKeyType;
+    }
+
+    public void setOutputKeyType(String outputKeyType) {
+        this.outputKeyType = outputKeyType;
+    }
+
+    public Experiment getExperiment() {
+        return experiment;
+    }
+
+    public void setExperiment(Experiment experiment) {
+        this.experiment = experiment;
+    }
 }

http://git-wip-us.apache.org/repos/asf/airavata/blob/a0c1cbde/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Summary.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Summary.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Summary.java
deleted file mode 100644
index e06cfc8..0000000
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Summary.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-package org.apache.airavata.persistance.registry.jpa.model;
-
-
-import javax.persistence.*;
-import java.sql.Timestamp;
-
-@Entity
-@Table(name ="EXPERIMENT_SUMMARY")
-public class Experiment_Summary {
-    @Id
-    @Column(name = "EXPERIMENT_ID")
-    private String experimentID;
-
-    @ManyToOne
-    @JoinColumn(name = "EXPERIMENT_ID")
-    private Experiment_Metadata experiment_metadata;
-    @Column(name = "STATUS")
-    private String status;
-    @Column(name = "LAST_UPDATED_TIME")
-    private Timestamp last_update_time;
-
-    public Experiment_Metadata getExperiment_metadata() {
-        return experiment_metadata;
-    }
-
-    public void setExperiment_metadata(Experiment_Metadata experiment_metadata) {
-        this.experiment_metadata = experiment_metadata;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public Timestamp getLast_update_time() {
-        return last_update_time;
-    }
-
-    public void setLast_update_time(Timestamp last_update_time) {
-        this.last_update_time = last_update_time;
-    }
-
-    public String getExperimentID() {
-        return experimentID;
-    }
-
-    public void setExperimentID(String experimentID) {
-        this.experimentID = experimentID;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/a0c1cbde/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/GFac_Job_Data.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/GFac_Job_Data.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/GFac_Job_Data.java
deleted file mode 100644
index 4e7fd5b..0000000
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/GFac_Job_Data.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-package org.apache.airavata.persistance.registry.jpa.model;
-
-import javax.persistence.*;
-import java.sql.Timestamp;
-
-@Entity
-@Table(name ="GFAC_JOB_DATA")
-public class GFac_Job_Data {
-    @Column(name = "EXPERIMENT_ID")
-    private String experiment_ID;
-    @Column(name = "WORKFLOW_INSTANCE_ID")
-    private String workflow_instanceID;
-    @Column(name = "NODE_ID")
-    private String  node_id;
-    @Column(name = "APPLICATION_DESC_ID")
-    private String application_descriptor_ID;
-    @Column(name = "HOST_DESC_ID")
-    private String host_descriptor_ID;
-    @Column(name = "SERVICE_DESC_ID")
-    private String service_descriptor_ID;
-    @Lob
-    @Column(name = "JOB_DATA")
-    private String job_data;
-    @Id
-    @Column(name = "LOCAL_JOB_ID")
-    private String local_Job_ID;
-    @Column(name = "SUBMITTED_TIME")
-    private Timestamp  submitted_time;
-    @Column(name = "STATUS_UPDATE_TIME")
-    private Timestamp  status_update_time;
-    @Column(name = "STATUS")
-    private String status;
-    @Lob
-    @Column(name = "METADATA")
-    private String metadata;
-
-    @ManyToOne()
-    @JoinColumn(name = "EXPERIMENT_ID")
-    private Experiment_Metadata experiment_metadata;
-
-    @ManyToOne()
-    @JoinColumn(name = "WORKFLOW_INSTANCE_ID")
-    private Workflow_Data workflow_Data;
-
-    public String getExperiment_ID() {
-        return experiment_ID;
-    }
-
-    public String getWorkflow_instanceID() {
-        return workflow_instanceID;
-    }
-
-    public String getNode_id() {
-        return node_id;
-    }
-
-    public String getApplication_descriptor_ID() {
-        return application_descriptor_ID;
-    }
-
-    public String getHost_descriptor_ID() {
-        return host_descriptor_ID;
-    }
-
-    public String getService_descriptor_ID() {
-        return service_descriptor_ID;
-    }
-
-    public String getJob_data() {
-        return job_data;
-    }
-
-    public String getLocal_Job_ID() {
-        return local_Job_ID;
-    }
-
-    public Timestamp getSubmitted_time() {
-        return submitted_time;
-    }
-
-    public Timestamp getStatus_update_time() {
-        return status_update_time;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public String getMetadata() {
-        return metadata;
-    }
-
-    public Experiment_Metadata getExperiment_metadata() {
-        return experiment_metadata;
-    }
-
-    public Workflow_Data getWorkflow_Data() {
-        return workflow_Data;
-    }
-
-    public void setExperiment_ID(String experiment_ID) {
-        this.experiment_ID = experiment_ID;
-    }
-
-    public void setWorkflow_instanceID(String workflow_instanceID) {
-        this.workflow_instanceID = workflow_instanceID;
-    }
-
-    public void setNode_id(String node_id) {
-        this.node_id = node_id;
-    }
-
-    public void setApplication_descriptor_ID(String application_descriptor_ID) {
-        this.application_descriptor_ID = application_descriptor_ID;
-    }
-
-    public void setHost_descriptor_ID(String host_descriptor_ID) {
-        this.host_descriptor_ID = host_descriptor_ID;
-    }
-
-    public void setService_descriptor_ID(String service_descriptor_ID) {
-        this.service_descriptor_ID = service_descriptor_ID;
-    }
-
-    public void setJob_data(String job_data) {
-        this.job_data = job_data;
-    }
-
-    public void setLocal_Job_ID(String local_Job_ID) {
-        this.local_Job_ID = local_Job_ID;
-    }
-
-    public void setSubmitted_time(Timestamp submitted_time) {
-        this.submitted_time = submitted_time;
-    }
-
-    public void setStatus_update_time(Timestamp status_update_time) {
-        this.status_update_time = status_update_time;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public void setMetadata(String metadata) {
-        this.metadata = metadata;
-    }
-
-    public void setExperiment_metadata(Experiment_Metadata experiment_metadata) {
-        this.experiment_metadata = experiment_metadata;
-    }
-
-    public void setWorkflow_Data(Workflow_Data workflow_Data) {
-        this.workflow_Data = workflow_Data;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/a0c1cbde/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/GFac_Job_Status.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/GFac_Job_Status.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/GFac_Job_Status.java
deleted file mode 100644
index 9d5d794..0000000
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/GFac_Job_Status.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-package org.apache.airavata.persistance.registry.jpa.model;
-
-import javax.persistence.*;
-import java.sql.Timestamp;
-
-@Entity
-@Table(name ="GFAC_JOB_STATUS")
-public class GFac_Job_Status {
-    @Column(name = "LOCAL_JOB_ID")
-    private String local_Job_ID;
-    @Column(name = "STATUS_UPDATE_TIME")
-    private Timestamp status_update_time;
-    @Column(name = "STATUS")
-    private String status;
-
-    @ManyToOne()
-    @JoinColumn(name = "LOCAL_JOB_ID")
-    private GFac_Job_Data gFac_job_data;
-
-
-    public String getLocal_Job_ID() {
-        return local_Job_ID;
-    }
-
-    public Timestamp getStatus_update_time() {
-        return status_update_time;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setLocal_Job_ID(String local_Job_ID) {
-        this.local_Job_ID = local_Job_ID;
-    }
-
-    public void setStatus_update_time(Timestamp status_update_time) {
-        this.status_update_time = status_update_time;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public GFac_Job_Data getgFac_job_data() {
-        return gFac_job_data;
-    }
-
-    public void setgFac_job_data(GFac_Job_Data gFac_job_data) {
-        this.gFac_job_data = gFac_job_data;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/a0c1cbde/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Gram_Data.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Gram_Data.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Gram_Data.java
deleted file mode 100644
index 22e4864..0000000
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Gram_Data.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-package org.apache.airavata.persistance.registry.jpa.model;
-
-import javax.persistence.*;
-
-@Entity
-@Table(name ="GRAM_DATA")
-@IdClass(Gram_DataPK.class)
-public class Gram_Data {
-
-	@ManyToOne(cascade = CascadeType.PERSIST)
-	@JoinColumn(name = "WORKFLOW_INSTANCE_ID")
-	private Workflow_Data workflow_Data;
-
-    @Id
-    @Column(name = "WORKFLOW_INSTANCE_ID")
-    private String workflow_instanceID;
-	@Id
-    @Column(name = "NODE_ID")
-	private String node_id;
-
-    @Lob
-    @Column(name = "RSL")
-	private byte[] rsl;
-    @Column(name = "INVOKED_HOST")
-    private String invoked_host;
-    @Column(name = "LOCAL_JOB_ID")
-    private String local_Job_ID;
-
-	public Workflow_Data getWorkflow_Data() {
-		return workflow_Data;
-	}
-
-	public void setWorkflow_Data(Workflow_Data workflow_Data) {
-		this.workflow_Data = workflow_Data;
-	}
-
-	public String getNode_id() {
-		return node_id;
-	}
-
-	public void setNode_id(String node_id) {
-		this.node_id = node_id;
-	}
-
-	public byte[] getRsl() {
-		return rsl;
-	}
-
-	public void setRsl(byte[] rsl) {
-		this.rsl = rsl;
-	}
-
-	public String getInvoked_host() {
-		return invoked_host;
-	}
-
-	public void setInvoked_host(String invoked_host) {
-		this.invoked_host = invoked_host;
-	}
-
-    public String getLocal_Job_ID() {
-        return local_Job_ID;
-    }
-
-    public void setLocal_Job_ID(String local_Job_ID) {
-        this.local_Job_ID = local_Job_ID;
-    }
-
-    public String getWorkflow_instanceID() {
-        return workflow_instanceID;
-    }
-
-    public void setWorkflow_instanceID(String workflow_instanceID) {
-        this.workflow_instanceID = workflow_instanceID;
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/a0c1cbde/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Gram_DataPK.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Gram_DataPK.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Gram_DataPK.java
deleted file mode 100644
index 78ee3ac..0000000
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Gram_DataPK.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-package org.apache.airavata.persistance.registry.jpa.model;
-
-public class Gram_DataPK {
-    private String workflow_instanceID;
-    private String node_id;
-
-    public Gram_DataPK() {
-        ;
-    }
-
-    public Gram_DataPK(String workflow_instanceID, String node_id) {
-        this.workflow_instanceID = workflow_instanceID;
-        this.node_id = node_id;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return false;
-    }
-
-    @Override
-    public int hashCode() {
-        return 1;
-    }
-
-    public String getWorkflow_instanceID() {
-        return workflow_instanceID;
-    }
-
-    public void setWorkflow_instanceID(String workflow_instanceID) {
-        this.workflow_instanceID = workflow_instanceID;
-    }
-
-    public String getNode_id() {
-        return node_id;
-    }
-
-    public void setNode_id(String node_id) {
-        this.node_id = node_id;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/a0c1cbde/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/JobDetail.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/JobDetail.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/JobDetail.java
new file mode 100644
index 0000000..a04e722
--- /dev/null
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/JobDetail.java
@@ -0,0 +1,85 @@
+/*
+ *
+ * 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.model;
+
+import javax.persistence.*;
+import java.sql.Timestamp;
+
+@Entity
+@Table(name = "JOB_DETAIL")
+@IdClass(JobDetails_PK.class)
+public class JobDetail {
+    @Id
+    @Column(name = "JOB_ID")
+    private String jobId;
+    @Id
+    @Column(name = "TASK_ID")
+    private String taskId;
+    @Column(name = "JOB_DESCRIPTION")
+    private String jobDescription;
+    @Column(name = "CREATION_TIME")
+    private Timestamp creationTime;
+
+    @ManyToOne(cascade= CascadeType.MERGE)
+    @JoinColumn(name = "TASK_ID")
+    private TaskDetail task;
+
+    public String getJobId() {
+        return jobId;
+    }
+
+    public void setJobId(String jobId) {
+        this.jobId = jobId;
+    }
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+
+    public String getJobDescription() {
+        return jobDescription;
+    }
+
+    public void setJobDescription(String jobDescription) {
+        this.jobDescription = jobDescription;
+    }
+
+    public Timestamp getCreationTime() {
+        return creationTime;
+    }
+
+    public void setCreationTime(Timestamp creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    public TaskDetail getTask() {
+        return task;
+    }
+
+    public void setTask(TaskDetail task) {
+        this.task = task;
+    }
+}

http://git-wip-us.apache.org/repos/asf/airavata/blob/a0c1cbde/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/JobDetails_PK.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/JobDetails_PK.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/JobDetails_PK.java
new file mode 100644
index 0000000..bb1cf30
--- /dev/null
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/JobDetails_PK.java
@@ -0,0 +1,62 @@
+/*
+ *
+ * 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.model;
+
+public class JobDetails_PK {
+    private String jobId;
+    private String taskId;
+
+    public JobDetails_PK(String jobId, String taskId) {
+        this.jobId = jobId;
+        this.taskId = taskId;
+    }
+
+    public JobDetails_PK() {
+        ;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return 1;
+    }
+
+    public String getJobId() {
+        return jobId;
+    }
+
+    public void setJobId(String jobId) {
+        this.jobId = jobId;
+    }
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+}

http://git-wip-us.apache.org/repos/asf/airavata/blob/a0c1cbde/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeInput.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeInput.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeInput.java
new file mode 100644
index 0000000..78a6a30
--- /dev/null
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeInput.java
@@ -0,0 +1,94 @@
+/*
+ *
+ * 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.model;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "NODE_INPUT")
+@IdClass(NodeInput_PK.class)
+public class NodeInput {
+    @Id
+    @Column(name = "NODE_INSTANCE_ID")
+    private String nodeId;
+    @Id
+    @Column(name = "INPUT_KEY")
+    private String inputKey;
+    @Column(name = "INPUT_KEY_TYPE")
+    private String inputKeyType;
+    @Column(name = "METADATA")
+    private String metadata;
+    @Column(name = "VALUE")
+    private String value;
+
+    @ManyToOne(cascade= CascadeType.MERGE)
+    @JoinColumn(name = "NODE_INSTANCE_ID")
+    private WorkflowNodeDetail nodeDetails;
+
+    public String getInputKey() {
+        return inputKey;
+    }
+
+    public void setInputKey(String inputKey) {
+        this.inputKey = inputKey;
+    }
+
+    public String getInputKeyType() {
+        return inputKeyType;
+    }
+
+    public void setInputKeyType(String inputKeyType) {
+        this.inputKeyType = inputKeyType;
+    }
+
+    public String getMetadata() {
+        return metadata;
+    }
+
+    public void setMetadata(String metadata) {
+        this.metadata = metadata;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getNodeId() {
+        return nodeId;
+    }
+
+    public void setNodeId(String nodeId) {
+        this.nodeId = nodeId;
+    }
+
+    public WorkflowNodeDetail getNodeDetails() {
+        return nodeDetails;
+    }
+
+    public void setNodeDetails(WorkflowNodeDetail nodeDetails) {
+        this.nodeDetails = nodeDetails;
+    }
+}

http://git-wip-us.apache.org/repos/asf/airavata/blob/a0c1cbde/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeInput_PK.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeInput_PK.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeInput_PK.java
new file mode 100644
index 0000000..d7526db
--- /dev/null
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeInput_PK.java
@@ -0,0 +1,62 @@
+/*
+ *
+ * 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.model;
+
+public class NodeInput_PK {
+    private String nodeId;
+    private String inputKey;
+
+    public NodeInput_PK(String nodeId, String inputKey) {
+        this.nodeId = nodeId;
+        this.inputKey = inputKey;
+    }
+
+    public NodeInput_PK() {
+        ;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return 1;
+    }
+
+    public String getNodeId() {
+        return nodeId;
+    }
+
+    public void setNodeId(String nodeId) {
+        this.nodeId = nodeId;
+    }
+
+    public String getInputKey() {
+        return inputKey;
+    }
+
+    public void setInputKey(String inputKey) {
+        this.inputKey = inputKey;
+    }
+}

http://git-wip-us.apache.org/repos/asf/airavata/blob/a0c1cbde/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeOutput.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeOutput.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeOutput.java
new file mode 100644
index 0000000..7bf0cea
--- /dev/null
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeOutput.java
@@ -0,0 +1,94 @@
+/*
+ *
+ * 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.model;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "NODE_OUTPUT")
+@IdClass(NodeOutput_PK.class)
+public class NodeOutput {
+    @Id
+    @Column(name = "NODE_INSTANCE_ID")
+    private String nodeId;
+    @Id
+    @Column(name = "OUTPUT_KEY")
+    private String outputKey;
+    @Column(name = "OUTPUT_KEY_TYPE")
+    private String outputKeyType;
+    @Column(name = "METADATA")
+    private String metadata;
+    @Column(name = "VALUE")
+    private String value;
+
+    @ManyToOne(cascade= CascadeType.MERGE)
+    @JoinColumn(name = "NODE_INSTANCE_ID")
+    private WorkflowNodeDetail node;
+
+    public String getNodeId() {
+        return nodeId;
+    }
+
+    public void setNodeId(String nodeId) {
+        this.nodeId = nodeId;
+    }
+
+    public String getMetadata() {
+        return metadata;
+    }
+
+    public void setMetadata(String metadata) {
+        this.metadata = metadata;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public WorkflowNodeDetail getNode() {
+        return node;
+    }
+
+    public void setNode(WorkflowNodeDetail node) {
+        this.node = node;
+    }
+
+    public String getOutputKey() {
+        return outputKey;
+    }
+
+    public void setOutputKey(String outputKey) {
+        this.outputKey = outputKey;
+    }
+
+    public String getOutputKeyType() {
+        return outputKeyType;
+    }
+
+    public void setOutputKeyType(String outputKeyType) {
+        this.outputKeyType = outputKeyType;
+    }
+}

http://git-wip-us.apache.org/repos/asf/airavata/blob/a0c1cbde/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeOutput_PK.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeOutput_PK.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeOutput_PK.java
new file mode 100644
index 0000000..0d2ae71
--- /dev/null
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/NodeOutput_PK.java
@@ -0,0 +1,62 @@
+/*
+ *
+ * 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.model;
+
+public class NodeOutput_PK {
+    private String nodeId;
+    private String outputKey;
+
+    public NodeOutput_PK(String nodeId, String outputKey) {
+        this.nodeId = nodeId;
+        this.outputKey = outputKey;
+    }
+
+    public NodeOutput_PK() {
+        ;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return 1;
+    }
+
+    public String getNodeId() {
+        return nodeId;
+    }
+
+    public void setNodeId(String nodeId) {
+        this.nodeId = nodeId;
+    }
+
+    public String getOutputKey() {
+        return outputKey;
+    }
+
+    public void setOutputKey(String outputKey) {
+        this.outputKey = outputKey;
+    }
+}

http://git-wip-us.apache.org/repos/asf/airavata/blob/a0c1cbde/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_Data.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_Data.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_Data.java
deleted file mode 100644
index 1ccdbac..0000000
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_Data.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-package org.apache.airavata.persistance.registry.jpa.model;
-
-import java.sql.Timestamp;
-
-import javax.persistence.*;
-
-@Entity
-@Table(name ="NODE_DATA")
-@IdClass(Node_DataPK.class)
-public class Node_Data {
-
-	@Id
-    @Column(name = "WORKFLOW_INSTANCE_ID")
-    private String workflow_instanceID;
-
-	@ManyToOne()
-	@JoinColumn(name = "WORKFLOW_INSTANCE_ID")
-	private Workflow_Data workflow_Data;
-
-	@Id
-    @Column(name = "NODE_ID")
-	private String node_id;
-
-    @Id
-    @Column(name = "EXECUTION_INDEX")
-    private int execution_index;
-
-    @Column(name = "NODE_TYPE")
-	private String node_type;
-	@Lob
-    @Column(name = "INPUTS")
-    private byte[] inputs;
-	@Lob
-    @Column(name = "OUTPUTS")
-    private byte[] outputs;
-    @Column(name = "STATUS")
-    private String status;
-    @Column(name = "START_TIME")
-    private Timestamp start_time;
-    @Column(name = "LAST_UPDATE_TIME")
-    private Timestamp last_update_time;
-
-	public Workflow_Data getWorkflow_Data() {
-		return workflow_Data;
-	}
-
-	public void setWorkflow_Data(Workflow_Data workflow_Data) {
-		this.workflow_Data = workflow_Data;
-	}
-
-	public String getNode_id() {
-		return node_id;
-	}
-
-	public void setNode_id(String node_id) {
-		this.node_id = node_id;
-	}
-
-	public String getNode_type() {
-		return node_type;
-	}
-
-	public void setNode_type(String node_type) {
-		this.node_type = node_type;
-	}
-
-	public byte[] getInputs() {
-		return inputs;
-	}
-
-	public void setInputs(byte[] inputs) {
-		this.inputs = inputs;
-	}
-
-	public byte[] getOutputs() {
-		return outputs;
-	}
-
-	public void setOutputs(byte[] outputs) {
-		this.outputs = outputs;
-	}
-
-	public String getStatus() {
-		return status;
-	}
-
-	public void setStatus(String status) {
-		this.status = status;
-	}
-
-	public Timestamp getStart_time() {
-		return start_time;
-	}
-
-	public void setStart_time(Timestamp start_time) {
-		this.start_time = start_time;
-	}
-
-	public Timestamp getLast_update_time() {
-		return last_update_time;
-	}
-
-	public void setLast_update_time(Timestamp last_update_time) {
-		this.last_update_time = last_update_time;
-	}
-
-    public String getWorkflow_instanceID() {
-        return workflow_instanceID;
-    }
-
-    public void setWorkflow_instanceID(String workflow_instanceID) {
-        this.workflow_instanceID = workflow_instanceID;
-    }
-
-    public int getExecution_index() {
-        return execution_index;
-    }
-
-    public void setExecution_index(int execution_index) {
-        this.execution_index = execution_index;
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/a0c1cbde/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_DataPK.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_DataPK.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_DataPK.java
deleted file mode 100644
index ddc12ec..0000000
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_DataPK.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-package org.apache.airavata.persistance.registry.jpa.model;
-
-public class Node_DataPK {
-    private String workflow_instanceID;
-    private String node_id;
-    private int execution_index;
-
-    public Node_DataPK() {
-        ;
-    }
-
-    public Node_DataPK(String workflow_instanceID, String node_id, int execution_index) {
-        this.workflow_instanceID = workflow_instanceID;
-        this.node_id = node_id;
-        this.execution_index = execution_index;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return false;
-    }
-
-    @Override
-    public int hashCode() {
-        return 1;
-    }
-
-    public String getWorkflow_instanceID() {
-        return workflow_instanceID;
-    }
-
-    public void setWorkflow_instanceID(String workflow_instanceID) {
-        this.workflow_instanceID = workflow_instanceID;
-    }
-
-    public String getNode_id() {
-        return node_id;
-    }
-
-    public void setNode_id(String node_id) {
-        this.node_id = node_id;
-    }
-
-    public int getExecution_index() {
-        return execution_index;
-    }
-
-    public void setExecution_index(int execution_index) {
-        this.execution_index = execution_index;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/a0c1cbde/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Orchestrator.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Orchestrator.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Orchestrator.java
deleted file mode 100644
index f0f07d8..0000000
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Orchestrator.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-package org.apache.airavata.persistance.registry.jpa.model;
-
-import java.sql.Timestamp;
-
-import javax.persistence.*;
-
-@Entity
-@Table(name = "ORCHESTRATOR")
-public class Orchestrator {
-	
-	@Id
-    @Column(name = "EXPERIMENT_ID")
-    private String experiment_ID;
-    @Column(name = "USERNAME")
-	private String username;
-    @Column(name = "STATUS")
-    private String status;
-    @Column(name = "STATE")
-    private String state;
-    @Column(name = "GFAC_EPR")
-    private String gfacEPR;
-    @Column(name = "APPLICATION_NAME")
-    private String applicationName;
-	@Lob
-    @Column(name = "JOBREQUEST")
-	private String jobRequest;
-    @Column(name = "SUBMITTED_TIME")
-    private Timestamp  submitted_time;
-    @Column(name = "STATUS_UPDATE_TIME")
-    private Timestamp  status_update_time;
-	
-	public String getExperiment_ID() {
-		return experiment_ID;
-	}
-	public void setExperiment_ID(String experiment_ID) {
-		this.experiment_ID = experiment_ID;
-	}
-	
-	public String getUserName() {
-		return username;
-	}
-	public void setUserName(String username) {
-		this.username = username;
-	}
-	public String getStatus() {
-		return status;
-	}
-	public void setStatus(String status) {
-		this.status = status;
-	}
-	public String getState() {
-		return state;
-	}
-	public void setState(String state) {
-		this.state = state;
-	}
-	public String getGfacEPR() {
-		return gfacEPR;
-	}
-	public void setGfacEPR(String gfacEPR) {
-		this.gfacEPR = gfacEPR;
-	}
-	public String getApplicationName() {
-		return applicationName;
-	}
-	public void setApplicationName(String applicationName) {
-		this.applicationName = applicationName;
-	}
-	public String getJobRequest() {
-		return jobRequest;
-	}
-	public void setJobRequest(String jobRequest) {
-		this.jobRequest = jobRequest;
-	}
-	public Timestamp getSubmittedTime() {
-		return submitted_time;
-	}
-	public void setSubmittedTime(Timestamp submitted_time) {
-		this.submitted_time = submitted_time;
-	}
-	public Timestamp getStatusUpdateTime() {
-		return status_update_time;
-	}
-	public void setStatusUpdateTime(Timestamp status_update_time) {
-		this.status_update_time = status_update_time;
-	}
-	
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/a0c1cbde/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/QosParam.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/QosParam.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/QosParam.java
new file mode 100644
index 0000000..9c73497
--- /dev/null
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/QosParam.java
@@ -0,0 +1,115 @@
+/*
+ *
+ * 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.model;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "QOS_PARAMS")
+public class QosParam {
+    @Id
+    @GeneratedValue
+    @Column(name = "QOS_ID")
+    private int qosId;
+    @Column(name = "EXPERIMENT_ID")
+    private String expId;
+    @Column(name = "TASK_ID")
+    private String taskId;
+    @Column(name = "START_EXECUTION_AT")
+    private String startExecutionAt;
+    @Column(name = "EXECUTE_BEFORE")
+    private String executeBefore;
+    @Column(name = "EXECUTE_BEFORE")
+    private int noOfRetries;
+
+    @ManyToOne(cascade= CascadeType.MERGE)
+    @JoinColumn(name = "EXPERIMENT_ID")
+    private Experiment experiment;
+
+    @ManyToOne(cascade= CascadeType.MERGE)
+    @JoinColumn(name = "TASK_ID")
+    private TaskDetail task;
+
+    public int getQosId() {
+        return qosId;
+    }
+
+    public void setQosId(int qosId) {
+        this.qosId = qosId;
+    }
+
+    public String getExpId() {
+        return expId;
+    }
+
+    public void setExpId(String expId) {
+        this.expId = expId;
+    }
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+
+    public String getStartExecutionAt() {
+        return startExecutionAt;
+    }
+
+    public void setStartExecutionAt(String startExecutionAt) {
+        this.startExecutionAt = startExecutionAt;
+    }
+
+    public String getExecuteBefore() {
+        return executeBefore;
+    }
+
+    public void setExecuteBefore(String executeBefore) {
+        this.executeBefore = executeBefore;
+    }
+
+    public int getNoOfRetries() {
+        return noOfRetries;
+    }
+
+    public void setNoOfRetries(int noOfRetries) {
+        this.noOfRetries = noOfRetries;
+    }
+
+    public Experiment getExperiment() {
+        return experiment;
+    }
+
+    public void setExperiment(Experiment experiment) {
+        this.experiment = experiment;
+    }
+
+    public TaskDetail getTask() {
+        return task;
+    }
+
+    public void setTask(TaskDetail task) {
+        this.task = task;
+    }
+}


Mime
View raw message