issue with clone and update project
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/80d1b2ed Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/80d1b2ed Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/80d1b2ed Branch: refs/heads/workflow-support Commit: 80d1b2edf1338060673711290660f40f00af8ccf Parents: feb1d32 Author: Chathuri Wimalasena <[email protected]> Authored: Sat Jul 12 14:52:12 2014 -0400 Committer: Chathuri Wimalasena <[email protected]> Committed: Sat Jul 12 14:52:12 2014 -0400 ---------------------------------------------------------------------- .../airavata/api/server/handler/AiravataServerHandler.java | 6 +++--- .../persistance/registry/jpa/impl/ProjectRegistry.java | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/80d1b2ed/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java index 683848a..ae5e995 100644 --- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java +++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java @@ -1057,7 +1057,7 @@ public class AiravataServerHandler implements Airavata.Iface, Watcher { status.setExperimentState(ExperimentState.LAUNCHED); status.setTimeOfStateChange(Calendar.getInstance().getTimeInMillis()); experiment.setExperimentStatus(status); - registry.update(RegistryModelType.EXPERIMENT, experiment, experimentId); + registry.update(RegistryModelType.EXPERIMENT_STATUS, status, experimentId); registry.update(RegistryModelType.TASK_DETAIL, taskData, taskData.getTaskID()); //launching the experiment orchestratorClient.launchTask(taskData.getTaskID(),airavataCredStoreToken); @@ -1074,7 +1074,7 @@ public class AiravataServerHandler implements Airavata.Iface, Watcher { status.setTimeOfStateChange(Calendar.getInstance().getTimeInMillis()); experiment.setExperimentStatus(status); try { - registry.update(RegistryModelType.EXPERIMENT, experiment, experimentId); + registry.update(RegistryModelType.EXPERIMENT_STATUS, status, experimentId); } catch (RegistryException e1) { throw new TException(e); } @@ -1139,7 +1139,7 @@ public class AiravataServerHandler implements Airavata.Iface, Watcher { throw new ExperimentNotFoundException("Requested experiment id " + existingExperimentID + " does not exist in the system.."); } Experiment existingExperiment = (Experiment)registry.get(RegistryModelType.EXPERIMENT, existingExperimentID); - if (!validateString(newExperiementName)){ + if (validateString(newExperiementName)){ existingExperiment.setName(newExperiementName); } return (String)registry.add(ParentDataType.EXPERIMENT, existingExperiment); http://git-wip-us.apache.org/repos/asf/airavata/blob/80d1b2ed/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ProjectRegistry.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ProjectRegistry.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ProjectRegistry.java index 4de4ba3..d85cd83 100644 --- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ProjectRegistry.java +++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ProjectRegistry.java @@ -105,6 +105,7 @@ public class ProjectRegistry { try { ProjectResource existingProject = workerResource.getProject(projectId); existingProject.setDescription(project.getDescription()); + existingProject.setName(project.getName()); existingProject.setCreationTime(AiravataUtils.getTime(project.getCreationTime())); existingProject.setGateway(gatewayResource); UserResource user = (UserResource)ResourceUtils.getUser(project.getOwner());
