You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2014/11/11 20:10:53 UTC
[06/16] airavata git commit: Fixed Xbaya GUI. AIRAVATA-1510
Fixed Xbaya GUI. AIRAVATA-1510
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/91721d47
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/91721d47
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/91721d47
Branch: refs/heads/gfac_appcatalog_int
Commit: 91721d47ddea6578f9535b24d7c0027d88252697
Parents: b1226d5
Author: raminder <ra...@indiana.edu>
Authored: Fri Nov 7 13:54:44 2014 -0500
Committer: raminder <ra...@indiana.edu>
Committed: Fri Nov 7 13:54:44 2014 -0500
----------------------------------------------------------------------
.../org/apache/airavata/xbaya/ThriftServiceType.java | 3 +--
.../xbaya/ui/dialogs/registry/RegistryWindow.java | 13 ++-----------
.../ui/dialogs/workflow/WorkflowImportWindow.java | 4 ++--
.../ui/experiment/RegistryWorkflowPublisherWindow.java | 4 +---
.../ui/experiment/WorkflowInterpreterLaunchWindow.java | 7 +++----
5 files changed, 9 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/91721d47/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ThriftServiceType.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ThriftServiceType.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ThriftServiceType.java
index 00875a5..61cdd27 100644
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ThriftServiceType.java
+++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ThriftServiceType.java
@@ -22,6 +22,5 @@
package org.apache.airavata.xbaya;
public enum ThriftServiceType {
- API_SERVICE,
- WORKFLOW_SERVICE
+ API_SERVICE
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/91721d47/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/RegistryWindow.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/RegistryWindow.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/RegistryWindow.java
index 78cfbb5..9275fe5 100644
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/RegistryWindow.java
+++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/RegistryWindow.java
@@ -124,12 +124,9 @@ public class RegistryWindow {
this.usernameTextField = new XBayaTextField();
this.serverTextField.setText("localhost");
this.portTextField.setText("8930");
- if (serviceType == ThriftServiceType.WORKFLOW_SERVICE){
- this.portTextField.setText("8931");
- }
this.gatewayNameTextField.setText("airavata");
this.usernameTextField.setText("airavata");
- ThriftClientData thriftClientData = engine.getConfiguration().getThriftClientData(ThriftServiceType.WORKFLOW_SERVICE);
+ ThriftClientData thriftClientData = engine.getConfiguration().getThriftClientData(ThriftServiceType.API_SERVICE);
if (thriftClientData!=null){
this.serverTextField.setText(thriftClientData.getServerAddress());
this.gatewayNameTextField.setText(thriftClientData.getGatewayId());
@@ -198,13 +195,7 @@ public class RegistryWindow {
}
private void validateData() throws NumberFormatException, AiravataClientConnectException{
- switch(getServiceType()){
- case API_SERVICE:
- AiravataClientFactory.createAiravataClient(getServerName(), Integer.parseInt(getServerPort())); break;
- case WORKFLOW_SERVICE:
- AiravataClientFactory.createAiravataClient(getServerName(), Integer.parseInt(getServerPort())); break;
- }
-
+ AiravataClientFactory.createAiravataClient(getServerName(), Integer.parseInt(getServerPort()));
}
public String getUserName() {
http://git-wip-us.apache.org/repos/asf/airavata/blob/91721d47/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/workflow/WorkflowImportWindow.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/workflow/WorkflowImportWindow.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/workflow/WorkflowImportWindow.java
index 1fdd878..529d057 100644
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/workflow/WorkflowImportWindow.java
+++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/workflow/WorkflowImportWindow.java
@@ -77,8 +77,8 @@ public class WorkflowImportWindow {
*/
public WorkflowImportWindow(XBayaEngine engine) throws Exception {
this.engine = engine;
- if (engine.getGUI().setupThriftClientData(ThriftServiceType.WORKFLOW_SERVICE)) {
- ThriftClientData thriftClientData = engine.getConfiguration().getThriftClientData(ThriftServiceType.WORKFLOW_SERVICE);
+ if (engine.getGUI().setupThriftClientData(ThriftServiceType.API_SERVICE)) {
+ ThriftClientData thriftClientData = engine.getConfiguration().getThriftClientData(ThriftServiceType.API_SERVICE);
setClient(AiravataClientFactory.createAiravataClient(thriftClientData.getServerAddress(), thriftClientData.getServerPort()));
initGUI();
} else {
http://git-wip-us.apache.org/repos/asf/airavata/blob/91721d47/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryWorkflowPublisherWindow.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryWorkflowPublisherWindow.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryWorkflowPublisherWindow.java
index 7bade97..3ea33cd 100644
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryWorkflowPublisherWindow.java
+++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryWorkflowPublisherWindow.java
@@ -89,8 +89,7 @@ public class RegistryWorkflowPublisherWindow {
workflow.setName(name);
String workflowTemplateName = workflow.getName();
try {
- if (engine.getGUI().setupThriftClientData(ThriftServiceType.WORKFLOW_SERVICE)){
- ThriftClientData thriftClientData = engine.getConfiguration().getThriftClientData(ThriftServiceType.WORKFLOW_SERVICE);
+ ThriftClientData thriftClientData = engine.getConfiguration().getThriftClientData(ThriftServiceType.API_SERVICE);
Client client = AiravataClientFactory.createAiravataClient(thriftClientData.getServerAddress(), thriftClientData.getServerPort());
if (client.isWorkflowExistWithName(workflowTemplateName)){
int result = JOptionPane.showConfirmDialog(this.dialog.getDialog(), "A workflow with the name "+workflowTemplateName+" already exists. Do you want to update it?", "Register Workflow", JOptionPane.YES_NO_CANCEL_OPTION);
@@ -99,7 +98,6 @@ public class RegistryWorkflowPublisherWindow {
} else if (result==JOptionPane.CANCEL_OPTION){
hide();
}
- }
String workflowAsString = XMLUtil.xmlElementToString(engine.getGUI().getGraphCanvas().getWorkflow().toXML());
org.apache.airavata.model.Workflow workflowData = new org.apache.airavata.model.Workflow();
workflowData.setName(workflowTemplateName);
http://git-wip-us.apache.org/repos/asf/airavata/blob/91721d47/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 76a745a..862f1a9 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
@@ -252,7 +252,7 @@ public class WorkflowInterpreterLaunchWindow {
private void execute() throws AiravataClientConnectException, InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
- if (!(engine.getGUI().setupThriftClientData(ThriftServiceType.API_SERVICE) && engine.getGUI().setupThriftClientData(ThriftServiceType.WORKFLOW_SERVICE))){
+ if (engine.getGUI().setupThriftClientData(ThriftServiceType.API_SERVICE)){
hide();
return;
}
@@ -260,14 +260,13 @@ public class WorkflowInterpreterLaunchWindow {
ThriftClientData thriftClientData = engine.getConfiguration().getThriftClientData(ThriftServiceType.API_SERVICE);
Client airavataClient = XBayaUtil.getAiravataClient(thriftClientData);
- Client workflowClient = XBayaUtil.getAiravataClient(engine.getConfiguration().getThriftClientData(ThriftServiceType.WORKFLOW_SERVICE));
-
+
Workflow workflowClone = workflow.clone();
workflowClone.setName(workflowClone.getName()+UUID.randomUUID().toString());
org.apache.airavata.model.Workflow w = new org.apache.airavata.model.Workflow();
w.setName(workflowClone.getName());
w.setGraph(XMLUtil.xmlElementToString(workflowClone.toXML()));
- w.setTemplateId(workflowClient.registerWorkflow(w));
+ w.setTemplateId(airavataClient.registerWorkflow(w));
String instanceName = this.instanceNameTextField.getText();
if (instanceName.trim().equals("")){
JOptionPane.showMessageDialog(engine.getGUI().getFrame(),