You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2015/03/19 20:12:05 UTC
[47/50] [abbrv] airavata git commit: fixing AIRAVATA-1634
fixing AIRAVATA-1634
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f7083044
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f7083044
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f7083044
Branch: refs/heads/new-workflow-design
Commit: f708304446dae8aa02244a9baa05cba13242a166
Parents: d09957b
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Tue Mar 17 11:26:42 2015 -0400
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Tue Mar 17 11:26:42 2015 -0400
----------------------------------------------------------------------
.../airavata/api/server/handler/AiravataServerHandler.java | 4 ++++
.../apache/airavata/client/tools/RegisterSampleApplications.java | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/f7083044/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 a2bd3c7..fd1dfd7 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
@@ -1361,6 +1361,10 @@ public class AiravataServerHandler implements Airavata.Iface {
Experiment existingExperiment = (Experiment)registry.get(RegistryModelType.EXPERIMENT, existingExperimentID);
String gatewayId = (String)registry.getValue(RegistryModelType.EXPERIMENT, existingExperimentID, Constants.FieldConstants.ExperimentConstants.GATEWAY);
existingExperiment.setCreationTime(AiravataUtils.getCurrentTimestamp().getTime());
+ if (existingExperiment.getApplicationId() != null){
+ List<OutputDataObjectType> applicationOutputs = getApplicationOutputs(existingExperiment.getApplicationId());
+ existingExperiment.setExperimentOutputs(applicationOutputs);
+ }
if (validateString(newExperiementName)){
existingExperiment.setName(newExperiementName);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/f7083044/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
index b562eb0..e10dde2 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
@@ -257,7 +257,7 @@ public class RegisterSampleApplications {
UnicoreJobSubmission ucrJobSubmission = new UnicoreJobSubmission();
ucrJobSubmission.setSecurityProtocol(securityProtocol);
ucrJobSubmission.setUnicoreEndPointURL(unicoreEndPointURL);
- ucrJobSubmission.setAuthenticationMode(AuthenticationMode.MYPROXY_ISSUED);
+// ucrJobSubmission.setAuthenticationMode(AuthenticationMode.MYPROXY_ISSUED);
jobSubmission.setJobSubmissionProtocol(JobSubmissionProtocol.UNICORE);
airavataClient.addUNICOREJobSubmissionDetails(fsdResourceId, 0, ucrJobSubmission);