Repository: airavata Updated Branches: refs/heads/master dde86a59a -> 705dc5998
fixing adding advance input data handling Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c9f9254b Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c9f9254b Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c9f9254b Branch: refs/heads/master Commit: c9f9254b84e6ef4872deb769ce8f5dbf9fd3293b Parents: cbf5b68 Author: chathuri <[email protected]> Authored: Wed Mar 12 16:03:33 2014 -0400 Committer: chathuri <[email protected]> Committed: Wed Mar 12 16:03:33 2014 -0400 ---------------------------------------------------------------------- .../persistance/registry/jpa/impl/ExperimentRegistry.java | 3 +++ .../jpa/resources/AdvanceInputDataHandlingResource.java | 8 +++++--- .../jpa/resources/AdvancedOutputDataHandlingResource.java | 9 ++++++--- 3 files changed, 14 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/c9f9254b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java index ae6fcea..85f97b6 100644 --- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java +++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java @@ -168,6 +168,7 @@ public class ExperimentRegistry { if (resource instanceof TaskDetailResource) { TaskDetailResource taskDetailResource = (TaskDetailResource) resource; qosr.setTaskDetailResource(taskDetailResource); + qosr.setExperimentResource(taskDetailResource.getWorkflowNodeDetailResource().getExperimentResource()); } qosr.setStartExecutionAt(qosParams.getStartExecutionAt()); qosr.setExecuteBefore(qosParams.getExecuteBefore()); @@ -190,6 +191,7 @@ public class ExperimentRegistry { if (resource instanceof TaskDetailResource) { TaskDetailResource taskDetailResource = (TaskDetailResource) resource; adodh.setTaskDetailResource(taskDetailResource); + adodh.setExperimentResource(taskDetailResource.getWorkflowNodeDetailResource().getExperimentResource()); } adodh.setOutputDataDir(outputDataHandling.getOutputDataDir()); adodh.setDataRegUrl(outputDataHandling.getDataRegistryURL()); @@ -212,6 +214,7 @@ public class ExperimentRegistry { if (resource instanceof TaskDetailResource) { TaskDetailResource taskDetailResource = (TaskDetailResource) resource; adidh.setTaskDetailResource(taskDetailResource); + adidh.setExperimentResource(taskDetailResource.getWorkflowNodeDetailResource().getExperimentResource()); } adidh.setWorkingDir(inputDataHandling.getUniqueWorkingDirectory()); adidh.setWorkingDirParent(inputDataHandling.getParentWorkingDirectory()); http://git-wip-us.apache.org/repos/asf/airavata/blob/c9f9254b/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 08edde4..3324636 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 @@ -130,11 +130,13 @@ public class AdvanceInputDataHandlingResource extends AbstractResource { em.getTransaction().begin(); AdvancedInputDataHandling dataHandling = new AdvancedInputDataHandling(); Experiment experiment = em.find(Experiment.class, experimentResource.getExpID()); - TaskDetail taskDetail = em.find(TaskDetail.class, taskDetailResource.getTaskId()); + if (taskDetailResource !=null){ + TaskDetail taskDetail = em.find(TaskDetail.class, taskDetailResource.getTaskId()); + dataHandling.setTaskId(taskDetailResource.getTaskId()); + dataHandling.setTask(taskDetail); + } dataHandling.setExpId(experimentResource.getExpID()); dataHandling.setExperiment(experiment); - dataHandling.setTaskId(taskDetailResource.getTaskId()); - dataHandling.setTask(taskDetail); dataHandling.setWorkingDir(workingDir); dataHandling.setParentWorkingDir(workingDirParent); dataHandling.setStageInputsToWorkingDir(stageInputFiles); http://git-wip-us.apache.org/repos/asf/airavata/blob/c9f9254b/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 c28ff4b..2e67834 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 @@ -120,11 +120,14 @@ public class AdvancedOutputDataHandlingResource extends AbstractResource { em.getTransaction().begin(); AdvancedOutputDataHandling dataHandling = new AdvancedOutputDataHandling(); Experiment experiment = em.find(Experiment.class, experimentResource.getExpID()); - TaskDetail taskDetail = em.find(TaskDetail.class, taskDetailResource.getTaskId()); + if (taskDetailResource !=null){ + TaskDetail taskDetail = em.find(TaskDetail.class, taskDetailResource.getTaskId()); + dataHandling.setTaskId(taskDetailResource.getTaskId()); + dataHandling.setTask(taskDetail); + } + dataHandling.setExpId(experimentResource.getExpID()); dataHandling.setExperiment(experiment); - dataHandling.setTaskId(taskDetailResource.getTaskId()); - dataHandling.setTask(taskDetail); dataHandling.setDataRegUrl(dataRegUrl); dataHandling.setOutputDataDir(outputDataDir); dataHandling.setPersistOutputData(persistOutputData);
