You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2014/05/15 20:34:14 UTC
git commit: fixing AIRAVATA-1219 and AIRAVATA-1220
Repository: airavata
Updated Branches:
refs/heads/master 939f7bea7 -> 3d76388b5
fixing AIRAVATA-1219 and AIRAVATA-1220
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/3d76388b
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/3d76388b
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/3d76388b
Branch: refs/heads/master
Commit: 3d76388b55b47c3a8e67f4c7a008525502e4c340
Parents: 939f7be
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Thu May 15 14:34:07 2014 -0400
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Thu May 15 14:34:07 2014 -0400
----------------------------------------------------------------------
.../jpa/resources/AdvanceInputDataHandlingResource.java | 10 ++++++++--
.../resources/AdvancedOutputDataHandlingResource.java | 10 ++++++++--
.../jpa/resources/ComputationSchedulingResource.java | 11 ++++++++---
.../registry/jpa/resources/ExperimentResource.java | 4 ++++
4 files changed, 28 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/3d76388b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AdvanceInputDataHandlingResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AdvanceInputDataHandlingResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AdvanceInputDataHandlingResource.java
index 3324636..642d291 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AdvanceInputDataHandlingResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AdvanceInputDataHandlingResource.java
@@ -36,7 +36,7 @@ import java.util.List;
public class AdvanceInputDataHandlingResource extends AbstractResource {
private static final Logger logger = LoggerFactory.getLogger(AdvanceInputDataHandlingResource.class);
- private int dataHandlingId;
+ private int dataHandlingId = 0;
private ExperimentResource experimentResource;
private TaskDetailResource taskDetailResource;
private String workingDirParent;
@@ -128,7 +128,13 @@ public class AdvanceInputDataHandlingResource extends AbstractResource {
public void save() {
EntityManager em = ResourceUtils.getEntityManager();
em.getTransaction().begin();
- AdvancedInputDataHandling dataHandling = new AdvancedInputDataHandling();
+ AdvancedInputDataHandling dataHandling;
+ if (dataHandlingId != 0 ){
+ dataHandling = em.find(AdvancedInputDataHandling.class, dataHandlingId);
+ dataHandling.setDataHandlingId(dataHandlingId);
+ }else {
+ dataHandling = new AdvancedInputDataHandling();
+ }
Experiment experiment = em.find(Experiment.class, experimentResource.getExpID());
if (taskDetailResource !=null){
TaskDetail taskDetail = em.find(TaskDetail.class, taskDetailResource.getTaskId());
http://git-wip-us.apache.org/repos/asf/airavata/blob/3d76388b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AdvancedOutputDataHandlingResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AdvancedOutputDataHandlingResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AdvancedOutputDataHandlingResource.java
index 2e67834..52105a0 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AdvancedOutputDataHandlingResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AdvancedOutputDataHandlingResource.java
@@ -35,7 +35,7 @@ import java.util.List;
public class AdvancedOutputDataHandlingResource extends AbstractResource {
private static final Logger logger = LoggerFactory.getLogger(AdvancedOutputDataHandlingResource.class);
- private int outputDataHandlingId;
+ private int outputDataHandlingId = 0;
private ExperimentResource experimentResource;
private TaskDetailResource taskDetailResource;
private String outputDataDir;
@@ -118,7 +118,13 @@ public class AdvancedOutputDataHandlingResource extends AbstractResource {
public void save() {
EntityManager em = ResourceUtils.getEntityManager();
em.getTransaction().begin();
- AdvancedOutputDataHandling dataHandling = new AdvancedOutputDataHandling();
+ AdvancedOutputDataHandling dataHandling;
+ if (outputDataHandlingId != 0 ){
+ dataHandling = em.find(AdvancedOutputDataHandling.class, outputDataHandlingId);
+ dataHandling.setOutputDataHandlingId(outputDataHandlingId);
+ }else {
+ dataHandling = new AdvancedOutputDataHandling();
+ }
Experiment experiment = em.find(Experiment.class, experimentResource.getExpID());
if (taskDetailResource !=null){
TaskDetail taskDetail = em.find(TaskDetail.class, taskDetailResource.getTaskId());
http://git-wip-us.apache.org/repos/asf/airavata/blob/3d76388b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ComputationSchedulingResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ComputationSchedulingResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ComputationSchedulingResource.java
index 6bfab5b..0479969 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ComputationSchedulingResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ComputationSchedulingResource.java
@@ -36,7 +36,7 @@ import java.util.List;
public class ComputationSchedulingResource extends AbstractResource {
private static final Logger logger = LoggerFactory.getLogger(ComputationSchedulingResource.class);
- private int schedulingId;
+ private int schedulingId = 0;
private ExperimentResource experimentResource;
private TaskDetailResource taskDetailResource;
private String resourceHostId;
@@ -173,8 +173,13 @@ public class ComputationSchedulingResource extends AbstractResource {
public void save() {
EntityManager em = ResourceUtils.getEntityManager();
em.getTransaction().begin();
-
- Computational_Resource_Scheduling scheduling = new Computational_Resource_Scheduling();
+ Computational_Resource_Scheduling scheduling;
+ if (schedulingId != 0){
+ scheduling = em.find(Computational_Resource_Scheduling.class, schedulingId);
+ scheduling.setSchedulingId(schedulingId);
+ }else {
+ scheduling = new Computational_Resource_Scheduling();
+ }
Experiment experiment = em.find(Experiment.class, experimentResource.getExpID());
if (taskDetailResource != null){
TaskDetail taskDetail = em.find(TaskDetail.class, taskDetailResource.getTaskId());
http://git-wip-us.apache.org/repos/asf/airavata/blob/3d76388b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java
index ddfa256..fc5e32f 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java
@@ -327,6 +327,7 @@ public class ExperimentResource extends AbstractResource {
case COMPUTATIONAL_RESOURCE_SCHEDULING:
generator = new QueryGenerator(COMPUTATIONAL_RESOURCE_SCHEDULING);
generator.setParameter(ComputationalResourceSchedulingConstants.EXPERIMENT_ID, name);
+ generator.setParameter(ComputationalResourceSchedulingConstants.TASK_ID, null);
q = generator.selectQuery(em);
Computational_Resource_Scheduling scheduling = (Computational_Resource_Scheduling)q.getSingleResult();
ComputationSchedulingResource schedulingResource = (ComputationSchedulingResource)Utils.getResource(ResourceType.COMPUTATIONAL_RESOURCE_SCHEDULING, scheduling);
@@ -336,6 +337,7 @@ public class ExperimentResource extends AbstractResource {
case ADVANCE_INPUT_DATA_HANDLING:
generator = new QueryGenerator(ADVANCE_INPUT_DATA_HANDLING);
generator.setParameter(AdvancedInputDataHandlingConstants.EXPERIMENT_ID, name);
+ generator.setParameter(AdvancedInputDataHandlingConstants.TASK_ID, null);
q = generator.selectQuery(em);
AdvancedInputDataHandling inputDataHandling = (AdvancedInputDataHandling)q.getSingleResult();
AdvanceInputDataHandlingResource dataHandlingResource = (AdvanceInputDataHandlingResource)Utils.getResource(ResourceType.ADVANCE_INPUT_DATA_HANDLING, inputDataHandling);
@@ -345,6 +347,7 @@ public class ExperimentResource extends AbstractResource {
case ADVANCE_OUTPUT_DATA_HANDLING:
generator = new QueryGenerator(ADVANCE_OUTPUT_DATA_HANDLING);
generator.setParameter(AdvancedOutputDataHandlingConstants.EXPERIMENT_ID, name);
+ generator.setParameter(AdvancedOutputDataHandlingConstants.TASK_ID, null);
q = generator.selectQuery(em);
AdvancedOutputDataHandling outputDataHandling = (AdvancedOutputDataHandling)q.getSingleResult();
AdvancedOutputDataHandlingResource outputDataHandlingResource = (AdvancedOutputDataHandlingResource)Utils.getResource(ResourceType.ADVANCE_OUTPUT_DATA_HANDLING, outputDataHandling);
@@ -354,6 +357,7 @@ public class ExperimentResource extends AbstractResource {
case QOS_PARAM:
generator = new QueryGenerator(QOS_PARAMS);
generator.setParameter(QosParamsConstants.EXPERIMENT_ID, name);
+ generator.setParameter(QosParamsConstants.TASK_ID, null);
q = generator.selectQuery(em);
QosParam qosParam = (QosParam)q.getSingleResult();
QosParamResource qosParamResource = (QosParamResource)Utils.getResource(ResourceType.QOS_PARAM, qosParam);