Repository: airavata Updated Branches: refs/heads/mongo-registry [created] 8bd562af4
http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/LaunchApplicationWindow.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/LaunchApplicationWindow.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/LaunchApplicationWindow.java index 450dde5..9e8e673 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/LaunchApplicationWindow.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/LaunchApplicationWindow.java @@ -299,7 +299,7 @@ public class LaunchApplicationWindow { String owner = this.thriftClientData.getUsername(); if(owner.equals(""))owner="NotKnown"; project.setOwner(owner); - project.setProjectID(airavataClient.createProject(gatewayId, project)); + project.setProjectId(airavataClient.createProject(gatewayId, project)); // final List<InputNode> inputNodes = GraphUtil.getInputNodes(this.workflow.getGraph()); final List<DataPort> inputPorts = node.getInputPorts(); final Experiment experiment = new Experiment(); @@ -314,7 +314,7 @@ public class LaunchApplicationWindow { } scheduling.setNodeCount(1); - scheduling.setTotalCPUCount(1); + scheduling.setTotalCpuCount(1); scheduling.setWallTimeLimit(15); scheduling.setQueueName("normal"); UserConfigurationData userConfigurationData = new UserConfigurationData(); @@ -323,7 +323,7 @@ public class LaunchApplicationWindow { userConfigurationData.setComputationalResourceScheduling(scheduling); experiment.setUserConfigurationData(userConfigurationData); experiment.setName(instanceName); - experiment.setProjectID(project.getProjectID()); + experiment.setProjectId(project.getProjectId()); experiment.setUserName(thriftClientData.getUsername()); // for (int i = 0; i < inputNodes.size(); i++) { @@ -368,16 +368,16 @@ public class LaunchApplicationWindow { experiment.addToExperimentOutputs(elem ); } - experiment.setExperimentID(airavataClient.createExperiment(gatewayId, experiment)); - airavataClient.launchExperiment(experiment.getExperimentID(), "testToken"); + experiment.setExperimentId(airavataClient.createExperiment(gatewayId, experiment)); + airavataClient.launchExperiment(experiment.getExperimentId(), "testToken"); hide(); JOptionPane.showMessageDialog(null, "Experiment Launched. You will be alerted on completion."); - String status = airavataClient.getExperimentStatus(experiment.getExperimentID()).getExperimentState().toString().trim(); + String status = airavataClient.getExperimentStatus(experiment.getExperimentId()).getExperimentState().toString().trim(); while(!status.equals("COMPLETED") && !status.equals("FAILED")){ try { Thread.sleep(1000); - status = airavataClient.getExperimentStatus(experiment.getExperimentID()).getExperimentState().toString().trim(); + status = airavataClient.getExperimentStatus(experiment.getExperimentId()).getExperimentState().toString().trim(); } catch (InterruptedException e) { logger.error(e.getMessage(), e); } @@ -394,7 +394,7 @@ public class LaunchApplicationWindow { while(output.equals("")){ output = ""; fullOutput = "Experiment Completed Successfully. Output(s) are shown below:\n"; - List<OutputDataObjectType> outputs = airavataClient.getExperimentOutputs(experiment.getExperimentID()); + List<OutputDataObjectType> outputs = airavataClient.getExperimentOutputs(experiment.getExperimentId()); for(int i1=0; i1<outputs.size(); i1++){ output = outputs.get(i1).getValue(); fullOutput+= outputs.get(i1).getName()+": "+output+"\n"; http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java index 5ae0c94..4b12db9 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java @@ -325,11 +325,11 @@ public class WorkflowInterpreterLaunchWindow { Project project = new Project(); project.setName("project1"); project.setOwner(thriftClientData.getUsername()); - project.setProjectID(airavataClient.createProject(gatewayId, project)); + project.setProjectId(airavataClient.createProject(gatewayId, project)); final Experiment experiment = new Experiment(); experiment.setApplicationId(workflowModel.getTemplateId()); experiment.setName(instanceName); - experiment.setProjectID(project.getProjectID()); + experiment.setProjectId(project.getProjectId()); experiment.setUserName(thriftClientData.getUsername()); for (InputDataObjectType inputDataType : inputDataTypes) { experiment.addToExperimentInputs(inputDataType); @@ -372,25 +372,25 @@ public class WorkflowInterpreterLaunchWindow { for (int i = 0; i < 20; i++) { experiment.setName(instanceName + "_" + i); - experiment.setExperimentID(airavataClient.createExperiment(experiment)); + experiment.setExperimentId(airavataClient.createExperiment(experiment)); try { - this.engine.getMonitor().subscribe(experiment.getExperimentID()); + this.engine.getMonitor().subscribe(experiment.getExperimentId()); this.engine.getMonitor().fireStartMonitoring(workflow.getName()); } catch (MonitorException e) { - logger.error("Error while subscribing with experiment Id : " + experiment.getExperimentID(), e); + logger.error("Error while subscribing with experiment Id : " + experiment.getExperimentId(), e); } - airavataClient.launchExperiment(experiment.getExperimentID(), "testToken"); + airavataClient.launchExperiment(experiment.getExperimentId(), "testToken"); }*/ - experiment.setExperimentID(airavataClient.createExperiment(gatewayId, experiment)); + experiment.setExperimentId(airavataClient.createExperiment(gatewayId, experiment)); try { - this.engine.getMonitor().subscribe(experiment.getExperimentID()); + this.engine.getMonitor().subscribe(experiment.getExperimentId()); this.engine.getMonitor().fireStartMonitoring(workflow.getName()); } catch (MonitorException e) { - logger.error("Error while subscribing with experiment Id : " + experiment.getExperimentID(), e); + logger.error("Error while subscribing with experiment Id : " + experiment.getExperimentId(), e); } - airavataClient.launchExperiment(experiment.getExperimentID(), token.getText()); + airavataClient.launchExperiment(experiment.getExperimentId(), token.getText()); clean(); hide(); http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java index 2461da8..505fc89 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java @@ -331,14 +331,14 @@ public class MonitorEventHandler implements ChangeListener { if (event.getStatus().equals(WorkflowNodeState.INVOKED.toString())) { invokeNode(node); // workflowStarted(graph, forward); -// workflowStatusUpdater.workflowStarted(event.getExperimentID()); +// workflowStatusUpdater.workflowStarted(event.getExperimentId()); } else if (event.getStatus().equals(WorkflowNodeState.COMPLETED.toString())) { nodeFinished(node, true); // workflowFinished(graph, forward); -// workflowStatusUpdater.workflowFinished(event.getExperimentID()); +// workflowStatusUpdater.workflowFinished(event.getExperimentId()); } else if (event.getStatus().equals(WorkflowNodeState.EXECUTING.toString())) { nodeStarted(node, forward); -// workflowNodeStatusUpdater.workflowStarted(event.getExperimentID(), event.getNodeID()); +// workflowNodeStatusUpdater.workflowStarted(event.getExperimentId(), event.getNodeID()); } else { // Ignore the rest. } http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/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 83dd1a7..7f2379d 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 @@ -70,7 +70,7 @@ public class ExperimentSample { Project project=new Project(); project.setName("project1"); - project.setProjectID("project1"); + project.setProjectId("project1"); project.setOwner(user); Client client = getClient(); String projectId=client.createProject(project); http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/JobDescriptor.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/JobDescriptor.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/JobDescriptor.java index 9a34a47..b2fcea7 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/JobDescriptor.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/JobDescriptor.java @@ -161,7 +161,7 @@ public class JobDescriptor { inputList.setInputArray(inputValue.toArray(new String[inputValue.size()])); } - public void setJobID(String jobID) { + public void setJobId(String jobID) { this.getJobDescriptorDocument().getJobDescriptor().setJobID(jobID); } @@ -325,7 +325,7 @@ public class JobDescriptor { return this.getJobDescriptorDocument().getJobDescriptor().getInputs().getInputArray(); } - public String getJobID() { + public String getJobId() { return this.getJobDescriptorDocument().getJobDescriptor().getJobID(); } @@ -384,11 +384,6 @@ public class JobDescriptor { return this.getJobDescriptorDocument().getJobDescriptor().getJobName(); } - public String getJobId() { - return this.getJobDescriptorDocument().getJobDescriptor().getJobID(); - } - - public String getVariableList() { return this.getJobDescriptorDocument().getJobDescriptor().getJobID(); } http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java index 3304465..d5c51d0 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java @@ -60,7 +60,7 @@ public class PBSOutputParser implements OutputParser { value = value.replaceAll("\t", ""); jobDescriptor.setVariableList(value); } else if ("Job Id".equals(header)) { - jobDescriptor.setJobID(value); + jobDescriptor.setJobId(value); } else if ("Job_Name".equals(header)) { jobDescriptor.setJobName(value); } else if ("Account_Name".equals(header)) { http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmOutputParser.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmOutputParser.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmOutputParser.java index d37d444..0796937 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmOutputParser.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/SlurmOutputParser.java @@ -52,7 +52,7 @@ public class SlurmOutputParser implements OutputParser { } else { switch (column) { case 0: - descriptor.setJobID(each); + descriptor.setJobId(each); column++; break; case 1: http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/UGEOutputParser.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/UGEOutputParser.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/UGEOutputParser.java index 238581a..89bbb38 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/UGEOutputParser.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/UGEOutputParser.java @@ -59,7 +59,7 @@ public class UGEOutputParser implements OutputParser{ value = value.replaceAll("\t", ""); jobDescriptor.setVariableList(value); } else if ("Job Id".equals(header)) { - jobDescriptor.setJobID(value); + jobDescriptor.setJobId(value); } else if ("Job_Name".equals(header)) { jobDescriptor.setJobName(value); } else if ("Account_Name".equals(header)) {
