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/10/05 23:00:56 UTC
svn commit: r1394809 - in /airavata/trunk/modules:
commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/
ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/
ws-messenger/client/src/main/java/org...
Author: lahiru
Date: Fri Oct 5 21:00:55 2012
New Revision: 1394809
URL: http://svn.apache.org/viewvc?rev=1394809&view=rev
Log:
allowing users to set timeout value
Modified:
airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/MessageBoxNotificationHandler.java
airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/CommonMsgBrokerClient.java
airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/msgbox/MsgboxHandler.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/WsmgClient.java
Modified: airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/MessageBoxNotificationHandler.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/MessageBoxNotificationHandler.java?rev=1394809&r1=1394808&r2=1394809&view=diff
==============================================================================
--- airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/MessageBoxNotificationHandler.java (original)
+++ airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/MessageBoxNotificationHandler.java Fri Oct 5 21:00:55 2012
@@ -225,7 +225,7 @@ public class MessageBoxNotificationHandl
WseMsgBrokerClient wseClient = new WseMsgBrokerClient();
MsgboxHandler msgboxHandler = new MsgboxHandler();
- EndpointReference msgBoxAddr = msgboxHandler.createPullMsgBox(this.messageBoxUrl, 1000l);
+ EndpointReference msgBoxAddr = msgboxHandler.createPullMsgBox(this.messageBoxUrl, 12000l);
String messageBoxAddress = msgBoxAddr.getAddress();
if (logger.isDebugEnabled())
@@ -250,7 +250,7 @@ public class MessageBoxNotificationHandl
WseMsgBrokerClient wseClient = new WseMsgBrokerClient();
MsgboxHandler msgboxHandler = new MsgboxHandler();
- EndpointReference msgBoxAddr = msgboxHandler.createPullMsgBox(this.messageBoxUrl, 1000l);
+ EndpointReference msgBoxAddr = msgboxHandler.createPullMsgBox(this.messageBoxUrl, 12000l);
if (logger.isDebugEnabled())
logger.info("\n\nCreated Messagebox at address :" + msgBoxAddr.getAddress());
Modified: airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/CommonMsgBrokerClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/CommonMsgBrokerClient.java?rev=1394809&r1=1394808&r2=1394809&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/CommonMsgBrokerClient.java (original)
+++ airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/CommonMsgBrokerClient.java Fri Oct 5 21:00:55 2012
@@ -38,9 +38,10 @@ abstract class CommonMsgBrokerClient imp
private final static Logger logger = LoggerFactory.getLogger(CommonMsgBrokerClient.class);
protected ConsumerServer xs;
+ private long socketTimeout = 200000L;
+
protected MsgboxHandler msgboxHandler = new MsgboxHandler();
- private long socketTimeout = 200000L;
public CommonMsgBrokerClient(long timeout) {
socketTimeout = timeout;
@@ -127,6 +128,7 @@ abstract class CommonMsgBrokerClient imp
return ret;
}
+
public MessagePuller startPullingEventsFromMsgBox(EndpointReference msgBoxEpr, NotificationHandler handler,
long interval, long timeout) throws MsgBrokerClientException {
Modified: airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/msgbox/MsgboxHandler.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/msgbox/MsgboxHandler.java?rev=1394809&r1=1394808&r2=1394809&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/msgbox/MsgboxHandler.java (original)
+++ airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/msgbox/MsgboxHandler.java Fri Oct 5 21:00:55 2012
@@ -49,7 +49,7 @@ public class MsgboxHandler {
}
public EndpointReference createPullMsgBox(String msgBoxServerLoc) throws MsgBrokerClientException {
- return createPullMsgBox(msgBoxServerLoc, 12000L);
+ return createPullMsgBox(msgBoxServerLoc, 2000L);
}
public MessagePuller startPullingEventsFromMsgBox(EndpointReference msgBoxEpr, NotificationHandler handler,
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java?rev=1394809&r1=1394808&r2=1394809&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java Fri Oct 5 21:00:55 2012
@@ -103,7 +103,7 @@ public class WorkflowInterpretorEventLis
}
try {
if (this.pullMode) {
- EndpointReference messageBoxEPR = this.wseClient.createPullMsgBox(this.messageBoxURL.toString());
+ EndpointReference messageBoxEPR = this.wseClient.createPullMsgBox(this.messageBoxURL.toString(),20000L);
this.subscriptionID = this.wseClient.subscribe(messageBoxEPR.getAddress(), this.topic, null);
this.messagePuller = this.wseClient.startPullingEventsFromMsgBox(messageBoxEPR, this, 1000L, 20000L);
} else {
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java?rev=1394809&r1=1394808&r2=1394809&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java Fri Oct 5 21:00:55 2012
@@ -224,8 +224,7 @@ public class WorkflowInterpretorSkeleton
*/
public java.lang.String launchWorkflow(java.lang.String workflowAsString, java.lang.String topic, NameValue[] inputs) throws XMLStreamException {
- OMElement workflowContext = getWorkflowContextHeader();
- Map<String, String> configuration = new HashMap<String, String>();
+ OMElement workflowContext = getWorkflowContextHeader(); Map<String, String> configuration = new HashMap<String, String>();
WorkflowContextHeaderBuilder workflowContextHeaderBuilder = parseContextHeader(workflowContext, configuration);
return setupAndLaunch(workflowAsString, topic,
(String)configurationContext.getProperty(MYPROXY_USER),(String)configurationContext.getProperty(MYPROXY_PASS),inputs,configuration,runInThread,workflowContextHeaderBuilder);
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java?rev=1394809&r1=1394808&r2=1394809&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java Fri Oct 5 21:00:55 2012
@@ -49,6 +49,8 @@ public class Monitor extends EventProduc
protected WsmgClient wsmgClient;
protected boolean print;
+
+ protected long timeout = 20000L;
/**
* Constructs a Monitor.
@@ -202,6 +204,7 @@ public class Monitor extends EventProduc
private void subscribe() throws MonitorException {
this.wsmgClient = new WsmgClient(this);
+ this.wsmgClient.setTimeout(this.getTimeout());
//Users can set the timeout and interval for the subscription using wsmg setter methods, here we use the default values
this.wsmgClient.subscribe();
@@ -220,4 +223,11 @@ public class Monitor extends EventProduc
this.print = print;
}
+ public long getTimeout() {
+ return timeout;
+ }
+
+ public void setTimeout(long timeout) {
+ this.timeout = timeout;
+ }
}
\ No newline at end of file
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/WsmgClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/WsmgClient.java?rev=1394809&r1=1394808&r2=1394809&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/WsmgClient.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/WsmgClient.java Fri Oct 5 21:00:55 2012
@@ -86,7 +86,7 @@ public class WsmgClient implements Consu
public synchronized void subscribe() throws MonitorException {
try {
if (this.pullMode) {
- EndpointReference messageBoxEPR = this.wseClient.createPullMsgBox(this.messageBoxURL.toString());
+ EndpointReference messageBoxEPR = this.wseClient.createPullMsgBox(this.messageBoxURL.toString(),getTimeout());
this.subscriptionID = this.wseClient.subscribe(messageBoxEPR.getAddress(), this.topic, null);
this.messagePuller = this.wseClient.startPullingEventsFromMsgBox(messageBoxEPR, this, getInterval(), getTimeout());
} else {