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/01/20 18:48:36 UTC
svn commit: r1234028 - in /incubator/airavata/trunk/modules:
distribution/src/main/resources/conf/xbaya.properties
xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
Author: lahiru
Date: Fri Jan 20 17:48:36 2012
New Revision: 1234028
URL: http://svn.apache.org/viewvc?rev=1234028&view=rev
Log:
allowing users to configure runInThread for WorkflowInterpreter Service.
Modified:
incubator/airavata/trunk/modules/distribution/src/main/resources/conf/xbaya.properties
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
Modified: incubator/airavata/trunk/modules/distribution/src/main/resources/conf/xbaya.properties
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/distribution/src/main/resources/conf/xbaya.properties?rev=1234028&r1=1234027&r2=1234028&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/distribution/src/main/resources/conf/xbaya.properties (original)
+++ incubator/airavata/trunk/modules/distribution/src/main/resources/conf/xbaya.properties Fri Jan 20 17:48:36 2012
@@ -3,4 +3,5 @@ myproxy.password=Jdasjs
jcr.username=admin
jcr.password=admin
provenance=true
-jcr.url=http://localhost:8081/rmi
\ No newline at end of file
+jcr.url=http://localhost:8081/rmi
+runInThread=false
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=1234028&r1=1234027&r2=1234028&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 Jan 20 17:48:36 2012
@@ -65,6 +65,8 @@ public class WorkflowInterpretorSkeleton
public static String jcrUserName = "";
public static String jcrPassword = "";
public static String jcrURL = "";
+ public static boolean runInThread = false;
+ public static final String RUN_IN_THREAD = "runInThread";
public void startUp(ConfigurationContext configctx, AxisService service) {
@@ -79,9 +81,15 @@ public class WorkflowInterpretorSkeleton
}else{
provenance = false;
}
+ if("true".equals(properties.get(RUN_IN_THREAD))){
+ runInThread = true;
+ }else{
+ runInThread = false;
+ }
jcrUserName = (String)properties.get(JCR_USER);
jcrPassword = (String) properties.get(JCR_PASS);
jcrURL = (String) properties.get(JCR_URL);
+
} catch (IOException e) {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
@@ -98,7 +106,7 @@ public class WorkflowInterpretorSkeleton
*/
public java.lang.String launchWorkflow(java.lang.String workflowAsString, java.lang.String topic, java.lang.String password, java.lang.String username, NameValue[] inputs, NameValue[] configurations) {
- return setupAndLaunch(workflowAsString, topic, password, username, inputs, configurations,true);
+ return setupAndLaunch(workflowAsString, topic, password, username, inputs, configurations,runInThread);
}
private String setupAndLaunch(String workflowAsString, String topic, String password, String username, NameValue[] inputs, NameValue[] configurations,boolean inNewThread) {