You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2012/09/14 21:47:01 UTC
svn commit: r1384898 - in
/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya:
interpretor/WorkflowInterpretorSkeleton.java
ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java
Author: lahiru
Date: Fri Sep 14 19:47:00 2012
New Revision: 1384898
URL: http://svn.apache.org/viewvc?rev=1384898&view=rev
Log:
fixing minor issues encountered while running hellow world workflow.
Modified:
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java?rev=1384898&r1=1384897&r2=1384898&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java Fri Sep 14 19:47:00 2012
@@ -375,18 +375,18 @@ public class WorkflowInterpretorSkeleton
return defaultVal;
}
public void shutDown(ConfigurationContext configctx, AxisService service) {
- AiravataRegistry2 registry = jcrComponentRegistry.getRegistry();
+ AiravataRegistry2 registry = jcrComponentRegistry.getRegistry();
URI gfacURL = (URI) configctx.getProperty(SERVICE_URL);
registry.removeWorkflowInterpreterURI(gfacURL);
- thread.interrupt();
- try {
- thread.join();
- } catch (InterruptedException e) {
- log.info("GFacURL update thread is interrupted");
- }
- if(runner != null){
- runner.shutDown();
- }
+ thread.interrupt();
+ try {
+ thread.join();
+ } catch (InterruptedException e) {
+ log.info("GFacURL update thread is interrupted");
+ }
+ if (runner != null) {
+ runner.shutDown();
+ }
}
private List<HostDescription> getDefinedHostDescriptions() {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java?rev=1384898&r1=1384897&r2=1384898&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java Fri Sep 14 19:47:00 2012
@@ -329,7 +329,7 @@ public class DynamicWorkflowRunnerWindow
inputNode.setDefaultValue(value);
}
- final String gFacUrl = (String) this.gfacUrlListField.getSelectedItem();
+ final String gFacUrl = ((URI) this.gfacUrlListField.getSelectedItem()).toASCIIString();
if (null != gFacUrl && !"".equals(gFacUrl)) {
try {
this.engine.getConfiguration().setGFacURL(new URI(gFacUrl));