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/07/06 17:13:01 UTC
[3/3] airavata git commit: Resolved merge conflicts
Resolved merge conflicts
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/1d27a9c7
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1d27a9c7
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1d27a9c7
Branch: refs/heads/master
Commit: 1d27a9c75e1637bca8b2a1495450e66877b35c8f
Parents: 624b5c6 cc79236
Author: Shameera Rathanyaka <sh...@gmail.com>
Authored: Mon Jul 6 11:10:28 2015 -0400
Committer: Shameera Rathanyaka <sh...@gmail.com>
Committed: Mon Jul 6 11:10:28 2015 -0400
----------------------------------------------------------------------
.../airavata/client/samples/CreateLaunchExperiment.java | 1 -
.../airavata/model/application/io/InputDataObjectType.java | 8 ++------
.../org/apache/airavata/model/util/ProjectModelUtil.java | 1 +
.../catalog/resources/ExperimentInputResource.java | 4 ++--
.../experiment/catalog/resources/ProcessInputResource.java | 4 ++--
.../airavata-api/application_io_models.thrift | 4 ++--
.../airavata-api/workspace_model.thrift | 2 ++
7 files changed, 11 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/1d27a9c7/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
----------------------------------------------------------------------
diff --cc airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
index fc5c73b,9d808fb..3163f28
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
@@@ -974,12 -962,12 +974,11 @@@ public class CreateLaunchExperiment
List<OutputDataObjectType> exOut = client.getApplicationOutputs(echoAppId);
Project project = ProjectModelUtil.createProject("default", "admin", "test project");
- String projectId = client.createProject(DEFAULT_GATEWAY, project);
+ String projectId = client.createProject(DEFAULT_GATEWAY, project);
ExperimentModel simpleExperiment =
- ExperimentModelUtil.createSimpleExperiment(projectId, "admin", "echoExperiment", "SimpleEcho3", echoAppId, exInputs);
+ ExperimentModelUtil.createSimpleExperiment(DEFAULT_GATEWAY,projectId, "admin", "echoExperiment", "SimpleEcho3", echoAppId, exInputs);
simpleExperiment.setExperimentOutputs(exOut);
- simpleExperiment.setGatewayId(DEFAULT_GATEWAY);
- simpleExperiment.setGatewayId(DEFAULT_GATEWAY);
Map<String, String> computeResources = airavataClient.getAvailableAppInterfaceComputeResources(echoAppId);
if (computeResources != null && computeResources.size() != 0) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/1d27a9c7/thrift-interface-descriptions/airavata-api/workspace_model.thrift
----------------------------------------------------------------------