You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2014/06/20 21:08:23 UTC
git commit: updating the sample for the changes in the thrift API
Repository: airavata
Updated Branches:
refs/heads/master 41a2c860e -> e088226fc
updating the sample for the changes in the thrift API
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e088226f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e088226f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e088226f
Branch: refs/heads/master
Commit: e088226fc52f1dcf666b96102b38c87adc2e312f
Parents: 41a2c86
Author: Saminda Wijeratne <sa...@gmail.com>
Authored: Fri Jun 20 15:08:11 2014 -0400
Committer: Saminda Wijeratne <sa...@gmail.com>
Committed: Fri Jun 20 15:08:11 2014 -0400
----------------------------------------------------------------------
.../airavata/api/samples/ExperimentSample.java | 29 +++++++++++++-------
1 file changed, 19 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/e088226f/samples/java-client/experiment/src/main/java/org/apache/airavata/api/samples/ExperimentSample.java
----------------------------------------------------------------------
diff --git a/samples/java-client/experiment/src/main/java/org/apache/airavata/api/samples/ExperimentSample.java b/samples/java-client/experiment/src/main/java/org/apache/airavata/api/samples/ExperimentSample.java
index 7917967..fc020a8 100644
--- a/samples/java-client/experiment/src/main/java/org/apache/airavata/api/samples/ExperimentSample.java
+++ b/samples/java-client/experiment/src/main/java/org/apache/airavata/api/samples/ExperimentSample.java
@@ -27,23 +27,24 @@ import java.util.List;
import org.apache.airavata.api.Airavata;
import org.apache.airavata.api.Airavata.Client;
import org.apache.airavata.api.client.AiravataClientFactory;
-import org.apache.airavata.model.error.AiravataClientException;
-import org.apache.airavata.model.error.AiravataSystemException;
-import org.apache.airavata.model.error.ExperimentNotFoundException;
-import org.apache.airavata.model.error.AiravataClientConnectException;
-import org.apache.airavata.model.error.InvalidRequestException;
import org.apache.airavata.client.AiravataAPIFactory;
import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
import org.apache.airavata.client.tools.DocumentCreator;
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.ClientSettings;
+import org.apache.airavata.model.error.AiravataClientConnectException;
+import org.apache.airavata.model.error.AiravataClientException;
+import org.apache.airavata.model.error.AiravataSystemException;
+import org.apache.airavata.model.error.ExperimentNotFoundException;
+import org.apache.airavata.model.error.InvalidRequestException;
import org.apache.airavata.model.util.ExperimentModelUtil;
+import org.apache.airavata.model.workspace.Project;
import org.apache.airavata.model.workspace.experiment.ComputationalResourceScheduling;
import org.apache.airavata.model.workspace.experiment.DataObjectType;
+import org.apache.airavata.model.workspace.experiment.DataType;
import org.apache.airavata.model.workspace.experiment.Experiment;
import org.apache.airavata.model.workspace.experiment.UserConfigurationData;
-import org.apache.airavata.schemas.gfac.DataType;
import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -65,23 +66,31 @@ public class ExperimentSample {
AiravataAPI airavataAPI = getAiravataAPI();
DocumentCreator documentCreator = new DocumentCreator(airavataAPI);
documentCreator.createLocalHostDocs();
+ String user = "admin";
+ Project project=new Project();
+ project.setName("project1");
+ project.setProjectID("project1");
+ project.setOwner(user);
+ Client client = getClient();
+ String projectId=client.createProject(project);
+ System.out.println("Created new project '"+project.getName()+"' with project id "+projectId);
List<DataObjectType> exInputs = new ArrayList<DataObjectType>();
DataObjectType input = new DataObjectType();
input.setKey("echo_input");
-// input.setType(DataType.STRING.toString());
+ input.setType(DataType.STRING);
input.setValue("echo_output=Hello World");
exInputs.add(input);
List<DataObjectType> exOut = new ArrayList<DataObjectType>();
DataObjectType output = new DataObjectType();
output.setKey("echo_output");
- output.setType(DataType.STRING.toString());
+ output.setType(DataType.STDOUT);
output.setValue("");
exOut.add(output);
Experiment simpleExperiment =
- ExperimentModelUtil.createSimpleExperiment("project1", "admin", "echoExperiment", "SimpleEcho0", "SimpleEcho0", exInputs);
+ ExperimentModelUtil.createSimpleExperiment(projectId, user, "echoExperiment", "SimpleEcho0", "SimpleEcho0", exInputs);
simpleExperiment.setExperimentOutputs(exOut);
ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling("localhost", 1, 1, 1, "normal", 0, 0, 1, "sds128");
@@ -93,7 +102,7 @@ public class ExperimentSample {
simpleExperiment.setUserConfigurationData(userConfigurationData);
- Client client = getClient();
+
final String expId = client.createExperiment(simpleExperiment);
System.out.println("Experiment Id returned : " + expId);