airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [2/3] airavata git commit: Fixing compilation issues in registry-core module
Date Mon, 22 Jun 2015 13:48:55 GMT
Fixing compilation issues in registry-core module


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/65afe6f1
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/65afe6f1
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/65afe6f1

Branch: refs/heads/master
Commit: 65afe6f1c2da1c9e1cb084bbe0572cc9f3521b9b
Parents: 8d6ba82
Author: Supun Nakandala <scnakandala@apache.org>
Authored: Mon Jun 22 18:50:46 2015 +0530
Committer: Supun Nakandala <scnakandala@apache.org>
Committed: Mon Jun 22 18:50:46 2015 +0530

----------------------------------------------------------------------
 .../registry/core/experiment/catalog/impl/ExperimentRegistry.java | 3 +++
 .../registry/core/experiment/catalog/resources/Utils.java         | 1 -
 .../core/experiment/catalog/utils/ThriftDataModelConversion.java  | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/65afe6f1/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 a855808..ca3f56b 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
@@ -958,6 +958,9 @@ public class ExperimentRegistry {
         return null;
     }
 
+    public Object getTaskStatus(String identifier) {
+        return null;
+    }
 
     public List<ExperimentModel> getExperimentList(String fieldName, Object value)
throws RegistryException {
         List<ExperimentModel> experiments = new ArrayList<ExperimentModel>();

http://git-wip-us.apache.org/repos/asf/airavata/blob/65afe6f1/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
index c7d2873..442e908 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
@@ -402,7 +402,6 @@ public class Utils {
             experimentResource.setProjectId(o.getProjectId());
             experimentResource.setExperimentType(o.getExperimentType());
             experimentResource.setUserName(o.getUserName());
-            experimentResource.setApplicationId(o.getApplicationId());
             experimentResource.setExperimentName(o.getExperimentName());
             experimentResource.setCreationTime(o.getCreationTime());
             experimentResource.setDescription(o.getDescription());

http://git-wip-us.apache.org/repos/asf/airavata/blob/65afe6f1/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
index 5dae874..3e2fab9 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
@@ -114,7 +114,6 @@ public class ThriftDataModelConversion {
             experiment.setUserName(experimentResource.getUserName());
             experiment.setExperimentName(experimentResource.getExperimentName());
             experiment.setDescription(experimentResource.getDescription());
-            experiment.setExecutionId(experimentResource.getApplicationId());
             experiment.setEnableEmailNotification(experimentResource.getEnableEmailNotification());
             experiment.setGatewayExecutionId(experimentResource.getGatewayExecutionId());
             if (experiment.isEnableEmailNotification()){


Mime
View raw message