You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2014/08/25 17:22:25 UTC
[1/5] git commit: Updated Xbaya to enable execution of a single
application through thrift api
Repository: airavata
Updated Branches:
refs/heads/master 98f411019 -> 36d0b7620
Updated Xbaya to enable execution of a single application through thrift api
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/bedf7c0f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/bedf7c0f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/bedf7c0f
Branch: refs/heads/master
Commit: bedf7c0fbe6fecf041119a0bf3c4aa4e23965dbd
Parents: d0fcdb1
Author: Nadeem Anjum <na...@gmail.com>
Authored: Sun Aug 17 06:38:17 2014 +0530
Committer: Suresh Marru <sm...@apache.org>
Committed: Mon Aug 18 17:52:53 2014 -0400
----------------------------------------------------------------------
.../ui/experiment/LaunchApplicationWindow.java | 400 +++++++++++++++++++
.../airavata/xbaya/ui/menues/RunMenuItem.java | 9 +-
2 files changed, 406 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/bedf7c0f/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
new file mode 100644
index 0000000..18daea0
--- /dev/null
+++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/LaunchApplicationWindow.java
@@ -0,0 +1,400 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.xbaya.ui.experiment;
+
+import java.awt.event.ActionEvent;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.swing.AbstractAction;
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.border.EtchedBorder;
+import javax.xml.namespace.QName;
+
+import org.apache.airavata.api.Airavata.Client;
+import org.apache.airavata.common.utils.XMLUtil;
+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.InvalidRequestException;
+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.workflow.model.graph.impl.NodeImpl;
+import org.apache.airavata.workflow.model.graph.system.InputNode;
+import org.apache.airavata.workflow.model.graph.system.OutputNode;
+import org.apache.airavata.workflow.model.graph.util.GraphUtil;
+import org.apache.airavata.workflow.model.wf.Workflow;
+import org.apache.airavata.ws.monitor.MonitorConfiguration;
+import org.apache.airavata.xbaya.ThriftClientData;
+import org.apache.airavata.xbaya.ThriftServiceType;
+import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.ui.dialogs.XBayaDialog;
+import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
+import org.apache.airavata.xbaya.ui.widgets.GridPanel;
+import org.apache.airavata.xbaya.ui.widgets.XBayaLabel;
+import org.apache.airavata.xbaya.ui.widgets.XBayaTextField;
+import org.apache.airavata.xbaya.util.XBayaUtil;
+import org.apache.thrift.TException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.xmlpull.infoset.XmlElement;
+
+public class LaunchApplicationWindow {
+
+ private static final Logger logger = LoggerFactory.getLogger(LaunchApplicationWindow.class);
+
+ private XBayaEngine engine;
+
+ private Workflow workflow;
+
+ private XBayaDialog dialog;
+
+ private GridPanel parameterPanel;
+
+ private ThriftClientData thriftClientData;
+
+ private Client airavataClient;
+
+ private List<XBayaTextField> parameterTextFields = new ArrayList<XBayaTextField>();
+
+
+ private XBayaTextField instanceNameTextField;
+
+ private JComboBox host;
+
+ private Map<String,String> hostNames;
+
+
+ /**
+ * Constructs a LaunchApplicationWindow.
+ *
+ * @param engine
+ *
+ */
+ public LaunchApplicationWindow(XBayaEngine engine) {
+ this.engine = engine;
+ thriftClientData = engine.getConfiguration().getThriftClientData(ThriftServiceType.API_SERVICE);
+ try {
+ airavataClient = XBayaUtil.getAiravataClient(thriftClientData);
+ } catch (AiravataClientConnectException e) {
+ e.printStackTrace();
+ }
+ initGUI();
+ }
+
+ /**
+ * Shows the dialog.
+ */
+ public void show() {
+ this.workflow = this.engine.getGUI().getWorkflow();
+
+ MonitorConfiguration notifConfig = this.engine.getMonitor().getConfiguration();
+ if (notifConfig.getBrokerURL() == null) {
+ this.engine.getGUI().getErrorWindow().error(ErrorMessages.BROKER_URL_NOT_SET_ERROR);
+ return;
+ }
+
+ // Create input fields
+ Collection<InputNode> inputNodes = GraphUtil.getInputNodes(this.workflow.getGraph());
+ for (InputNode node : inputNodes) {
+ String id = node.getID();
+ QName parameterType = node.getParameterType();
+ JLabel nameLabel = new JLabel(id);
+ JLabel typeField = new JLabel(parameterType.getLocalPart());
+ XBayaTextField paramField = new XBayaTextField();
+ Object value = node.getDefaultValue();
+
+ String valueString;
+ if (value == null) {
+ valueString = "";
+ } else {
+ if (value instanceof XmlElement) {
+ XmlElement valueElement = (XmlElement) value;
+ valueString = XMLUtil.xmlElementToString(valueElement);
+ } else {
+ // Only string comes here for now.
+ valueString = value.toString();
+ }
+ }
+ paramField.setText(valueString);
+ this.parameterPanel.add(nameLabel);
+ this.parameterPanel.add(typeField);
+ this.parameterPanel.add(paramField);
+ this.parameterTextFields.add(paramField);
+ }
+
+ Map<String, String> hosts = null;
+
+ try {
+ hosts = airavataClient.getAllComputeResourceNames();
+ } catch (InvalidRequestException e2) {
+ // TODO Auto-generated catch block
+ e2.printStackTrace();
+ } catch (AiravataClientException e2) {
+ // TODO Auto-generated catch block
+ e2.printStackTrace();
+ } catch (AiravataSystemException e2) {
+ // TODO Auto-generated catch block
+ e2.printStackTrace();
+ } catch (TException e2) {
+ // TODO Auto-generated catch block
+ e2.printStackTrace();
+ }
+
+
+ hostNames= new HashMap<String,String>();
+
+ Iterator it=hosts.entrySet().iterator();
+ while(it.hasNext()){
+ Map.Entry pairs=(Map.Entry)it.next();
+ String key = (String) pairs.getKey();
+ String value = (String) pairs.getValue();
+ if(!hostNames.containsKey(value)){
+ hostNames.put(value, key);
+ }
+ }
+ host = new JComboBox();
+ it=hostNames.entrySet().iterator();
+ while(it.hasNext()){
+ Map.Entry pairs=(Map.Entry)it.next();
+ String key = (String) pairs.getKey();
+ host.addItem(key);
+ }
+ host.setSelectedIndex(1);
+
+ XBayaLabel hostLabel = new XBayaLabel("Host", this.host);
+ this.parameterPanel.add(hostLabel);
+ this.parameterPanel.add(host);
+ // this.parameterPanel.layout(inputNodes.size()+1, 2, GridPanel.WEIGHT_NONE, 2);
+ this.dialog.show();
+ }
+
+ /**
+ * Hides the dialog.
+ */
+ public void hide() {
+ this.dialog.hide();
+
+ this.parameterPanel.getContentPanel().removeAll();
+ this.parameterTextFields.clear();
+ }
+
+ private void initGUI() {
+ this.parameterPanel = new GridPanel(true);
+
+ this.instanceNameTextField = new XBayaTextField();
+ XBayaLabel instanceNameLabel = new XBayaLabel("Experiment name", this.instanceNameTextField);
+ GridPanel infoPanel = new GridPanel();
+ infoPanel.add(instanceNameLabel);
+ infoPanel.add(this.instanceNameTextField);
+ infoPanel.layout(1, 2, GridPanel.WEIGHT_NONE, 1);
+
+ GridPanel mainPanel = new GridPanel();
+ mainPanel.getContentPanel().setBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED));
+ mainPanel.add(infoPanel);
+ mainPanel.add(this.parameterPanel);
+ mainPanel.layout(2, 1, 0, 0);
+
+ JButton okButton = new JButton("Run");
+ okButton.addActionListener(new AbstractAction() {
+ public void actionPerformed(ActionEvent e) {
+ try {
+ execute();
+ } catch (AiravataClientConnectException e1) {
+ e1.printStackTrace();
+ } catch (InvalidRequestException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ } catch (AiravataClientException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ } catch (AiravataSystemException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ } catch (TException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+ }
+ });
+
+ JButton cancelButton = new JButton("Cancel");
+ cancelButton.addActionListener(new AbstractAction() {
+ public void actionPerformed(ActionEvent e) {
+ hide();
+ }
+ });
+
+ JPanel buttonPanel = new JPanel();
+ buttonPanel.add(okButton);
+ buttonPanel.add(cancelButton);
+ buttonPanel.setBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED));
+ this.dialog = new XBayaDialog(this.engine.getGUI(), "Launch workflow", mainPanel, buttonPanel);
+ this.dialog.setDefaultButton(okButton);
+ }
+
+ private void execute() throws AiravataClientConnectException, InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
+ List<NodeImpl> nodes = workflow.getGraph().getNodes();
+ String appId = null;
+ for(int i=0; i<nodes.size(); i++){
+ NodeImpl node = nodes.get(i);
+ String html = node.getComponent().toHTML();
+ String nodeType =html.substring(html.indexOf("<h1>")+4, html.indexOf(":")).trim();
+ if(nodeType.equals("Application")){
+ appId=html.substring(html.indexOf("</h2>")+6, html.indexOf("<br")).trim();
+ break;
+ }
+ }
+
+ String hostId = null;
+ String hostName = (String) host.getSelectedItem();
+ hostId = hostNames.get(hostName);
+
+ String instanceName = this.instanceNameTextField.getText();
+ if (instanceName.trim().equals("")){
+ JOptionPane.showMessageDialog(engine.getGUI().getFrame(),
+ "Experiment name cannot be empty",
+ "Experiment Name",
+ JOptionPane.ERROR_MESSAGE);
+ return;
+ }
+
+ //previous instance name
+ if (!instanceNameTextField.getText().equals("")){
+ this.instanceNameTextField.setText("");
+ }
+ Project project = new Project();
+ project.setName("project1");
+ String owner = this.thriftClientData.getUsername();
+ if(owner.equals(""))owner="NotKnown";
+ project.setOwner(owner);
+ project.setProjectID(airavataClient.createProject(project));
+ final List<InputNode> inputNodes = GraphUtil.getInputNodes(this.workflow.getGraph());
+ final Experiment experiment = new Experiment();
+ experiment.setApplicationId(appId);
+ ComputationalResourceScheduling scheduling = new ComputationalResourceScheduling();
+ scheduling.setResourceHostId(hostId);
+ if(hostName.trim().equals("trestles.sdsc.xsede.org")){
+ scheduling.setComputationalProjectAccount("sds128");
+ }
+ else if(hostName.trim().equals("stampede.tacc.xsede.org")){
+ scheduling.setComputationalProjectAccount("TG-STA110014S");
+ }
+
+ scheduling.setNodeCount(1);
+ scheduling.setTotalCPUCount(1);
+ scheduling.setWallTimeLimit(15);
+ scheduling.setQueueName("normal");
+ UserConfigurationData userConfigurationData = new UserConfigurationData();
+ userConfigurationData.setAiravataAutoSchedule(false);
+ userConfigurationData.setOverrideManualScheduledParams(false);
+ userConfigurationData.setComputationalResourceScheduling(scheduling);
+ experiment.setUserConfigurationData(userConfigurationData);
+ experiment.setName(instanceName);
+ experiment.setProjectID(project.getProjectID());
+ experiment.setUserName(thriftClientData.getUsername());
+ for (int i = 0; i < inputNodes.size(); i++) {
+ InputNode inputNode = inputNodes.get(i);
+ XBayaTextField parameterTextField = this.parameterTextFields.get(i);
+ inputNode.getID();
+ String value = parameterTextField.getText();
+ DataObjectType elem = new DataObjectType();
+ elem.setKey(inputNode.getID());
+ elem.setType(DataType.STRING);
+ elem.setValue(value);
+ experiment.addToExperimentInputs(elem );
+ }
+ final List<OutputNode> outputNodes = GraphUtil.getOutputNodes(this.workflow.getGraph());
+
+ for (int i = 0; i < outputNodes.size(); i++) {
+ OutputNode outputNode = outputNodes.get(i);
+ DataObjectType elem = new DataObjectType();
+ elem.setKey(outputNode.getID());
+ elem.setType(DataType.STRING);
+ elem.setValue("");
+ experiment.addToExperimentOutputs(elem );
+ }
+
+ experiment.setExperimentID(airavataClient.createExperiment(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();
+ while(!status.equals("COMPLETED") && !status.equals("FAILED")){
+ try {
+ Thread.sleep(1000);
+ status = airavataClient.getExperimentStatus(experiment.getExperimentID()).getExperimentState().toString().trim();
+ } catch (InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ String output = "";
+ while(output.equals("")){
+ String fullOutput = "Experiment Completed Successfully. Output(s) are shown below:\n";
+ if(status.equals("COMPLETED")){
+ List<DataObjectType> outputs = airavataClient.getExperimentOutputs(experiment.getExperimentID());
+ for(int i1=0; i1<outputs.size(); i1++){
+ output = outputs.get(i1).getValue();
+ fullOutput+= outputs.get(i1).getKey()+": "+output+"\n";
+
+ }
+ JOptionPane.showMessageDialog(null, fullOutput);
+ }
+ else{
+ JOptionPane.showMessageDialog(null, "Experiment Failed");
+ return;
+ }
+ }
+
+
+ new Thread() {
+ @Override
+ public void run() {
+
+ }
+ }.start();
+
+ hide();
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/bedf7c0f/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java
index 0b43f04..6cfde9f 100644
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java
+++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java
@@ -45,7 +45,8 @@ import org.apache.airavata.xbaya.XBayaConfiguration.XBayaExecutionMode;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.core.ide.XBayaExecutionModeListener;
import org.apache.airavata.xbaya.ui.dialogs.monitor.MonitorConfigurationWindow;
-import org.apache.airavata.xbaya.ui.experiment.WorkflowInterpreterLaunchWindow;
+import org.apache.airavata.xbaya.ui.experiment.LaunchApplicationWindow;
+//import org.apache.airavata.xbaya.ui.experiment.WorkflowInterpreterLaunchWindow;
import org.apache.airavata.xbaya.ui.monitor.MonitorStarter;
import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
import org.apache.airavata.xbaya.ui.widgets.ToolbarButton;
@@ -267,7 +268,8 @@ public class RunMenuItem implements EventListener, XBayaExecutionModeListener{
private void createLaunchXBayaInterpreterItem() {
this.launchXBayaInterpreterItem = new JMenuItem("Run on Interpreter Server...", MenuIcons.RUN_ICON);
AbstractAction action = new AbstractAction() {
- private WorkflowInterpreterLaunchWindow window;
+ //private WorkflowInterpreterLaunchWindow window;
+ private LaunchApplicationWindow window;
public void actionPerformed(ActionEvent e) {
if(!engine.getMonitor().hasCurrentExecutionTerminatedNotificationReceived() && engine.getMonitor().isMonitoring()){
if (JOptionPane.showConfirmDialog(null,
@@ -277,7 +279,8 @@ public class RunMenuItem implements EventListener, XBayaExecutionModeListener{
}
}
// if (this.window == null) {
- this.window = new WorkflowInterpreterLaunchWindow(engine);
+ //this.window = new WorkflowInterpreterLaunchWindow(engine);
+ this.window = new LaunchApplicationWindow(engine);
// }
try {
this.window.show();
[2/5] git commit: Merge remote-tracking branch 'origin/master'
Posted by sm...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/91dc82dc
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/91dc82dc
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/91dc82dc
Branch: refs/heads/master
Commit: 91dc82dc05a3be2d64adaf4111795be4137a7d75
Parents: bedf7c0 83cb4bf
Author: Suresh Marru <sm...@apache.org>
Authored: Wed Aug 20 01:29:48 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Wed Aug 20 01:29:48 2014 -0400
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 37 +
.../java/org/apache/airavata/api/Airavata.java | 6908 +++++++++++-------
.../main/resources/lib/airavata/Airavata.cpp | 963 ++-
.../src/main/resources/lib/airavata/Airavata.h | 167 +
.../lib/airavata/Airavata_server.skeleton.cpp | 5 +
.../resources/lib/Airavata/API/Airavata.php | 657 +-
.../client/samples/CancelExperiments.java | 2 +-
.../client/samples/CreateLaunchExperiment.java | 4 +-
.../samples/TestCreateLaunchExperiment.java | 29 +-
.../airavataAPI.thrift | 11 +-
.../airavata/gfac/core/cpi/BetterGfacImpl.java | 6 -
.../core/monitor/AiravataTaskStatusUpdator.java | 2 +
.../airavata/gfac/core/utils/GFacUtils.java | 48 +-
.../gsissh/provider/impl/GSISSHProvider.java | 19 +-
.../gfac/ssh/provider/impl/SSHProvider.java | 49 +-
.../server/OrchestratorServerHandler.java | 3 +
.../util/OrchestratorRecoveryHandler.java | 7 +-
.../core/impl/GFACServiceJobSubmitter.java | 4 +-
.../registry/jpa/impl/ExperimentRegistry.java | 71 +-
.../registry/jpa/resources/WorkerResource.java | 33 +
.../airavata/registry/cpi/utils/Constants.java | 2 +
.../gsi/ssh/api/job/SlurmJobConfiguration.java | 2 +-
.../gsi/ssh/impl/GSISSHAbstractCluster.java | 2 +-
23 files changed, 5812 insertions(+), 3219 deletions(-)
----------------------------------------------------------------------
[3/5] git commit: Merge remote-tracking branch 'origin/master'
Posted by sm...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/84cabd37
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/84cabd37
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/84cabd37
Branch: refs/heads/master
Commit: 84cabd37238c9473b3ce21a3b2c2818875e1840e
Parents: 91dc82d 98f4110
Author: Suresh Marru <sm...@apache.org>
Authored: Fri Aug 22 20:51:19 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Fri Aug 22 20:51:19 2014 -0400
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 85 +-
.../java/org/apache/airavata/api/Airavata.java | 4612 ++++++++++++++++--
.../main/resources/lib/airavata/Airavata.cpp | 1566 +++++-
.../src/main/resources/lib/airavata/Airavata.h | 410 +-
.../lib/airavata/Airavata_server.skeleton.cpp | 10 +
.../resources/lib/Airavata/API/Airavata.php | 1098 ++++-
.../java-client-samples/pom.xml | 17 +-
.../client/samples/CreateLaunchExperiment.java | 38 +-
.../samples/CreateLaunchExperimentUS3.java | 80 +-
.../samples/TestCreateLaunchExperiment.java | 95 +-
.../model/workspace/experiment/Experiment.java | 2 +-
.../model/workspace/experiment/TaskStatus.java | 2 +-
.../airavataAPI.thrift | 24 +
modules/airavata-client/pom.xml | 5 -
.../airavata/client/AiravataAPIFactory.java | 24 +-
.../apache/airavata/client/AiravataClient.java | 256 +-
.../apache/airavata/client/api/AiravataAPI.java | 5 +-
.../airavata/client/api/AiravataManager.java | 6 +-
.../org/apache/airavata/client/api/BaseAPI.java | 3 +-
.../client/api/CredentialStoreManager.java | 22 +-
.../airavata/client/api/ExecutionManager.java | 172 +-
.../airavata/client/api/ProvenanceManager.java | 938 ++--
.../client/impl/AiravataManagerImpl.java | 264 +-
.../client/impl/ApplicationManagerImpl.java | 525 +-
.../client/impl/CredentialStoreManagerImpl.java | 50 +-
.../client/impl/ExecutionManagerImpl.java | 366 +-
.../client/impl/PasswordCallBackImpl.java | 78 +-
.../client/impl/ProvenanceManagerImpl.java | 1273 ++---
.../client/impl/WorkflowManagerImpl.java | 365 +-
.../client/tools/DocumentCreatorNew.java | 34 +-
.../client/tools/PeriodicExecutorThread.java | 1 -
.../client/airavata/AiravataClientTest.java | 16 +-
.../catalog/data/util/AppCatalogJPAUtils.java | 1 +
.../main/resources/airavata-client.properties | 2 +-
.../main/resources/airavata-server.properties | 2 +-
modules/distribution/client/java/pom.xml | 10 -
.../java/src/main/assembly/bin-assembly.xml | 2 -
modules/distribution/server/pom.xml | 10 -
.../server/src/main/assembly/bin-assembly.xml | 2 -
modules/gfac/airavata-gfac-service/pom.xml | 25 +
.../airavata/gfac/server/GfacServerHandler.java | 29 +-
.../airavata/gfac/client/util/Initialize.java | 9 +-
.../gfac/bes/provider/impl/BESProvider.java | 88 +-
modules/gfac/gfac-core/pom.xml | 10 -
.../apache/airavata/gfac/GFacConfiguration.java | 16 +-
.../org/apache/airavata/gfac/Scheduler.java | 10 -
.../airavata/gfac/core/cpi/BetterGfacImpl.java | 41 +-
.../apache/airavata/gfac/core/cpi/GFacImpl.java | 1356 ++---
.../gfac/core/handler/AbstractHandler.java | 4 +-
.../handler/AbstractRecoverableHandler.java | 4 +-
.../core/handler/AppDescriptorCheckHandler.java | 5 -
.../airavata/gfac/core/monitor/MonitorID.java | 11 +-
.../gfac/core/provider/AbstractProvider.java | 3 +-
.../provider/AbstractRecoverableProvider.java | 3 +-
.../airavata/gfac/core/utils/GFacUtils.java | 319 +-
.../apache/airavata/job/GFacConfigXmlTest.java | 10 +-
modules/gfac/gfac-ec2/pom.xml | 5 -
.../apache/airavata/gfac/ec2/EC2Provider.java | 18 +-
.../airavata/gfac/ec2/EC2ProviderTest.java | 6 +-
.../impl/GramProviderTestWithMyProxyAuth.java | 6 +-
.../gfac/gsissh/handler/GSISSHInputHandler.java | 11 +-
.../gsissh/handler/GSISSHOutputHandler.java | 5 +-
.../gsissh/provider/impl/GSISSHProvider.java | 8 +-
.../impl/GSISSHProviderTestWithMyProxyAuth.java | 6 +-
.../gfac/services/impl/LocalProviderTest.java | 2 +-
modules/gfac/gfac-monitor/pom.xml | 10 -
.../handlers/GridPullMonitorHandler.java | 56 +-
.../handlers/GridPushMonitorHandler.java | 4 +-
.../monitor/impl/pull/qstat/HPCPullMonitor.java | 101 +-
.../ssh/handler/AdvancedSCPInputHandler.java | 18 +-
.../gfac/ssh/handler/SSHInputHandler.java | 30 +-
.../gfac/ssh/handler/SSHOutputHandler.java | 12 +-
.../gfac/ssh/provider/impl/SSHProvider.java | 36 +-
.../airavata/gfac/ssh/util/GFACSSHUtils.java | 12 +-
.../services/impl/BigRed2TestWithSSHAuth.java | 6 +-
.../impl/SSHProviderTestWithSSHAuth.java | 6 +-
.../integration/AbstractIntegrationTest.java | 11 -
.../apache/airavata/integration/BaseCaseIT.java | 96 +-
.../airavata/integration/DataRetrievalIT.java | 24 +-
.../airavata/integration/ForEachCaseIT.java | 126 +-
.../integration/PasswordCallbackImpl.java | 78 +-
.../WorkflowIntegrationTestBase.java | 341 +-
.../integration/WorkflowSamplesCaseIT.java | 162 +-
.../server/OrchestratorServerHandler.java | 61 +-
.../client/OrchestratorClientFactoryTest.java | 26 +-
.../orchestrator/client/util/Initialize.java | 7 +-
modules/orchestrator/orchestrator-core/pom.xml | 10 +-
.../core/OrchestratorConfiguration.java | 12 -
.../core/context/OrchestratorContext.java | 11 -
.../core/impl/GFACEmbeddedJobSubmitter.java | 6 +-
.../core/impl/GFACServiceJobSubmitter.java | 2 -
.../core/utils/OrchestratorUtils.java | 25 +-
.../cpi/impl/AbstractOrchestrator.java | 98 +-
.../cpi/impl/SimpleOrchestratorImpl.java | 10 +-
.../orchestrator/core/BaseOrchestratorTest.java | 38 +-
.../orchestrator/core/NewOrchestratorTest.java | 21 -
.../orchestrator/core/util/Initialize.java | 9 +-
modules/registry/airavata-jpa-registry/pom.xml | 5 -
.../registry/jpa/JPAResourceAccessor.java | 49 -
.../persistance/registry/jpa/ResourceUtils.java | 2 +-
.../registry/jpa/impl/AiravataJPARegistry.java | 2838 -----------
.../registry/jpa/impl/ExperimentRegistry.java | 23 +-
...avataRegistryConnectionDataProviderImpl.java | 42 -
.../jpa/resources/ErrorDetailResource.java | 8 +-
.../jpa/resources/ExperimentDataRetriever.java | 543 ---
.../registry/jpa/resources/UserResource.java | 7 +-
.../registry/jpa/AbstractResourceTest.java | 2 +-
.../registry/jpa/util/Initialize.java | 9 +-
modules/registry/pom.xml | 1 -
modules/registry/registry-api/pom.xml | 80 -
.../registry/api/AiravataExperiment.java | 73 -
.../registry/api/AiravataRegistry2.java | 65 -
.../AiravataRegistryConnectionDataProvider.java | 29 -
.../registry/api/AiravataRegistryFactory.java | 140 -
.../registry/api/AiravataSubRegistry.java | 97 -
.../airavata/registry/api/AiravataUser.java | 48 -
.../registry/api/ConfigurationRegistry.java | 59 -
.../registry/api/CredentialRegistry.java | 69 -
.../airavata/registry/api/DataRegistry.java | 50 -
.../registry/api/DescriptorRegistry.java | 74 -
.../airavata/registry/api/ExecutionErrors.java | 33 -
.../apache/airavata/registry/api/Gateway.java | 47 -
.../registry/api/OrchestratorRegistry.java | 120 -
.../airavata/registry/api/PasswordCallback.java | 25 -
.../airavata/registry/api/ProjectsRegistry.java | 50 -
.../registry/api/ProvenanceRegistry.java | 528 --
.../registry/api/PublishedWorkflowRegistry.java | 45 -
.../airavata/registry/api/ResourceMetadata.java | 70 -
.../airavata/registry/api/UserRegistry.java | 39 -
.../registry/api/UserWorkflowRegistry.java | 43 -
.../airavata/registry/api/WorkspaceProject.java | 95 -
.../AiravataRegUninitializedException.java | 32 -
.../DeploymentDescriptionRetrieveException.java | 35 -
.../GatewayNotRegisteredException.java | 32 -
.../HostDescriptionRetrieveException.java | 33 -
.../RegAPIVersionIncompatibleException.java | 39 -
.../RegAccessorInstantiateException.java | 32 -
.../exception/RegAccessorInvalidException.java | 32 -
.../exception/RegAccessorNotFoundException.java | 32 -
.../RegAccessorUndefinedException.java | 40 -
.../registry/api/exception/RegException.java | 39 -
.../exception/RegistrySettingsException.java | 37 -
.../RegistrySettingsLoadException.java | 38 -
.../ServiceDescriptionRetrieveException.java | 35 -
.../UnimplementedRegOperationException.java | 32 -
.../UnknownRegConnectionDataException.java | 36 -
.../UnspecifiedRegistrySettingsException.java | 30 -
.../DescriptorAlreadyExistsException.java | 34 -
.../DescriptorDoesNotExistsException.java | 34 -
.../gateway/InsufficientDataException.java | 34 -
.../gateway/MalformedDescriptorException.java | 34 -
...PublishedWorkflowAlreadyExistsException.java | 34 -
...PublishedWorkflowDoesNotExistsException.java | 34 -
.../ApplicationJobAlreadyExistsException.java | 34 -
.../ApplicationJobDoesNotExistsException.java | 34 -
.../ExperimentAlreadyExistsException.java | 34 -
.../ExperimentDoesNotExistsException.java | 34 -
.../worker/ExperimentLazyLoadedException.java | 34 -
.../InvalidApplicationJobIDException.java | 34 -
.../UserWorkflowAlreadyExistsException.java | 34 -
.../UserWorkflowDoesNotExistsException.java | 34 -
.../WorkflowInstanceAlreadyExistsException.java | 34 -
.../WorkflowInstanceDoesNotExistsException.java | 34 -
...kflowInstanceNodeAlreadyExistsException.java | 34 -
...kflowInstanceNodeDoesNotExistsException.java | 34 -
.../WorkspaceProjectAlreadyExistsException.java | 34 -
.../WorkspaceProjectDoesNotExistsException.java | 34 -
.../registry/api/impl/ExperimentDataImpl.java | 221 -
.../api/impl/WorkflowExecutionDataImpl.java | 182 -
.../api/orchestrator/OrchestratorData.java | 113 -
.../orchestrator/impl/OrchestratorDataImpl.java | 112 -
.../registry/api/util/RegistryConstants.java | 36 -
.../registry/api/util/RegistrySettings.java | 127 -
.../registry/api/util/RegistryUtils.java | 124 -
.../registry/api/util/WebServiceUtil.java | 202 -
.../registry/api/workflow/ApplicationJob.java | 295 --
.../workflow/ApplicationJobExecutionError.java | 67 -
.../api/workflow/ApplicationJobStatusData.java | 63 -
.../registry/api/workflow/ExecutionError.java | 103 -
.../registry/api/workflow/ExperimentData.java | 123 -
.../api/workflow/ExperimentExecutionError.java | 40 -
.../api/workflow/ExperimentMetadata.java | 49 -
.../registry/api/workflow/ExperimentName.java | 49 -
.../registry/api/workflow/ExperimentUser.java | 48 -
.../registry/api/workflow/InputData.java | 34 -
.../api/workflow/NodeExecutionData.java | 236 -
.../api/workflow/NodeExecutionError.java | 58 -
.../api/workflow/NodeExecutionStatus.java | 78 -
.../registry/api/workflow/OutputData.java | 34 -
.../api/workflow/WorkflowExecution.java | 69 -
.../api/workflow/WorkflowExecutionData.java | 118 -
.../api/workflow/WorkflowExecutionError.java | 49 -
.../api/workflow/WorkflowExecutionStatus.java | 128 -
.../registry/api/workflow/WorkflowIOData.java | 58 -
.../api/workflow/WorkflowInstanceNode.java | 67 -
.../workflow/WorkflowInstanceNodePortData.java | 89 -
.../api/workflow/WorkflowNodeGramData.java | 83 -
.../api/workflow/WorkflowNodeIOData.java | 114 -
.../registry/api/workflow/WorkflowNodeType.java | 84 -
.../api/workflow/WorkflowRunTimeData.java | 90 -
modules/registry/registry-cpi/pom.xml | 5 +
.../registry/cpi/utils/RegistrySettings.java | 127 +
modules/test-suite/pom.xml | 6 -
modules/workflow-model/workflow-engine/pom.xml | 12 -
.../WorkflowInterpreterConfiguration.java | 2 -
modules/ws-messenger/messagebox/pom.xml | 5 -
modules/ws-messenger/messagebroker/pom.xml | 5 -
modules/xbaya-gui/pom.xml | 5 -
.../xbaya/registry/PasswordCallbackImpl.java | 78 +-
pom.xml | 2 +-
samples/java-client/experiment/pom.xml | 22 -
.../gsi/ssh/impl/GSISSHAbstractCluster.java | 17 +-
tools/registry-tool/pom.xml | 5 -
213 files changed, 11137 insertions(+), 15085 deletions(-)
----------------------------------------------------------------------
[5/5] git commit: Make the RegiserSample methods to be instance
instead of static - AIRAVATA-1415
Posted by sm...@apache.org.
Make the RegiserSample methods to be instance instead of static - AIRAVATA-1415
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/36d0b762
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/36d0b762
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/36d0b762
Branch: refs/heads/master
Commit: 36d0b76200123608cd66d593b5887c071e81ea16
Parents: 5901e08
Author: Suresh Marru <sm...@apache.org>
Authored: Mon Aug 25 11:22:04 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Mon Aug 25 11:22:04 2014 -0400
----------------------------------------------------------------------
.../tools/RegisterSampleApplications.java | 34 ++++++++++----------
1 file changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/36d0b762/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 5ee7128..5a277d9 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
@@ -58,7 +58,7 @@ public class RegisterSampleApplications {
public static final int THRIFT_SERVER_PORT = 8930;
private final static Logger logger = LoggerFactory.getLogger(RegisterSampleApplications.class);
private static final String DEFAULT_GATEWAY = "default";
- private static Airavata.Client airavataClient;
+ private Airavata.Client airavataClient;
//Host Id's
private static String stampedeResourceId = "stampede.tacc.xsede.org_92ac5ed6-35a5-4910-82ef-48f128f9245a";
@@ -114,7 +114,7 @@ public class RegisterSampleApplications {
}
public static void main(String[] args) {
try {
- airavataClient = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
+ Airavata.Client airavataClient = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
System.out.println("API version is " + airavataClient.getAPIVersion());
RegisterSampleApplications registerSampleApplications = new RegisterSampleApplications(airavataClient);
@@ -278,7 +278,7 @@ public class RegisterSampleApplications {
}
- public static void registerGromaxWorkflowInterfaces() {
+ public void registerGromaxWorkflowInterfaces() {
try {
System.out.println("#### Registering Echo Interface #### \n");
@@ -419,7 +419,7 @@ public class RegisterSampleApplications {
}
- public static void registerEchoInterface() {
+ public void registerEchoInterface() {
try {
System.out.println("#### Registering Echo Interface #### \n");
@@ -448,7 +448,7 @@ public class RegisterSampleApplications {
}
}
- public static void registerAmberInterface() {
+ public void registerAmberInterface() {
try {
System.out.println("#### Registering Amber Interface #### \n");
@@ -490,7 +490,7 @@ public class RegisterSampleApplications {
}
}
- public static void registerAutoDockInterface() {
+ public void registerAutoDockInterface() {
try {
System.out.println("#### Registering AutoDock Interface #### \n");
@@ -527,7 +527,7 @@ public class RegisterSampleApplications {
}
}
- public static void registerEspressoInterface() {
+ public void registerEspressoInterface() {
try {
System.out.println("#### Registering Espresso Interface #### \n");
@@ -561,7 +561,7 @@ public class RegisterSampleApplications {
}
}
- public static void registerGromacsInterface() {
+ public void registerGromacsInterface() {
try {
System.out.println("#### Registering Gromacs Interface #### \n");
@@ -597,7 +597,7 @@ public class RegisterSampleApplications {
}
}
- public static void registerLammpsInterface() {
+ public void registerLammpsInterface() {
try {
System.out.println("#### Registering LAMMPS Interface #### \n");
@@ -625,7 +625,7 @@ public class RegisterSampleApplications {
}
}
- public static void registerNWChemInterface() {
+ public void registerNWChemInterface() {
try {
System.out.println("#### Registering NWChem Interface #### \n");
@@ -654,7 +654,7 @@ public class RegisterSampleApplications {
}
- public static void registerTrinityInterface() {
+ public void registerTrinityInterface() {
try {
System.out.println("#### Registering Trinity Interface #### \n");
@@ -689,7 +689,7 @@ public class RegisterSampleApplications {
}
- public static void registerWRFInterface() {
+ public void registerWRFInterface() {
try {
System.out.println("#### Registering WRF Interface #### \n");
@@ -730,7 +730,7 @@ public class RegisterSampleApplications {
}
}
- public static void registerStampedeApps() {
+ public void registerStampedeApps() {
try {
System.out.println("#### Registering Application Deployments on Stampede #### \n");
@@ -794,7 +794,7 @@ public class RegisterSampleApplications {
}
}
- public static void registerTrestlesApps() {
+ public void registerTrestlesApps() {
try {
System.out.println("#### Registering Application Deployments on Trestles #### \n");
@@ -830,7 +830,7 @@ public class RegisterSampleApplications {
}
}
- public static void registerBigRedApps() {
+ public void registerBigRedApps() {
try {
System.out.println("#### Registering Application Deployments on BigRed II #### \n");
@@ -873,7 +873,7 @@ public class RegisterSampleApplications {
}
}
- public static String registerComputeHost(String hostName, String hostDesc,
+ public String registerComputeHost(String hostName, String hostDesc,
ResourceJobManagerType resourceJobManagerType,
String monitoringEndPoint, String jobMangerBinPath,
SecurityProtocol securityProtocol, int portNumber, String jobManagerCommand) throws TException {
@@ -945,7 +945,7 @@ public class RegisterSampleApplications {
}
}
- public static void writeIdPropertyFile() {
+ public void writeIdPropertyFile() {
try {
Properties properties = new Properties();
properties.setProperty("stampedeResourceId", stampedeResourceId);
[4/5] git commit: Using register sample instead of document creator -
AIRAVATA-1415
Posted by sm...@apache.org.
Using register sample instead of document creator - AIRAVATA-1415
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5901e082
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5901e082
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5901e082
Branch: refs/heads/master
Commit: 5901e082633354b34be51374709b8110785c32e1
Parents: 84cabd3
Author: Suresh Marru <sm...@apache.org>
Authored: Mon Aug 25 10:58:17 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Mon Aug 25 10:58:17 2014 -0400
----------------------------------------------------------------------
.../java-client-samples/pom.xml | 26 -----
.../client/samples/CancelExperiments.java | 2 -
.../client/samples/CreateLaunchExperiment.java | 115 +++++++++++--------
.../samples/CreateLaunchExperimentUS3.java | 2 -
.../samples/TestCreateLaunchExperiment.java | 2 -
.../tools/RegisterSampleApplications.java | 36 +++---
.../integration/AbstractIntegrationTest.java | 11 +-
.../airavata/integration/DataRetrievalIT.java | 2 +-
.../airavata/integration/ForEachCaseIT.java | 8 +-
.../SingleAppIntegrationTestBase.java | 2 +-
10 files changed, 94 insertions(+), 112 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/5901e082/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/pom.xml b/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
index a475b29..5f12ace 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
+++ b/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
@@ -26,7 +26,6 @@
<url>http://airavata.apache.org/</url>
<dependencies>
-
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-data-models</artifactId>
@@ -39,21 +38,6 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-common-utils</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-gfac-schema-utils</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-jpa-registry</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
<artifactId>airavata-api-stubs</artifactId>
<version>${project.version}</version>
</dependency>
@@ -68,20 +52,10 @@
<version>${org.slf4j.version}</version>
</dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${mysql.connector.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-client-configuration</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-client-api</artifactId>
- <version>${project.version}</version>
- </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/airavata/blob/5901e082/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CancelExperiments.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CancelExperiments.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CancelExperiments.java
index d3b7e46..29eec9e 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CancelExperiments.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CancelExperiments.java
@@ -24,7 +24,6 @@ package org.apache.airavata.client.samples;
import org.apache.airavata.model.error.*;
import org.apache.airavata.api.Airavata;
import org.apache.airavata.api.client.AiravataClientFactory;
-import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,7 +44,6 @@ public class CancelExperiments {
public static void main(String[] args) {
try {
- AiravataUtils.setExecutionAsClient();
client = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
String expeId = "echoExperiment_31c132fd-87ea-4781-803c-ae5f04a79baf";
http://git-wip-us.apache.org/repos/asf/airavata/blob/5901e082/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
----------------------------------------------------------------------
diff --git 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
index 7c03ce0..ec29dc1 100644
--- 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
@@ -23,10 +23,7 @@ package org.apache.airavata.client.samples;
import org.apache.airavata.api.Airavata;
import org.apache.airavata.api.client.AiravataClientFactory;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-import org.apache.airavata.client.tools.DocumentCreatorNew;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.airavata.common.utils.AiravataUtils;
+import org.apache.airavata.client.tools.RegisterSampleApplications;
import org.apache.airavata.model.error.*;
import org.apache.airavata.model.util.ExperimentModelUtil;
import org.apache.airavata.model.util.ProjectModelUtil;
@@ -47,7 +44,7 @@ public class CreateLaunchExperiment {
private final static Logger logger = LoggerFactory.getLogger(CreateLaunchExperiment.class);
private static final String DEFAULT_USER = "default.registry.user";
private static final String DEFAULT_GATEWAY = "default.registry.gateway";
- private static Airavata.Client client;
+ private static Airavata.Client airavataClient;
private static String localHostAppId = "localhost_3b5962d3-5e7e-4a97-9d1f-25c5ec436ba5,SimpleEcho0_44c34394-ca27-4fa9-bb2d-87f95a02352a";
private static String sshHostAppId;
private static String pbsEchoAppId = "trestles.sdsc.edu_b67c9b6a-3940-4ba1-ac67-4f5c42e60fb8,SimpleEcho2_4c9e76f3-eab0-4ccb-8630-b53f22646ebd";
@@ -64,27 +61,26 @@ public class CreateLaunchExperiment {
public static void main(String[] args) {
try {
- AiravataUtils.setExecutionAsClient();
- client = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
- System.out.println("API version is " + client.getAPIVersion());
+ airavataClient = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
+ System.out.println("API version is " + airavataClient.getAPIVersion());
// getExperiment(client, "WRFExperiment_2a2de26c-7f74-47c9-8e14-40e50dedfe0f");
-// addDescriptors();
+// registerApplications();
//// final String expId = createExperimentForSSHHost(airavata);
-// final String expId = createExperimentForTrestles(client);
-//// final String expId = createExperimentForStampede(client);
-// final String expId = createExperimentForLocalHost(client);
+// final String expId = createExperimentForTrestles(airavataClient);
+//// final String expId = createExperimentForStampede(airavataClient);
+// final String expId = createExperimentForLocalHost(airavataClient);
// final String expId = createExperimentForLonestar(airavata);
- final String expId = createExperimentWRFTrestles(client);
-// final String expId = createExperimentForBR2(client);
-// final String expId = createExperimentForBR2Amber(client);
-// final String expId = createExperimentWRFStampede(client);
-// final String expId = createExperimentForStampedeAmber(client);
-// final String expId = createExperimentForTrestlesAmber(client);
+ final String expId = createExperimentWRFTrestles(airavataClient);
+// final String expId = createExperimentForBR2(airavataClient);
+// final String expId = createExperimentForBR2Amber(airavataClient);
+// final String expId = createExperimentWRFStampede(airavataClient);
+// final String expId = createExperimentForStampedeAmber(airavataClient);
+// final String expId = createExperimentForTrestlesAmber(airavataClient);
System.out.println("Experiment ID : " + expId);
// updateExperiment(airavata, expId);
- launchExperiment(client, expId);
+ launchExperiment(airavataClient, expId);
// System.out.println("retrieved exp id : " + experiment.getExperimentID());
} catch (Exception e) {
@@ -93,39 +89,58 @@ public class CreateLaunchExperiment {
}
}
- public static void addDescriptors() throws AiravataAPIInvocationException, ApplicationSettingsException {
- try {
- DocumentCreatorNew documentCreator = new DocumentCreatorNew(client);
-// DocumentCreator documentCreator = new DocumentCreator(getAiravataAPI());
- localHostAppId = documentCreator.createLocalHostDocs();
- sshHostAppId = documentCreator.createSSHHostDocs();
-// documentCreator.createGramDocs();
- pbsEchoAppId =documentCreator.createPBSDocsForOGCE_Echo();
- pbsWRFAppId =documentCreator.createPBSDocsForOGCE_WRF();
- slurmAppId = documentCreator.createSlurmDocs();
- sgeAppId = documentCreator.createSGEDocs();
-// documentCreator.createEchoHostDocs();
- br2EchoAppId = documentCreator.createBigRedDocs();
- slurmWRFAppId = documentCreator.createSlumWRFDocs();
- br2AmberAppId = documentCreator.createBigRedAmberDocs();
- slurmAmberAppId = documentCreator.createStampedeAmberDocs();
- trestlesAmberAppId = documentCreator.createTrestlesAmberDocs();
- System.out.printf(localHostAppId);
- System.out.println(sshHostAppId);
- System.out.println(pbsEchoAppId);
- System.out.println(pbsWRFAppId);
- System.out.println(slurmAppId);
- System.out.println(sgeAppId);
- System.out.println(br2EchoAppId);
- System.out.println(slurmWRFAppId);
- System.out.println(br2AmberAppId);
- System.out.println(trestlesAmberAppId);
- } catch (Exception e) {
- logger.error("Unable to create documents", e.getMessage());
- throw new ApplicationSettingsException(e.getMessage());
- }
+ public static void registerApplications() {
+ RegisterSampleApplications registerSampleApplications = new RegisterSampleApplications(airavataClient);
+
+ //Register all compute hosts
+ registerSampleApplications.registerXSEDEHosts();
+
+ //Register Gateway Resource Preferences
+ registerSampleApplications.registerGatewayResourceProfile();
+
+ //Register all application modules
+ registerSampleApplications.registerAppModules();
+
+ //Register all application deployments
+ registerSampleApplications.registerAppDeployments();
+
+ //Register all application interfaces
+ registerSampleApplications.registerAppInterfaces();
}
+// public static void addDescriptors() throws AiravataAPIInvocationException, ApplicationSettingsException {
+// try {
+// DocumentCreatorNew documentCreator = new DocumentCreatorNew(client);
+//// DocumentCreator documentCreator = new DocumentCreator(getAiravataAPI());
+// localHostAppId = documentCreator.createLocalHostDocs();
+// sshHostAppId = documentCreator.createSSHHostDocs();
+//// documentCreator.createGramDocs();
+// pbsEchoAppId =documentCreator.createPBSDocsForOGCE_Echo();
+// pbsWRFAppId =documentCreator.createPBSDocsForOGCE_WRF();
+// slurmAppId = documentCreator.createSlurmDocs();
+// sgeAppId = documentCreator.createSGEDocs();
+//// documentCreator.createEchoHostDocs();
+// br2EchoAppId = documentCreator.createBigRedDocs();
+// slurmWRFAppId = documentCreator.createSlumWRFDocs();
+// br2AmberAppId = documentCreator.createBigRedAmberDocs();
+// slurmAmberAppId = documentCreator.createStampedeAmberDocs();
+// trestlesAmberAppId = documentCreator.createTrestlesAmberDocs();
+// System.out.printf(localHostAppId);
+// System.out.println(sshHostAppId);
+// System.out.println(pbsEchoAppId);
+// System.out.println(pbsWRFAppId);
+// System.out.println(slurmAppId);
+// System.out.println(sgeAppId);
+// System.out.println(br2EchoAppId);
+// System.out.println(slurmWRFAppId);
+// System.out.println(br2AmberAppId);
+// System.out.println(trestlesAmberAppId);
+// } catch (Exception e) {
+// logger.error("Unable to create documents", e.getMessage());
+// throw new ApplicationSettingsException(e.getMessage());
+// }
+// }
+
public static String createExperimentForTrestles(Airavata.Client client) throws TException {
try {
List<DataObjectType> exInputs = new ArrayList<DataObjectType>();
http://git-wip-us.apache.org/repos/asf/airavata/blob/5901e082/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 43d21f5..be232c2 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
@@ -21,7 +21,6 @@ package org.apache.airavata.client.samples;
import org.apache.airavata.api.Airavata;
import org.apache.airavata.api.client.AiravataClientFactory;
-import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.model.error.AiravataClientException;
import org.apache.airavata.model.error.AiravataSystemException;
import org.apache.airavata.model.error.ExperimentNotFoundException;
@@ -49,7 +48,6 @@ public class CreateLaunchExperimentUS3 {
private static final String DEFAULT_GATEWAY = "default.registry.gateway";
public static void main(String[] args) {
try {
- AiravataUtils.setExecutionAsClient();
final Airavata.Client airavata = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
System.out.println("API version is " + airavata.getAPIVersion());
// addDescriptors();
http://git-wip-us.apache.org/repos/asf/airavata/blob/5901e082/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java
index 63c473c..84c053d 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java
@@ -23,7 +23,6 @@ package org.apache.airavata.client.samples;
import org.apache.airavata.api.Airavata;
import org.apache.airavata.api.client.AiravataClientFactory;
-import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule;
import org.apache.airavata.model.error.AiravataClientException;
import org.apache.airavata.model.error.AiravataSystemException;
@@ -48,7 +47,6 @@ public class TestCreateLaunchExperiment {
public static void main(String[] args) {
try {
- AiravataUtils.setExecutionAsClient();
final Airavata.Client airavata = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
System.out.println("API version is " + airavata.getAPIVersion());
Calendar cal1 = Calendar.getInstance();
http://git-wip-us.apache.org/repos/asf/airavata/blob/5901e082/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 b3b0024..5ee7128 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
@@ -109,28 +109,33 @@ public class RegisterSampleApplications {
private static String trinityInterfaceId = "";
private static String wrfInterfaceId;
+ public RegisterSampleApplications(Airavata.Client airavataClient) {
+ this.airavataClient = airavataClient;
+ }
public static void main(String[] args) {
try {
airavataClient = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
System.out.println("API version is " + airavataClient.getAPIVersion());
+ RegisterSampleApplications registerSampleApplications = new RegisterSampleApplications(airavataClient);
+
//Register all compute hosts
- registerXSEDEHosts();
+ registerSampleApplications.registerXSEDEHosts();
//Register Gateway Resource Preferences
-// registerGatewayResourceProfile();
+ registerSampleApplications.registerGatewayResourceProfile();
//Register all application modules
- registerAppModules();
+ registerSampleApplications.registerAppModules();
//Register all application deployments
-// registerAppDeployments();
+ registerSampleApplications.registerAppDeployments();
//Register all application interfaces
- registerAppInterfaces();
+ registerSampleApplications.registerAppInterfaces();
//write output into propertiesFile
-// writeIdPropertyFile();
+ registerSampleApplications.writeIdPropertyFile();
} catch (Exception e) {
logger.error("Error while connecting with server", e.getMessage());
@@ -138,7 +143,7 @@ public class RegisterSampleApplications {
}
}
- public static void registerXSEDEHosts() {
+ public void registerXSEDEHosts() {
try {
System.out.println("\n #### Registering XSEDE Computational Resources #### \n");
@@ -163,7 +168,7 @@ public class RegisterSampleApplications {
}
- public static void registerAppModules() {
+ public void registerAppModules() {
try {
System.out.println("\n #### Registering Application Modules #### \n");
@@ -227,7 +232,7 @@ public class RegisterSampleApplications {
}
- public static void registerAppDeployments() {
+ public void registerAppDeployments() {
System.out.println("\n #### Registering Application Deployments #### \n");
//Registering Stampede Apps
@@ -240,18 +245,18 @@ public class RegisterSampleApplications {
registerBigRedApps();
}
- public static void registerAppInterfaces() {
+ public void registerAppInterfaces() {
System.out.println("\n #### Registering Application Interfaces #### \n");
registerGromaxWorkflowInterfaces();
//Registering Echo
-// registerEchoInterface();
+ registerEchoInterface();
//Registering Amber
-// registerAmberInterface();
+ registerAmberInterface();
//Registering AutoDock
-// registerAutoDockInterface();
+ registerAutoDockInterface();
//Registering Espresso
registerEspressoInterface();
@@ -269,7 +274,7 @@ public class RegisterSampleApplications {
registerTrinityInterface();
//Registering WRF
-// registerWRFInterface();
+ registerWRFInterface();
}
@@ -364,7 +369,6 @@ public class RegisterSampleApplications {
applicationOutputs = new ArrayList<OutputDataObjectType>();
applicationOutputs.add(RegisterSampleApplicationsUtils.createAppOutput("struct_topoogy",
"", DataType.URI));
-
echoInterfaceId = airavataClient.registerApplicationInterface(
RegisterSampleApplicationsUtils.createApplicationInterfaceDescription("grompp", "grompp",
@@ -908,7 +912,7 @@ public class RegisterSampleApplications {
return computeResourceId;
}
- public static void registerGatewayResourceProfile() {
+ public void registerGatewayResourceProfile() {
try {
System.out.println("#### Registering Application Deployments on BigRed II #### \n");
http://git-wip-us.apache.org/repos/asf/airavata/blob/5901e082/modules/integration-tests/src/test/java/org/apache/airavata/integration/AbstractIntegrationTest.java
----------------------------------------------------------------------
diff --git a/modules/integration-tests/src/test/java/org/apache/airavata/integration/AbstractIntegrationTest.java b/modules/integration-tests/src/test/java/org/apache/airavata/integration/AbstractIntegrationTest.java
index 7a90789..d9fc74b 100644
--- a/modules/integration-tests/src/test/java/org/apache/airavata/integration/AbstractIntegrationTest.java
+++ b/modules/integration-tests/src/test/java/org/apache/airavata/integration/AbstractIntegrationTest.java
@@ -25,7 +25,6 @@ import java.io.IOException;
import org.apache.airavata.api.Airavata;
import org.apache.airavata.api.client.AiravataClientFactory;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
import org.apache.airavata.common.utils.ClientSettings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,7 +33,7 @@ public class AbstractIntegrationTest {
private static String THRIFT_SERVER_HOST;
private static int THRIFT_SERVER_PORT;
- protected Airavata.Client client;
+ protected Airavata.Client airavataClient;
private final int TRIES = 20;
private final int TIME_OUT = 10000;
final static Logger log = LoggerFactory.getLogger(AbstractIntegrationTest.class);
@@ -55,8 +54,6 @@ public class AbstractIntegrationTest {
//getting the Airavata API ( to add the descriptors
} catch (IOException e) {
log.error("Error loading client-properties ..." + e.getMessage());
- } catch (AiravataAPIInvocationException e) {
- log.error("Error initializing the Airavata API ... " + e.getMessage());
} catch (Exception e) {
log.error(e.getMessage());
}
@@ -64,10 +61,10 @@ public class AbstractIntegrationTest {
protected void initClient() throws Exception {
int tries = 0;
- while (client==null) {
+ while (airavataClient==null) {
log.info("Waiting till server initializes ........[try "+ (++tries) + " of "+TRIES+"]");
try {
- client = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
+ airavataClient = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
} catch (Exception e) {
if (tries == TRIES) {
log("Server not responding. Cannot continue with integration tests ...");
@@ -80,7 +77,7 @@ public class AbstractIntegrationTest {
}
protected Airavata.Client getClient() {
- return client;
+ return airavataClient;
}
public void log(String message) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/5901e082/modules/integration-tests/src/test/java/org/apache/airavata/integration/DataRetrievalIT.java
----------------------------------------------------------------------
diff --git a/modules/integration-tests/src/test/java/org/apache/airavata/integration/DataRetrievalIT.java b/modules/integration-tests/src/test/java/org/apache/airavata/integration/DataRetrievalIT.java
index 777aee1..ec7707a 100644
--- a/modules/integration-tests/src/test/java/org/apache/airavata/integration/DataRetrievalIT.java
+++ b/modules/integration-tests/src/test/java/org/apache/airavata/integration/DataRetrievalIT.java
@@ -215,7 +215,7 @@ public class DataRetrievalIT extends AbstractIntegrationTest {
}
private void addApplications() throws AppCatalogException, TException {
- DocumentCreatorNew documentCreator = new DocumentCreatorNew(client);
+ DocumentCreatorNew documentCreator = new DocumentCreatorNew(airavataClient);
documentCreator.createLocalHostDocs();
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5901e082/modules/integration-tests/src/test/java/org/apache/airavata/integration/ForEachCaseIT.java
----------------------------------------------------------------------
diff --git a/modules/integration-tests/src/test/java/org/apache/airavata/integration/ForEachCaseIT.java b/modules/integration-tests/src/test/java/org/apache/airavata/integration/ForEachCaseIT.java
index 6a76dbb..4f5b871 100644
--- a/modules/integration-tests/src/test/java/org/apache/airavata/integration/ForEachCaseIT.java
+++ b/modules/integration-tests/src/test/java/org/apache/airavata/integration/ForEachCaseIT.java
@@ -21,8 +21,6 @@
package org.apache.airavata.integration;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-import org.apache.airavata.client.api.exception.DescriptorAlreadyExistsException;
import org.testng.annotations.BeforeTest;
import java.io.IOException;
@@ -52,8 +50,8 @@ public class ForEachCaseIT extends WorkflowIntegrationTestBase {
// executeExperiment("src/test/resources/ForEachEchoWorkflow.xwf", Arrays.asList("10,20", "30,40"), Arrays.asList("10,30", "20,40"));
// }
- private void setupDescriptors() throws AiravataAPIInvocationException,
- DescriptorAlreadyExistsException, IOException {
+// private void setupDescriptors() throws AiravataAPIInvocationException,
+// DescriptorAlreadyExistsException, IOException {
// DescriptorBuilder descriptorBuilder = airavataAPI.getDescriptorBuilder();
// HostDescription hostDescription = descriptorBuilder.buildHostDescription(HostDescriptionType.type, "localhost2",
// "127.0.0.1");
@@ -109,5 +107,5 @@ public class ForEachCaseIT extends WorkflowIntegrationTestBase {
// Assert.assertTrue(airavataAPI.getApplicationManager().isApplicationDescriptorExists(
// serviceDescription2.getType().getName(), hostDescription.getType().getHostName(),
// applicationDeploymentDescription2.getType().getApplicationName().getStringValue()));
- }
+// }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5901e082/modules/integration-tests/src/test/java/org/apache/airavata/integration/SingleAppIntegrationTestBase.java
----------------------------------------------------------------------
diff --git a/modules/integration-tests/src/test/java/org/apache/airavata/integration/SingleAppIntegrationTestBase.java b/modules/integration-tests/src/test/java/org/apache/airavata/integration/SingleAppIntegrationTestBase.java
index 84bd528..bd2593a 100644
--- a/modules/integration-tests/src/test/java/org/apache/airavata/integration/SingleAppIntegrationTestBase.java
+++ b/modules/integration-tests/src/test/java/org/apache/airavata/integration/SingleAppIntegrationTestBase.java
@@ -52,7 +52,7 @@ public class SingleAppIntegrationTestBase extends AbstractIntegrationTest {
ExperimentStatus experimentStatus = null;
do {
try {
- experimentStatus = client.getExperimentStatus(expId);
+ experimentStatus = airavataClient.getExperimentStatus(expId);
if (previousUpdateTime!=experimentStatus.getTimeOfStateChange()) {
previousUpdateTime=experimentStatus.getTimeOfStateChange();
log.info(expId