Mailing-List: contact airavata-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: airavata-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1348962 -
 /incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
Date: Mon, 11 Jun 2012 18:48:48 -0000
To: airavata-commits@incubator.apache.org
From: lahiru@apache.org
Message-Id: <20120611184848.C83F52388860@eris.apache.org>

Author: lahiru
Date: Mon Jun 11 18:48:48 2012
New Revision: 1348962

URL: http://svn.apache.org/viewvc?rev=1348962&view=rev
Log:
fixing https://issues.apache.org/jira/browse/AIRAVATA-466.

Modified:
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.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=1348962&r1=1348961&r2=1348962&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 Mon Jun 11 18:48:48 2012
@@ -106,7 +106,6 @@ public class WorkflowInterpretorSkeleton
     public static final int JCR_AVAIALABILITY_WAIT_INTERVAL = 1000 * 10;
     public static final String GFAC_EMBEDDED = "gfac.embedded";
     public static  ConfigurationContext configurationContext;
-    public static final String WITH_LISTENER = "with.Listener";
     public static final String OUTPUT_DATA_PATH = "outputDataPath";
 
     private AiravataRegistry getRegistry(){
@@ -282,18 +281,13 @@ public class WorkflowInterpretorSkeleton
 		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,topic,conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf, null, null, null);
         workflowInterpreterConfiguration.setGfacEmbeddedMode(gfacEmbeddedMode);
         workflowInterpreterConfiguration.setActOnProvenance(provenance);
-        if (Boolean.parseBoolean(configurations.get(WITH_LISTENER))) {
-            listener = new WorkflowInterpretorEventListener(workflow, conf);
-            interpreter = new WorkflowInterpreter(workflowInterpreterConfiguration, new SSWorkflowInterpreterInteractorImpl(workflow));
-
-            try {
-                System.err.println("start listener set");
-                listener.start();
-            } catch (MonitorException e1) {
-                e1.printStackTrace();
-            }
-        } else {
-            interpreter = new WorkflowInterpreter(workflowInterpreterConfiguration, new SSWorkflowInterpreterInteractorImpl(workflow));
+        listener = new WorkflowInterpretorEventListener(workflow, conf);
+        interpreter = new WorkflowInterpreter(workflowInterpreterConfiguration, new SSWorkflowInterpreterInteractorImpl(workflow));
+        try {
+            System.err.println("start listener set");
+            listener.start();
+        } catch (MonitorException e1) {
+            e1.printStackTrace();
         }
 
         WorkflowContextHeaderBuilder.setCurrentContextHeader(builder.getContextHeader());