Repository: airavata Updated Branches: refs/heads/master 343ea0aa3 -> db94c558d
Fixed compilation issue with previous commit Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/debde7aa Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/debde7aa Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/debde7aa Branch: refs/heads/master Commit: debde7aa46aa58db0563810d4d9befa4da55bd48 Parents: 1d27a9c Author: Shameera Rathanyaka <[email protected]> Authored: Mon Jul 6 11:23:47 2015 -0400 Committer: Shameera Rathanyaka <[email protected]> Committed: Mon Jul 6 11:23:47 2015 -0400 ---------------------------------------------------------------------- .../client/samples/CreateLaunchBES.java | 4 +-- .../samples/CreateLaunchExperimentUS3.java | 33 +++++++++++++------- .../sample/OrchestratorClientSample.java | 2 +- 3 files changed, 24 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/debde7aa/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchBES.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchBES.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchBES.java index 74eda5c..7278b65 100644 --- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchBES.java +++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchBES.java @@ -235,7 +235,7 @@ public class CreateLaunchBES { List<OutputDataObjectType> exOut = client.getApplicationOutputs(echoAppId); ExperimentModel simpleExperiment = - ExperimentModelUtil.createSimpleExperiment("default", "admin", "echoExperiment", "SimpleEcho2", echoAppId, exInputs); + ExperimentModelUtil.createSimpleExperiment(DEFAULT_GATEWAY,"default", "admin", "echoExperiment", "SimpleEcho2", echoAppId, exInputs); simpleExperiment.setExperimentOutputs(exOut); @@ -301,7 +301,7 @@ public class CreateLaunchBES { } ExperimentModel simpleExperiment = - ExperimentModelUtil.createSimpleExperiment("default", "admin", "mpiExperiment", "HelloMPI", mpiAppId, exInputs); + ExperimentModelUtil.createSimpleExperiment(DEFAULT_GATEWAY,"default", "admin", "mpiExperiment", "HelloMPI", mpiAppId, exInputs); simpleExperiment.setExperimentOutputs(exOut); http://git-wip-us.apache.org/repos/asf/airavata/blob/debde7aa/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java index 90131c6..9d82fc8 100644 --- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java +++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java @@ -162,9 +162,10 @@ public class CreateLaunchExperimentUS3 { Project project = ProjectModelUtil.createProject("project1", "admin", "test project"); String projectId = client.createProject(DEFAULT_GATEWAY, project); - ExperimentModel simpleExperiment = - ExperimentModelUtil.createSimpleExperiment(projectId, "admin", "US3EchoExperimentTrestles", "US3EchoTrestles", "US3EchoTrestles", exInputs); - simpleExperiment.setExperimentOutputs(exOut); + ExperimentModel simpleExperiment = + ExperimentModelUtil.createSimpleExperiment(DEFAULT_GATEWAY, projectId, "admin", + "US3EchoExperimentTrestles", "US3EchoTrestles", "US3EchoTrestles", exInputs); + simpleExperiment.setExperimentOutputs(exOut); ComputationalResourceSchedulingModel scheduling = ExperimentModelUtil.createComputationResourceScheduling("trestles.sdsc.edu", 1, 1, 1, "shared", 0, 0); scheduling.setResourceHostId("gsissh-trestles"); @@ -229,8 +230,10 @@ public class CreateLaunchExperimentUS3 { Project project = ProjectModelUtil.createProject("ultrascan", "ultrascan", "test project"); String projectId = client.createProject(DEFAULT_GATEWAY, project); - ExperimentModel simpleExperiment = ExperimentModelUtil.createSimpleExperiment(projectId, "ultrascan", "US3ExperimentTrestles", "US3AppTrestles", "ultrascan_7ce6cd43-622c-44e0-87c5-fb7a6528c799", exInputs); - simpleExperiment.setExperimentOutputs(exOut); + ExperimentModel simpleExperiment = ExperimentModelUtil.createSimpleExperiment(DEFAULT_GATEWAY, projectId, + "ultrascan", "US3ExperimentTrestles", "US3AppTrestles", + "ultrascan_7ce6cd43-622c-44e0-87c5-fb7a6528c799", exInputs); + simpleExperiment.setExperimentOutputs(exOut); ComputationalResourceSchedulingModel scheduling = ExperimentModelUtil.createComputationResourceScheduling("trestles.sdsc.xsede.org_72b9181b-7156-4975-a386-ed98b4949496", 32, 1, 0, "shared", 30, 0); UserConfigurationDataModel userConfigurationData = new UserConfigurationDataModel(); @@ -301,8 +304,10 @@ public class CreateLaunchExperimentUS3 { Project project = ProjectModelUtil.createProject("project1", "admin", "test project"); String projectId = client.createProject(DEFAULT_GATEWAY, project); - ExperimentModel simpleExperiment = ExperimentModelUtil.createSimpleExperiment(projectId, "ultrascan", "US3ExperimentStampede", "US3AppStampede", "ultrascan_7ce6cd43-622c-44e0-87c5-fb7a6528c799", exInputs); - simpleExperiment.setExperimentOutputs(exOut); + ExperimentModel simpleExperiment = ExperimentModelUtil.createSimpleExperiment(DEFAULT_GATEWAY, projectId, + "ultrascan", "US3ExperimentStampede", "US3AppStampede", + "ultrascan_7ce6cd43-622c-44e0-87c5-fb7a6528c799", exInputs); + simpleExperiment.setExperimentOutputs(exOut); ComputationalResourceSchedulingModel scheduling = ExperimentModelUtil.createComputationResourceScheduling("stampede.tacc.xsede.org_e59e046f-e0e1-49c4-8475-2fab2e35d044", 32, 2, 0, "normal", 30, 0); @@ -373,8 +378,10 @@ public class CreateLaunchExperimentUS3 { // Project project = ProjectModelUtil.createProject("project1", "admin", "test project"); // String projectId = client.createProject(project); - ExperimentModel simpleExperiment = ExperimentModelUtil.createSimpleExperiment("ultrascan_41574ef5-b054-4d03-ab20-2cfe768d5096", "ultrascan", "US3ExperimentLonestar", "US3AppLonestar", "ultrascan_e76ab5cf-79f6-44df-a244-10a734183fec", exInputs); - simpleExperiment.setExperimentOutputs(exOut); + ExperimentModel simpleExperiment = ExperimentModelUtil.createSimpleExperiment(DEFAULT_GATEWAY, + "ultrascan_41574ef5-b054-4d03-ab20-2cfe768d5096", "ultrascan", "US3ExperimentLonestar", + "US3AppLonestar", "ultrascan_e76ab5cf-79f6-44df-a244-10a734183fec", exInputs); + simpleExperiment.setExperimentOutputs(exOut); ComputationalResourceSchedulingModel scheduling = ExperimentModelUtil.createComputationResourceScheduling("lonestar.tacc.teragrid.org_2e0273bc-324b-419b-9786-38a360d44772", 12, 2, 0, "normal", 30, 0); @@ -446,8 +453,10 @@ public class CreateLaunchExperimentUS3 { // Project project = ProjectModelUtil.createProject("project1", "admin", "test project"); // String projectId = client.createProject(project); - ExperimentModel simpleExperiment = ExperimentModelUtil.createSimpleExperiment("ultrascan_41574ef5-b054-4d03-ab20-2cfe768d5096", "ultrascan", "US3ExperimentStampede", "US3AppStampede", "ultrascan_e76ab5cf-79f6-44df-a244-10a734183fec", exInputs); - simpleExperiment.setExperimentOutputs(exOut); + ExperimentModel simpleExperiment = ExperimentModelUtil.createSimpleExperiment(DEFAULT_GATEWAY, + "ultrascan_41574ef5-b054-4d03-ab20-2cfe768d5096", "ultrascan", "US3ExperimentStampede", + "US3AppStampede", "ultrascan_e76ab5cf-79f6-44df-a244-10a734183fec", exInputs); + simpleExperiment.setExperimentOutputs(exOut); ComputationalResourceSchedulingModel scheduling = ExperimentModelUtil.createComputationResourceScheduling("alamo.uthscsa.edu_7b6cf99a-af2e-4e8b-9eff-998a5ef60fe5", 4, 2, 0, "default", 30, 0); @@ -498,7 +507,7 @@ public class CreateLaunchExperimentUS3 { String projectId = client.createProject(DEFAULT_GATEWAY, project); ExperimentModel simpleExperiment = - ExperimentModelUtil.createSimpleExperiment(projectId, "admin", "US3EchoExperimentStatus", "US3EchoStampede", "US3EchoStampede", exInputs); + ExperimentModelUtil.createSimpleExperiment(DEFAULT_GATEWAY,projectId, "admin", "US3EchoExperimentStatus", "US3EchoStampede", "US3EchoStampede", exInputs); simpleExperiment.setExperimentOutputs(exOut); ComputationalResourceSchedulingModel scheduling = http://git-wip-us.apache.org/repos/asf/airavata/blob/debde7aa/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/sample/OrchestratorClientSample.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/sample/OrchestratorClientSample.java b/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/sample/OrchestratorClientSample.java index e8f6bec..fae110b 100644 --- a/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/sample/OrchestratorClientSample.java +++ b/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/sample/OrchestratorClientSample.java @@ -103,7 +103,7 @@ public class OrchestratorClientSample { output.setValue(""); exOut.add(output); - ExperimentModel simpleExperiment = ExperimentModelUtil.createSimpleExperiment("default", "admin", "echoExperiment", "SimpleEcho2", "SimpleEcho2", exInputs); + ExperimentModel simpleExperiment = ExperimentModelUtil.createSimpleExperiment(DEFAULT_GATEWAY,"default", "admin", "echoExperiment", "SimpleEcho2", "SimpleEcho2", exInputs); simpleExperiment.setExperimentOutputs(exOut); ComputationalResourceSchedulingModel scheduling = ExperimentModelUtil.createComputationResourceScheduling("trestles.sdsc.edu", 1, 1, 1, "normal", 0, 0);
