You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2012/07/12 06:09:42 UTC
svn commit: r1360522 - in
/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya:
interpretor/ ui/dialogs/registry/
Author: samindaw
Date: Thu Jul 12 04:09:42 2012
New Revision: 1360522
URL: http://svn.apache.org/viewvc?rev=1360522&view=rev
Log:
provenance issue + msgbox&eventing url issue
Modified:
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/GUIWorkflowInterpreterInteractorImpl.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterConfiguration.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/GUIWorkflowInterpreterInteractorImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/GUIWorkflowInterpreterInteractorImpl.java?rev=1360522&r1=1360521&r2=1360522&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/GUIWorkflowInterpreterInteractorImpl.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/GUIWorkflowInterpreterInteractorImpl.java Thu Jul 12 04:09:42 2012
@@ -144,7 +144,7 @@ public class GUIWorkflowInterpreterInter
case INPUT_WORKFLOWINTERPRETER_FOR_WORKFLOW:
Workflow subWorkflow= (Workflow) data;
WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(subWorkflow,config.getTopic(),config.getMessageBoxURL(), config.getMessageBrokerURL(), config.getRegistry(), config.getConfiguration(), config.getGUI(), new MyProxyChecker(this.engine), this.engine.getMonitor());
- workflowInterpreterConfiguration.setActOnProvenance(false);
+ workflowInterpreterConfiguration.setActOnProvenance(config.isActOnProvenance());
workflowInterpreterConfiguration.setSubWorkflow(true);
if (config.isTestMode()){
workflowInterpreterConfiguration.setNotifier(new StandaloneNotificationSender(workflowInterpreterConfiguration.getTopic(),workflowInterpreterConfiguration.getWorkflow()));
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java?rev=1360522&r1=1360521&r2=1360522&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java Thu Jul 12 04:09:42 2012
@@ -145,7 +145,10 @@ public class WorkflowInterpreter {
this.setConfig(config);
config.validateNotifier();
this.interactor = interactor;
- config.setActOnProvenance(config.getConfiguration().isCollectProvenance());
+ if (config.isActOnProvenance()==null) {
+ config.setActOnProvenance(config.getConfiguration()
+ .isCollectProvenance());
+ }
config.setSubWorkflow(false);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterConfiguration.java?rev=1360522&r1=1360521&r2=1360522&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterConfiguration.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterConfiguration.java Thu Jul 12 04:09:42 2012
@@ -49,7 +49,7 @@ public class WorkflowInterpreterConfigur
private WorkflowNotifiable notifier;
private String topic;
private boolean gfacEmbeddedMode = false;
- private boolean actOnProvenance = false;
+ private Boolean actOnProvenance = null;
private boolean subWorkflow;
private boolean testMode=false;
@@ -168,11 +168,11 @@ public class WorkflowInterpreterConfigur
this.gfacEmbeddedMode = gfacEmbeddedMode;
}
- public boolean isActOnProvenance() {
+ public Boolean isActOnProvenance() {
return actOnProvenance;
}
- public void setActOnProvenance(boolean actOnProvenance) {
+ public void setActOnProvenance(Boolean actOnProvenance) {
this.actOnProvenance = actOnProvenance;
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java?rev=1360522&r1=1360521&r2=1360522&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java Thu Jul 12 04:09:42 2012
@@ -112,6 +112,10 @@ public class JCRRegistryWindow {
List<URI> eventingServiceURLList = registry.getRegistry().getEventingServiceURLList();
if (eventingServiceURLList.size()>0) {
this.engine
+ .getConfiguration()
+ .setBrokerURL(
+ eventingServiceURLList.get(0));
+ this.engine
.getMonitor()
.getConfiguration()
.setBrokerURL(
@@ -120,6 +124,10 @@ public class JCRRegistryWindow {
List<URI> messageBoxServiceURLList = registry.getRegistry().getMessageBoxServiceURLList();
if (messageBoxServiceURLList.size()>0) {
this.engine
+ .getConfiguration()
+ .setMessageBoxURL(
+ messageBoxServiceURLList.get(0));
+ this.engine
.getMonitor()
.getConfiguration()
.setMessageBoxURL(