You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2015/04/16 23:07:58 UTC
[1/4] airavata git commit: Removed all non support operations from
the XBaya UI
Repository: airavata
Updated Branches:
refs/heads/master 395c7901c -> bd275a9a1
Removed all non support operations from the XBaya UI
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e01f24f7
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e01f24f7
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e01f24f7
Branch: refs/heads/master
Commit: e01f24f7eba3b802df2ce878f49247364daea79a
Parents: 2710f99
Author: shamrath <sh...@gmail.com>
Authored: Wed Apr 15 17:45:25 2015 -0400
Committer: shamrath <sh...@gmail.com>
Committed: Wed Apr 15 17:45:25 2015 -0400
----------------------------------------------------------------------
.../airavata/xbaya/ui/menues/RunMenuItem.java | 45 +++++++-------------
.../airavata/xbaya/ui/menues/XBayaMenu.java | 18 ++++----
2 files changed, 25 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/e01f24f7/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 d2fd4ca..db5628a 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
@@ -53,36 +53,23 @@ import org.slf4j.LoggerFactory;
public class RunMenuItem implements EventListener, XBayaExecutionModeListener{
private XBayaEngine engine;
-
private JMenu runMenu;
-
// private JMenuItem launchDynamicWorkflowItem;
-
private JMenuItem launchXBayaInterpreterItem;
-
private JMenuItem configMonitorItem;
-
private JMenuItem resumeMonitoringItem;
-
private JMenuItem pauseMonitoringItem;
-
private JMenuItem resetMonitoringItem;
private static final Logger logger = LoggerFactory.getLogger(RunMenuItem.class);
-
private static final String EXECUTE_ACTIONS = "run_actions";
private static final String EXECUTE_MONITOR_ACTIONS = "monitor_actions";
private XBayaToolBar toolBar;
-
private ToolbarButton toolbarButtonRunWorkflow;
-
private ToolbarButton toolbarButtonPauseMonitor;
-
private ToolbarButton toolbarButtonResumeMonitor;
-
private JMenuItem stopWorkflowItem;
-
private ToolbarButton toolbarButtonStopWorkflow;
/**
@@ -115,11 +102,11 @@ public class RunMenuItem implements EventListener, XBayaExecutionModeListener{
private void createWorkflowMenu() {
// this.launchDynamicWorkflowItem = createLaunchDynamicWorkflowItem();
createLaunchXBayaInterpreterItem();
- this.configMonitorItem = createConfigMonitoring();
- this.resumeMonitoringItem = createResumeMonitoring();
- this.pauseMonitoringItem = createPauseMonitoring();
- this.resetMonitoringItem = createResetMonitoring();
- stopWorkflowItem = createStopWorkflow();
+// this.configMonitorItem = createConfigMonitoring();
+// this.resumeMonitoringItem = createResumeMonitoring();
+// this.pauseMonitoringItem = createPauseMonitoring();
+// this.resetMonitoringItem = createResetMonitoring();
+// stopWorkflowItem = createStopWorkflow();
runMenu = new JMenu("Run");
runMenu.setMnemonic(KeyEvent.VK_R);
@@ -128,14 +115,14 @@ public class RunMenuItem implements EventListener, XBayaExecutionModeListener{
// runMenu.add(launchDynamicWorkflowItem);
runMenu.addSeparator();
- runMenu.add(stopWorkflowItem);
+// runMenu.add(stopWorkflowItem);
runMenu.addSeparator();
- runMenu.add(this.resumeMonitoringItem);
- runMenu.add(this.pauseMonitoringItem);
- runMenu.add(this.resetMonitoringItem);
- runMenu.add(this.configMonitorItem);
+// runMenu.add(this.resumeMonitoringItem);
+// runMenu.add(this.pauseMonitoringItem);
+// runMenu.add(this.resetMonitoringItem);
+// runMenu.add(this.configMonitorItem);
runMenu.addMenuListener(new MenuListener(){
@Override
@@ -144,12 +131,12 @@ public class RunMenuItem implements EventListener, XBayaExecutionModeListener{
public void menuDeselected(MenuEvent e) {}
@Override
public void menuSelected(MenuEvent e) {
- stopWorkflowItem.setEnabled(isWorkflowRunning());
+// stopWorkflowItem.setEnabled(isWorkflowRunning());
}
});
setupMonitors();
- startStopButtonStateUpdater();
+// startStopButtonStateUpdater();
executionModeChanged(engine.getConfiguration());
}
@@ -296,7 +283,7 @@ public class RunMenuItem implements EventListener, XBayaExecutionModeListener{
*/
public void eventReceived(Event event) {
Event.Type type = event.getType();
- if (type.equals(Event.Type.MONITOR_CONFIGURATION_CHANGED)) {
+/* if (type.equals(Event.Type.MONITOR_CONFIGURATION_CHANGED)) {
// MonitorConfiguration configuration = this.engine.getMonitor().getConfiguration();
// boolean valid = configuration.isValid();
boolean valid = true;
@@ -313,7 +300,7 @@ public class RunMenuItem implements EventListener, XBayaExecutionModeListener{
resetMonitoringItem.setVisible(false);
}
toolbarButtonPauseMonitor.setEnabled(pauseMonitoringItem.isVisible());
- toolbarButtonResumeMonitor.setEnabled(resumeMonitoringItem.isVisible());
+ toolbarButtonResumeMonitor.setEnabled(resumeMonitoringItem.isVisible());*/
}
public XBayaToolBar getToolBar() {
@@ -334,8 +321,8 @@ public class RunMenuItem implements EventListener, XBayaExecutionModeListener{
@Override
public void executionModeChanged(XBayaConfiguration config) {
- toolbarButtonRunWorkflow.setVisible(config.getXbayaExecutionMode()==XBayaExecutionMode.IDE);
- toolbarButtonStopWorkflow.setVisible(config.getXbayaExecutionMode()==XBayaExecutionMode.IDE);
+// toolbarButtonRunWorkflow.setVisible(config.getXbayaExecutionMode()==XBayaExecutionMode.IDE);
+// toolbarButtonStopWorkflow.setVisible(config.getXbayaExecutionMode()==XBayaExecutionMode.IDE);
}
private void startStopButtonStateUpdater() {
http://git-wip-us.apache.org/repos/asf/airavata/blob/e01f24f7/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenu.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenu.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenu.java
index 3eb385a..89f7b58 100644
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenu.java
+++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenu.java
@@ -46,15 +46,15 @@ public class XBayaMenu implements XBayaComponent,XBayaExecutionModeListener{
private EditMenuItem editMenuItem;
- private ViewMenuItem viewMenuItem;
+// private ViewMenuItem viewMenuItem;
private RunMenuItem runMenuItem;
private RegistryMenuItem registryMenuItem;
- private AmazonEC2MenuItem amazonEC2MenuItem;
+// private AmazonEC2MenuItem amazonEC2MenuItem;
- private ApplicationMenuItem applicationMenuItem;
+// private ApplicationMenuItem applicationMenuItem;
// private ToolsMenuItem toolsMenuItem;
@@ -77,12 +77,12 @@ public class XBayaMenu implements XBayaComponent,XBayaExecutionModeListener{
private void initMenu() {
xBayaMenuItem = new XBayaMenuItem(getEngine(),getToolBar());
editMenuItem = new EditMenuItem(getEngine());
- amazonEC2MenuItem = new AmazonEC2MenuItem(getEngine());
- viewMenuItem = new ViewMenuItem(getEngine());
+// amazonEC2MenuItem = new AmazonEC2MenuItem(getEngine());
+// viewMenuItem = new ViewMenuItem(getEngine());
runMenuItem = new RunMenuItem(getEngine(), getToolBar());
registryMenuItem = new RegistryMenuItem(getEngine(),getToolBar());
// toolsMenuItem = new ToolsMenuItem(getEngine());
- applicationMenuItem = new ApplicationMenuItem(getEngine());
+// applicationMenuItem = new ApplicationMenuItem(getEngine());
createMenuBar();
executionModeChanged(getEngine().getConfiguration());
}
@@ -103,12 +103,12 @@ public class XBayaMenu implements XBayaComponent,XBayaExecutionModeListener{
this.menuBar = new JMenuBar();
menuBar.add(xBayaMenuItem.getMenu());
menuBar.add(editMenuItem.getMenu());
- menuBar.add(viewMenuItem.getMenu());
+// menuBar.add(viewMenuItem.getMenu());
menuBar.add(runMenuItem.getMenu());
// menuBar.add(toolsMenuItem.getMenu());
menuBar.add(registryMenuItem.getMenu());
- menuBar.add(amazonEC2MenuItem.getMenu());
- menuBar.add(applicationMenuItem.getMenu());
+// menuBar.add(amazonEC2MenuItem.getMenu());
+// menuBar.add(applicationMenuItem.getMenu());
// Space before Help
this.menuBar.add(Box.createHorizontalGlue());
[3/4] airavata git commit: Fixed typo in log message.
Posted by sh...@apache.org.
Fixed typo in log message.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/06e4f1d2
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/06e4f1d2
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/06e4f1d2
Branch: refs/heads/master
Commit: 06e4f1d249af5fc486cfaeb76d32e98c370cf755
Parents: 49e5201
Author: shamrath <sh...@gmail.com>
Authored: Wed Apr 15 18:45:13 2015 -0400
Committer: shamrath <sh...@gmail.com>
Committed: Wed Apr 15 18:45:13 2015 -0400
----------------------------------------------------------------------
.../workflow/model/component/registry/JCRComponentRegistry.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/06e4f1d2/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java
----------------------------------------------------------------------
diff --git a/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java b/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java
index 84d3408..916e593 100644
--- a/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java
+++ b/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java
@@ -57,7 +57,7 @@ public class JCRComponentRegistry extends ComponentRegistry {
tree.add(jcr);
}
} else {
- log.error("Gateway {} Id is not exits", gatewayId);
+ log.error("Gateway {} Id is not exist", gatewayId);
}
} catch (Exception e) {
log.error(e.getMessage(), e);
[4/4] airavata git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by sh...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/bd275a9a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/bd275a9a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/bd275a9a
Branch: refs/heads/master
Commit: bd275a9a1865202ee9ecb5d076dc27bda5836d50
Parents: 06e4f1d 395c790
Author: shamrath <sh...@gmail.com>
Authored: Thu Apr 16 17:07:49 2015 -0400
Committer: shamrath <sh...@gmail.com>
Committed: Thu Apr 16 17:07:49 2015 -0400
----------------------------------------------------------------------
.../gfac/bes/handlers/AbstractSMSHandler.java | 6 +-
.../airavata/gfac/core/cpi/BetterGfacImpl.java | 18 +-
.../gfac/core/utils/OutHandlerWorker.java | 7 +-
.../handler/GSISSHDirectorySetupHandler.java | 10 +-
.../gfac/gsissh/handler/GSISSHInputHandler.java | 4 +-
.../gsissh/handler/GSISSHOutputHandler.java | 4 +-
.../gsissh/handler/NewGSISSHOutputHandler.java | 4 +-
.../gsissh/provider/impl/GSISSHProvider.java | 10 +-
.../ssh/handler/AdvancedSCPInputHandler.java | 6 +-
.../ssh/handler/AdvancedSCPOutputHandler.java | 12 +-
.../gfac/ssh/handler/NewSSHOutputHandler.java | 6 +-
.../ssh/handler/SSHDirectorySetupHandler.java | 11 +-
.../gfac/ssh/handler/SSHInputHandler.java | 11 +-
.../gfac/ssh/handler/SSHOutputHandler.java | 11 +-
.../gfac/ssh/provider/impl/SSHProvider.java | 17 +-
.../airavata/gfac/ssh/util/GFACSSHUtils.java | 6 +-
.../gfac.cpi.service.thrift | 3 +-
.../registry/jpa/impl/ExperimentRegistry.java | 4 +
.../jpa/resources/ErrorDetailResource.java | 5 +-
.../registry/jpa/resources/Utils.java | 4 +-
.../test-suite/multi-tenanted-airavata/pom.xml | 5 +
.../ApplicationRegister.java | 10 +-
.../ComputeResourceRegister.java | 31 +--
.../ExperimentExecution.java | 209 +++++++++++++---
.../FrameworkBootstrapping.java | 12 +-
.../multitenantedairavata/FrameworkSetup.java | 39 ++-
.../multitenantedairavata/GatewayRegister.java | 24 +-
.../TestFrameworkProps.java | 240 +++++++++++++++++++
.../utils/FrameworkUtils.java | 16 +-
.../utils/PropertyFileType.java | 4 +-
.../utils/PropertyReader.java | 8 -
.../utils/TestFrameworkConstants.java | 11 +
.../src/main/resources/test-framework.json | 66 +++++
.../src/main/resources/test-framework.yaml | 49 ++++
34 files changed, 738 insertions(+), 145 deletions(-)
----------------------------------------------------------------------
[2/4] airavata git commit: Check gateway exist before retrieve
application interfaces.
Posted by sh...@apache.org.
Check gateway exist before retrieve application interfaces.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/49e5201d
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/49e5201d
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/49e5201d
Branch: refs/heads/master
Commit: 49e5201d0d18700321df7efcb0ede7acb260bcac
Parents: e01f24f
Author: shamrath <sh...@gmail.com>
Authored: Wed Apr 15 18:43:50 2015 -0400
Committer: shamrath <sh...@gmail.com>
Committed: Wed Apr 15 18:43:50 2015 -0400
----------------------------------------------------------------------
.../component/registry/JCRComponentRegistry.java | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/49e5201d/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java
----------------------------------------------------------------------
diff --git a/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java b/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java
index bf844bc..84d3408 100644
--- a/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java
+++ b/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java
@@ -50,11 +50,15 @@ public class JCRComponentRegistry extends ComponentRegistry {
public List<ComponentReference> getComponentReferenceList() {
List<ComponentReference> tree = new ArrayList<ComponentReference>();
try {
- List<ApplicationInterfaceDescription> allApplicationInterfaces = client.getAllApplicationInterfaces(gatewayId);
- for (ApplicationInterfaceDescription interfaceDescription : allApplicationInterfaces) {
- JCRComponentReference jcr = new JCRComponentReference(interfaceDescription.getApplicationName(),interfaceDescription);
- tree.add(jcr);
- }
+ if (client.isGatewayExist(gatewayId)) {
+ List<ApplicationInterfaceDescription> allApplicationInterfaces = client.getAllApplicationInterfaces(gatewayId);
+ for (ApplicationInterfaceDescription interfaceDescription : allApplicationInterfaces) {
+ JCRComponentReference jcr = new JCRComponentReference(interfaceDescription.getApplicationName(), interfaceDescription);
+ tree.add(jcr);
+ }
+ } else {
+ log.error("Gateway {} Id is not exits", gatewayId);
+ }
} catch (Exception e) {
log.error(e.getMessage(), e);
}