Repository: airavata Updated Branches: refs/heads/master a7baac58a -> 7d603e5a6
Updated the model to fix setup errors. AIRAVATA-1017 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a27cb89c Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a27cb89c Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a27cb89c Branch: refs/heads/master Commit: a27cb89cf5b796194b5c96b097b2f7d5ac8c3b1f Parents: 136cfea Author: raminder <[email protected]> Authored: Thu Feb 20 12:17:58 2014 -0500 Committer: raminder <[email protected]> Committed: Thu Feb 20 12:17:58 2014 -0500 ---------------------------------------------------------------------- .../apache/airavata/persistance/registry/jpa/model/QosParam.java | 2 +- .../src/main/resources/META-INF/persistence.xml | 2 +- .../airavata-jpa-registry/src/main/resources/registry-derby.sql | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/a27cb89c/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 index 9c73497..32fa94a 100644 --- 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 @@ -38,7 +38,7 @@ public class QosParam { private String startExecutionAt; @Column(name = "EXECUTE_BEFORE") private String executeBefore; - @Column(name = "EXECUTE_BEFORE") + @Column(name = "NO_OF_RETRIES") private int noOfRetries; @ManyToOne(cascade= CascadeType.MERGE) http://git-wip-us.apache.org/repos/asf/airavata/blob/a27cb89c/modules/registry/airavata-jpa-registry/src/main/resources/META-INF/persistence.xml ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/main/resources/META-INF/persistence.xml b/modules/registry/airavata-jpa-registry/src/main/resources/META-INF/persistence.xml index 10fbee4..b51300b 100644 --- a/modules/registry/airavata-jpa-registry/src/main/resources/META-INF/persistence.xml +++ b/modules/registry/airavata-jpa-registry/src/main/resources/META-INF/persistence.xml @@ -38,7 +38,7 @@ <class>org.apache.airavata.persistance.registry.jpa.model.Experiment_Output</class> <class>org.apache.airavata.persistance.registry.jpa.model.WorkflowNodeDetail</class> <class>org.apache.airavata.persistance.registry.jpa.model.TaskDetail</class> - <class>org.apache.airavata.persistance.registry.jpa.model.ErrorDetails</class> + <class>org.apache.airavata.persistance.registry.jpa.model.ErrorDetail</class> <class>org.apache.airavata.persistance.registry.jpa.model.ApplicationInput</class> <class>org.apache.airavata.persistance.registry.jpa.model.ApplicationOutput</class> <class>org.apache.airavata.persistance.registry.jpa.model.NodeInput</class> http://git-wip-us.apache.org/repos/asf/airavata/blob/a27cb89c/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql b/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql index fd88e4d..1414aad 100644 --- a/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql +++ b/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql @@ -180,7 +180,7 @@ CREATE TABLE TASK_DETAIL ( TASK_ID VARCHAR(255), NODE_INSTANCE_ID VARCHAR(255), - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,, + CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, APPLICATION_ID VARCHAR(255), APPLICATION_VERSION VARCHAR(255), PRIMARY KEY(TASK_ID), @@ -193,7 +193,7 @@ CREATE TABLE ERROR_DETAIL EXPERIMENT_ID VARCHAR(255), TASK_ID VARCHAR(255), NODE_INSTANCE_ID VARCHAR(255), - CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,, + CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, ACTUAL_ERROR_MESSAGE CLOB, USER_FRIEDNLY_ERROR_MSG VARCHAR(255), TRANSIENT_OR_PERSISTENT SMALLINT,
