You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ra...@apache.org on 2014/02/26 23:10:55 UTC
git commit: set ConfigurationData to GFac context. AIRAVATA-1032
Repository: airavata
Updated Branches:
refs/heads/master 3a453bb14 -> 67d283f25
set ConfigurationData to GFac context. AIRAVATA-1032
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/67d283f2
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/67d283f2
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/67d283f2
Branch: refs/heads/master
Commit: 67d283f25626cc6ff99bac55b1fa49d80d6ac1cc
Parents: 3a453bb
Author: raminder <ra...@apache.org>
Authored: Wed Feb 26 17:10:39 2014 -0500
Committer: raminder <ra...@apache.org>
Committed: Wed Feb 26 17:10:39 2014 -0500
----------------------------------------------------------------------
.../main/java/org/apache/airavata/gfac/cpi/GFacImpl.java | 5 +++--
.../org/apache/airavata/gfac/provider/impl/BESProvider.java | 9 ++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/67d283f2/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/cpi/GFacImpl.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/cpi/GFacImpl.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/cpi/GFacImpl.java
index fa49b39..f9784f1 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/cpi/GFacImpl.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/cpi/GFacImpl.java
@@ -112,7 +112,7 @@ public class GFacImpl implements GFac {
public JobExecutionContext submitJob(String experimentID,String taskID) throws GFacException {
JobExecutionContext jobExecutionContext = null;
try {
- ConfigurationData configurationData = (ConfigurationData) registry.get(DataType.EXPERIMENT_CONFIGURATION_DATA, experimentID);
+ ConfigurationData configurationData = (ConfigurationData) registry.get(DataType.TASK_DETAIL, taskID);
// this is wear our new model and old model is mapping (so serviceName in ExperimentData and service name in ServiceDescriptor
// has to be same.
@@ -139,7 +139,8 @@ public class GFacImpl implements GFac {
GFacConfiguration gFacConfiguration = GFacConfiguration.create(new File(resource.getPath()), airavataAPI, configurationProperties);
jobExecutionContext = new JobExecutionContext(gFacConfiguration, serviceName);
-
+ jobExecutionContext.setConfigurationData(configurationData);
+
ApplicationContext applicationContext = new ApplicationContext();
applicationContext.setApplicationDeploymentDescription(applicationDescription);
applicationContext.setHostDescription(hostDescription);
http://git-wip-us.apache.org/repos/asf/airavata/blob/67d283f2/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/BESProvider.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/BESProvider.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/BESProvider.java
index a341f32..2671bfa 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/BESProvider.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/BESProvider.java
@@ -434,12 +434,11 @@ public class BESProvider implements GFacProvider {
}
private String getUserName(JobExecutionContext context) {
- //FIXME: get experiment user
-// if (context.getContextHeader() != null) {
-// return context.getContextHeader().getUserIdentifier();
-// } else {
+ if (context.getConfigurationData()!= null) {
+ return context.getConfigurationData().getBasicMetadata().getUserName();
+ } else {
return "";
-// }
+ }
}