You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2015/06/22 14:01:45 UTC
[7/9] airavata git commit: Fixing remove CPI methods in experiment
registry
Fixing remove CPI methods in experiment registry
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/11a208bd
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/11a208bd
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/11a208bd
Branch: refs/heads/master
Commit: 11a208bd17b1c1680dd7108b91cea4dc4cee3375
Parents: bf7db06
Author: Supun Nakandala <sc...@apache.org>
Authored: Mon Jun 22 13:32:12 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Mon Jun 22 13:32:12 2015 +0530
----------------------------------------------------------------------
.../catalog/impl/ExperimentCatalogImpl.java | 6 +-
.../catalog/impl/ExperimentRegistry.java | 94 +++++++++++---------
2 files changed, 57 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/11a208bd/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
index 19a7698..22b4e02 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentCatalogImpl.java
@@ -597,13 +597,13 @@ public class ExperimentCatalogImpl implements ExperimentCatalog {
experimentRegistry.removeUserConfigData((String) identifier);
break;
case PROCESS:
- experimentRegistry.removeWorkflowNode((String) identifier);
+ experimentRegistry.removeProcess((String) identifier);
break;
case PROCESS_RESOURCE_SCHEDULE:
- experimentRegistry.removeComputationalScheduling(dataType, (String) identifier);
+ experimentRegistry.removeProcessResourceSchedule((String) identifier);
break;
case TASK:
- experimentRegistry.removeTaskDetails((String) identifier);
+ experimentRegistry.removeTask((String) identifier);
break;
default:
logger.error("Unsupported data type...", new UnsupportedOperationException());
http://git-wip-us.apache.org/repos/asf/airavata/blob/11a208bd/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
index 9fa8daf..44bf0e6 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
@@ -1176,6 +1176,60 @@ public class ExperimentRegistry {
return taskIds;
}
+
+ //Remove CPI methods
+ public void removeExperiment(String experimentId) throws RegistryException {
+ try {
+ gatewayResource.remove(ResourceType.EXPERIMENT, experimentId);
+ } catch (Exception e) {
+ logger.error("Error while removing experiment..", e);
+ throw new RegistryException(e);
+ }
+ }
+
+ public void removeUserConfigData(String experimentId) throws RegistryException {
+ try {
+ ExperimentResource experiment = new ExperimentResource();
+ experiment.setExperimentId(experimentId);
+ experiment.remove(ResourceType.USER_CONFIGURATION_DATA, experimentId);
+ } catch (Exception e) {
+ logger.error("Error while removing experiment config..", e);
+ throw new RegistryException(e);
+ }
+ }
+
+
+ public void removeProcess(String processId) throws RegistryException {
+ try {
+ ExperimentResource experiment = new ExperimentResource();
+ experiment.remove(ResourceType.PROCESS, processId);
+ } catch (Exception e) {
+ logger.error("Error while removing workflow node..", e);
+ throw new RegistryException(e);
+ }
+ }
+
+ public void removeProcessResourceSchedule(String processId) throws RegistryException {
+ try {
+ ExperimentResource experiment = new ExperimentResource();
+ experiment.remove(ResourceType.PROCESS_RESOURCE_SCHEDULE, processId);
+ } catch (Exception e) {
+ logger.error("Error while removing workflow node..", e);
+ throw new RegistryException(e);
+ }
+ }
+
+ public void removeTask(String taskId) throws RegistryException {
+ try {
+ ProcessResource process = new ProcessResource();
+ process.remove(ResourceType.TASK, taskId);
+ } catch (Exception e) {
+ logger.error("Error while removing task details..", e);
+ throw new RegistryException(e);
+ }
+ }
+
+
// ids - taskId + jobid
public void updateJobDetails(JobModel jobDetails, CompositeIdentifier ids) throws RegistryException {
// try {
@@ -1985,46 +2039,6 @@ public class ExperimentRegistry {
// }
- public void removeExperiment(String experimentId) throws RegistryException {
- try {
- gatewayResource.remove(ResourceType.EXPERIMENT, experimentId);
- } catch (Exception e) {
- logger.error("Error while removing experiment..", e);
- throw new RegistryException(e);
- }
- }
-
- public void removeUserConfigData(String experimentId) throws RegistryException {
-// try {
-// ExperimentResource experiment = gatewayResource.getExperiment(experimentId);
-// experiment.remove(ResourceType.CONFIG_DATA, experimentId);
-// } catch (Exception e) {
-// logger.error("Error while removing experiment config..", e);
-// throw new RegistryException(e);
-// }
- }
-
- public void removeWorkflowNode(String nodeId) throws RegistryException {
-// try {
-// ExperimentResource experiment = (ExperimentResource) gatewayResource.create(ResourceType.EXPERIMENT);
-// experiment.remove(ResourceType.WORKFLOW_NODE_DETAIL, nodeId);
-// } catch (Exception e) {
-// logger.error("Error while removing workflow node..", e);
-// throw new RegistryException(e);
-// }
- }
-
- public void removeTaskDetails(String taskId) throws RegistryException {
-// try {
-// ExperimentResource experiment = (ExperimentResource) gatewayResource.create(ResourceType.EXPERIMENT);
-// WorkflowNodeDetailResource nodeDetailResource = (WorkflowNodeDetailResource) experiment.create(ResourceType.WORKFLOW_NODE_DETAIL);
-// nodeDetailResource.remove(ResourceType.TASK_DETAIL, taskId);
-// } catch (Exception e) {
-// logger.error("Error while removing task details..", e);
-// throw new RegistryException(e);
-// }
- }
-
public void removeJobDetails(CompositeIdentifier ids) throws RegistryException {
// try {
// ExperimentResource experiment = (ExperimentResource) gatewayResource.create(ResourceType.EXPERIMENT);