airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From patanac...@apache.org
Subject svn commit: r1179790 [3/4] - in /incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya: ./ component/gui/ component/registry/ component/ws/ event/ experiment/gui/ file/gui/ gfac/ gpel/ gpel/gui/ gpel/script/ graph/dynamic/g...
Date Thu, 06 Oct 2011 19:47:49 GMT
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/NotificationHandler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/NotificationHandler.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/NotificationHandler.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/NotificationHandler.java Thu Oct  6 19:47:45 2011
@@ -34,6 +34,8 @@ import org.apache.airavata.workflow.trac
 import org.apache.airavata.xbaya.XBayaConstants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.xmlbeans.XmlObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmlpull.v1.builder.XmlElement;
 
 import xsul.XmlConstants;
@@ -42,12 +44,11 @@ import xsul.lead.LeadContextHeader;
 import xsul.message_router.MessageContext;
 import xsul.xbeans_util.XBeansUtil;
 import xsul.xhandler.BaseHandler;
-import xsul5.MLogger;
 
 
 public class NotificationHandler extends BaseHandler {
 
-    private static final MLogger logger = MLogger.getLogger();
+    private static final Logger logger = LoggerFactory.getLogger(NotificationHandler.class);
 
     private static final String INVOKING_MESSAGE = "Invoking a workflow";
 
@@ -82,7 +83,7 @@ public class NotificationHandler extends
             try {
                 myServiceID = new URI(null, null, serviceIDAsString, null);
             } catch (URISyntaxException e) {
-                logger.caught(e);
+                logger.error(e.getMessage(), e);
             }
         }
         String myNodeID = null;
@@ -100,7 +101,7 @@ public class NotificationHandler extends
     @Override
     public boolean processOutgoingXml(XmlElement soapEnvelope, MessageContext context)
             throws DynamicInfosetInvokerException {
-        logger.finest("soapEnvelope: " + XMLUtil.xmlElementToString(soapEnvelope));
+        logger.info("soapEnvelope: " + XMLUtil.xmlElementToString(soapEnvelope));
 
 
 
@@ -116,7 +117,7 @@ public class NotificationHandler extends
             try {
                 serviceTimestep = new Integer(this.leadContext.getTimeStep());
             } catch (NumberFormatException e) {
-                logger.caught(e);
+                logger.error(e.getMessage(), e);
             }
         }
         XmlElement soapHeader = soapEnvelope.element(null, XmlConstants.S_HEADER);
@@ -139,7 +140,7 @@ public class NotificationHandler extends
     @Override
     public boolean processIncomingXml(XmlElement soapEnvelope, MessageContext context)
             throws DynamicInfosetInvokerException {
-        logger.finest("soapEnvelope: " + XMLUtil.xmlElementToString(soapEnvelope));
+        logger.info("soapEnvelope: " + XMLUtil.xmlElementToString(soapEnvelope));
 
         XmlElement soapHeader = soapEnvelope.element(null, XmlConstants.S_HEADER);
         XmlObject headerObject = null;

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/modifier/WorkflowModifier.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/modifier/WorkflowModifier.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/modifier/WorkflowModifier.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/modifier/WorkflowModifier.java Thu Oct  6 19:47:45 2011
@@ -32,7 +32,6 @@ import java.util.Set;
 import org.apache.airavata.common.exception.UtilsException;
 import org.apache.airavata.common.utils.WSDLUtil;
 import org.apache.airavata.xbaya.XBayaRuntimeException;
-import org.apache.airavata.xbaya.component.ComponentException;
 import org.apache.airavata.xbaya.component.system.InputComponent;
 import org.apache.airavata.xbaya.component.ws.WSComponent;
 import org.apache.airavata.xbaya.graph.GraphException;
@@ -51,15 +50,16 @@ import org.apache.airavata.xbaya.monitor
 import org.apache.airavata.xbaya.monitor.MonitorUtil.EventType;
 import org.apache.airavata.xbaya.monitor.gui.MonitorEventHandler.NodeState;
 import org.apache.airavata.xbaya.wf.Workflow;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmlpull.infoset.XmlElement;
 
 import xsul.XmlConstants;
-import xsul5.MLogger;
 import xsul5.wsdl.WsdlPortTypeOperation;
 
 public class WorkflowModifier {
 
-    private static final MLogger logger = MLogger.getLogger();
+    private static final Logger logger = LoggerFactory.getLogger(WorkflowModifier.class);
 
     private Workflow modifiedWorkflow;
 
@@ -157,7 +157,7 @@ public class WorkflowModifier {
             if (fromPort == null) {
                 // This input port is not connected.
                 String inputPortID = inputPort.getID();
-                logger.finest("id: " + inputPortID);
+                logger.info("id: " + inputPortID);
                 Port originalInputPort = originalGraph.getPort(inputPortID);
                 // No duplicate in set.
                 Port originalFromPort = originalInputPort.getFromPort();
@@ -193,7 +193,7 @@ public class WorkflowModifier {
     }
 
     private String getWorkflowInput(String nodeID) throws MonitorException {
-        logger.entering(nodeID);
+        logger.debug("Node:" + nodeID);
         List<MonitorEvent> events = this.eventData.getEvents();
         for (MonitorEvent event : events) {
             EventType type = event.getType();
@@ -228,7 +228,6 @@ public class WorkflowModifier {
     }
 
     private String getOutput(String nodeID, String messageName, String parameterName) throws MonitorException {
-        logger.entering(new Object[] { nodeID, messageName, parameterName });
         List<MonitorEvent> events = this.eventData.getEvents();
         for (MonitorEvent event : events) {
             // We need to find the notification that contains the output of the

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java Thu Oct  6 19:47:45 2011
@@ -21,7 +21,6 @@
 
 package org.apache.airavata.xbaya.monitor;
 
-import java.net.URI;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -32,13 +31,13 @@ import org.apache.airavata.xbaya.XBayaEx
 import org.apache.airavata.xbaya.event.Event;
 import org.apache.airavata.xbaya.event.Event.Type;
 import org.apache.airavata.xbaya.event.EventProducer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmlpull.infoset.XmlElement;
 
-import xsul5.MLogger;
-
 public class Monitor extends EventProducer {
 
-    protected static final MLogger logger = MLogger.getLogger();
+    protected static final Logger logger = LoggerFactory.getLogger(Monitor.class);
 
     protected MonitorConfiguration configuration;
 
@@ -131,7 +130,7 @@ public class Monitor extends EventProduc
                         unsubscribe(client);
                     } catch (XBayaException e) {
                         // Ignore the error in unsubscription.
-                        logger.caught(e);
+                        logger.error(e.getMessage(), e);
                     }
                 }
             }.start();

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorConfiguration.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorConfiguration.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorConfiguration.java Thu Oct  6 19:47:45 2011
@@ -31,7 +31,7 @@ import org.apache.airavata.common.utils.
 
 public class MonitorConfiguration extends EventProducer {
 
-    // private static final MLogger logger = MLogger.getLogger();
+    // private static final Logger logger = LoggerFactory.getLogger();
 
     private URI brokerURL;
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorEventData.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorEventData.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorEventData.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorEventData.java Thu Oct  6 19:47:45 2011
@@ -32,10 +32,10 @@ import javax.swing.event.TableModelEvent
 import javax.swing.event.TableModelListener;
 import javax.swing.table.TableModel;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmlpull.infoset.XmlElement;
 
-import xsul5.MLogger;
-
 public class MonitorEventData implements TableModel, BoundedRangeModel {
 
     /**
@@ -73,7 +73,7 @@ public class MonitorEventData implements
         }
     }
 
-    private static final MLogger logger = MLogger.getLogger();
+    private static final Logger logger = LoggerFactory.getLogger(MonitorEventData.class);
 
     private List<TableModelListener> tableModelListeners;
 
@@ -236,7 +236,7 @@ public class MonitorEventData implements
         } catch (RuntimeException e) {
             // This should not happen, but if it happens it blocks the UI.
             // That's why catching it.
-            logger.caught(e);
+            logger.error(e.getMessage(), e);
             value = "Error";
         }
         return value;

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorUtil.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorUtil.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorUtil.java Thu Oct  6 19:47:45 2011
@@ -27,10 +27,11 @@ import java.util.Date;
 
 import org.apache.airavata.common.utils.XMLUtil;
 import org.apache.airavata.xbaya.XBayaRuntimeException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmlpull.infoset.XmlElement;
 import org.xmlpull.infoset.XmlNamespace;
 
-import xsul5.MLogger;
 import atomixmiser.DcDate;
 
 /**
@@ -38,7 +39,7 @@ import atomixmiser.DcDate;
  */
 public class MonitorUtil {
 
-    private static final MLogger logger = MLogger.getLogger();
+    private static final Logger logger = LoggerFactory.getLogger(MonitorUtil.class);
 
     /**
      * Workflow tracking namespace
@@ -399,7 +400,7 @@ public class MonitorUtil {
         try {
             return new URI(workflowID);
         } catch (URISyntaxException e) {
-            logger.caught(e);
+            logger.error(e.getMessage(), e);
             return null;
         }
     }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/WsmgClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/WsmgClient.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/WsmgClient.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/WsmgClient.java Thu Oct  6 19:47:45 2011
@@ -32,13 +32,13 @@ import org.apache.airavata.wsmg.client.W
 import org.apache.airavata.wsmg.client.msgbox.MessagePuller;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axis2.addressing.EndpointReference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmlpull.infoset.XmlElement;
 
-import xsul5.MLogger;
-
 public class WsmgClient implements ConsumerNotificationHandler, NotificationHandler{
 
-    private static final MLogger logger = MLogger.getLogger();
+    private static final Logger logger = LoggerFactory.getLogger(WsmgClient.class);
 
     private Monitor monitor;
 
@@ -142,7 +142,7 @@ public class WsmgClient implements Consu
         } catch (Exception e) {
             // Just log them because they can be unrelated messages sent to
             // this topic by accident.
-            logger.warning("Could not parse received notification: " + message, e);
+            logger.warn("Could not parse received notification: " + message, e);
         }
     }
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorEventHandler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorEventHandler.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorEventHandler.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorEventHandler.java Thu Oct  6 19:47:45 2011
@@ -60,10 +60,10 @@ import org.apache.airavata.xbaya.wf.Work
 import org.apache.airavata.xbaya.workflow.WorkflowClient;
 import org.apache.airavata.xbaya.workflow.WorkflowClient.WorkflowType;
 import org.apache.airavata.xbaya.workflow.WorkflowEngineException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmlpull.infoset.XmlElement;
 
-import xsul5.MLogger;
-
 public class MonitorEventHandler implements ChangeListener {
 
     /**
@@ -96,7 +96,7 @@ public class MonitorEventHandler impleme
         }
     }
 
-    private static MLogger logger = MLogger.getLogger();
+    private static Logger logger = LoggerFactory.getLogger(MonitorEventHandler.class);
 
     private XBayaEngine engine;
 
@@ -133,7 +133,7 @@ public class MonitorEventHandler impleme
         } catch (RuntimeException e) {
             // Don't want to pop up an error dialog every time XBaya received an
             // ill-formatted notification.
-            logger.caught(e);
+            logger.error(e.getMessage(), e);
         }
     }
 
@@ -284,7 +284,7 @@ public class MonitorEventHandler impleme
             // correctly.
                     || type == EventType.SERVICE_INVOKED) {
                 if (node == null) {
-                    logger.warning("There is no node that has ID, " + nodeID);
+                    logger.warn("There is no node that has ID, " + nodeID);
                 } else {
                     node.getGUI().setToken(instanceName, NodeState.EXECUTING);
                 }
@@ -293,7 +293,7 @@ public class MonitorEventHandler impleme
             // correctly.
                     || type == EventType.SENDING_RESULT) {
                 if (node == null) {
-                    logger.warning("There is no node that has ID, " + nodeID);
+                    logger.warn("There is no node that has ID, " + nodeID);
                 } else {
                     node.getGUI().setToken(instanceName, NodeState.FINISHED);
                 }
@@ -301,13 +301,13 @@ public class MonitorEventHandler impleme
             // TODO
                     || type == EventType.SENDING_FAULT || type == EventType.SENDING_RESPONSE_FAILED) {
                 if (node == null) {
-                    logger.warning("There is no node that has ID, " + nodeID);
+                    logger.warn("There is no node that has ID, " + nodeID);
                 } else {
                     node.getGUI().setToken(instanceName, NodeState.FAILED);
                 }
             } else if (type == MonitorUtil.EventType.RESOURCE_MAPPING) {
                 if (node == null) {
-                    logger.warning("There is no node that has ID, " + nodeID);
+                    logger.warn("There is no node that has ID, " + nodeID);
                 } else {
                     // nodeResourceMapped(node, event.getEvent(), forward);
                 }
@@ -353,7 +353,7 @@ public class MonitorEventHandler impleme
         String nodeID = event.getNodeID();
         Node node = graph.getNode(nodeID);
 
-        // logger.finest("type: " + type);
+        // logger.info("type: " + type);
         if (type == MonitorUtil.EventType.WORKFLOW_INVOKED) {
             workflowStarted(graph, forward);
         } else if (type == MonitorUtil.EventType.WORKFLOW_TERMINATED) {
@@ -363,7 +363,7 @@ public class MonitorEventHandler impleme
         // correctly.
                 || type == EventType.SERVICE_INVOKED) {
             if (node == null) {
-                logger.warning("There is no node that has ID, " + nodeID);
+                logger.warn("There is no node that has ID, " + nodeID);
             } else {
                 nodeStarted(node, forward);
             }
@@ -372,7 +372,7 @@ public class MonitorEventHandler impleme
         // correctly.
                 || type == EventType.SENDING_RESULT) {
             if (node == null) {
-                logger.warning("There is no node that has ID, " + nodeID);
+                logger.warn("There is no node that has ID, " + nodeID);
             } else {
                 nodeFinished(node, forward);
             }
@@ -380,13 +380,13 @@ public class MonitorEventHandler impleme
         // TODO
                 || type == EventType.SENDING_FAULT || type == EventType.SENDING_RESPONSE_FAILED) {
             if (node == null) {
-                logger.warning("There is no node that has ID, " + nodeID);
+                logger.warn("There is no node that has ID, " + nodeID);
             } else {
                 nodeFailed(node, forward);
             }
         } else if (type == MonitorUtil.EventType.RESOURCE_MAPPING) {
             if (node == null) {
-                logger.warning("There is no node that has ID, " + nodeID);
+                logger.warn("There is no node that has ID, " + nodeID);
             } else {
                 nodeResourceMapped(node, event.getEvent(), forward);
             }
@@ -425,16 +425,16 @@ public class MonitorEventHandler impleme
             canvas.setWorkflow(loadedWorkflow);
         } catch (GraphException e) {
             this.incorrectWorkflowIDs.add(workflowInstanceID);
-            logger.caught(e);
+            logger.error(e.getMessage(), e);
         } catch (WorkflowEngineException e) {
             this.incorrectWorkflowIDs.add(workflowInstanceID);
-            logger.caught(e);
+            logger.error(e.getMessage(), e);
         } catch (ComponentException e) {
             this.incorrectWorkflowIDs.add(workflowInstanceID);
-            logger.caught(e);
+            logger.error(e.getMessage(), e);
         } catch (RuntimeException e) {
             this.incorrectWorkflowIDs.add(workflowInstanceID);
-            logger.caught(e);
+            logger.error(e.getMessage(), e);
         }
 
     }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorMenu.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorMenu.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorMenu.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorMenu.java Thu Oct  6 19:47:45 2011
@@ -37,12 +37,12 @@ import org.apache.airavata.xbaya.gui.XBa
 import org.apache.airavata.xbaya.modifier.gui.WorkflowModifierGUI;
 import org.apache.airavata.xbaya.monitor.Monitor;
 import org.apache.airavata.xbaya.monitor.MonitorConfiguration;
-
-import xsul5.MLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MonitorMenu implements EventListener {
 
-    private static final MLogger logger = MLogger.getLogger();
+    private static final Logger logger = LoggerFactory.getLogger(MonitorMenu.class);
 
     private XBayaEngine engine;
 
@@ -86,7 +86,6 @@ public class MonitorMenu implements Even
      * @see org.apache.airavata.xbaya.event.EventListener#eventReceived(org.apache.airavata.xbaya.event.Event)
      */
     public void eventReceived(Event event) {
-        logger.entering();
         Type type = event.getType();
         if (type.equals(Event.Type.MONITOR_CONFIGURATION_CHANGED)) {
             MonitorConfiguration configuration = this.engine.getMonitor().getConfiguration();

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorPanel.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorPanel.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorPanel.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorPanel.java Thu Oct  6 19:47:45 2011
@@ -131,11 +131,11 @@ public class MonitorPanel implements XBa
             boolean move = false;
 
             Rectangle visibleRect = this.table.getVisibleRect();
-            // logger.finest("visibleRect: " + visibleRect);
+            // logger.info("visibleRect: " + visibleRect);
             Rectangle bottomCellRect = this.table.getCellRect(firstRow - 1, 0, true);
-            // logger.finest("bottomCellRect: " + bottomCellRect);
+            // logger.info("bottomCellRect: " + bottomCellRect);
             move = bottomCellRect.intersects(visibleRect);
-            // logger.finest("move: " + move);
+            // logger.info("move: " + move);
 
             if (move) {
                 // When the scroll bar is at the bottom and the slider is at the
@@ -143,7 +143,7 @@ public class MonitorPanel implements XBa
                 // If the slider is not at the right, this method won't be
                 // called.
                 Rectangle newBottomCellRect = this.table.getCellRect(this.table.getRowCount() - 1, 0, true);
-                // logger.finest("cellRect: " + newBottomCellRect);
+                // logger.info("cellRect: " + newBottomCellRect);
                 this.table.scrollRectToVisible(newBottomCellRect);
             }
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorStarter.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorStarter.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorStarter.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorStarter.java Thu Oct  6 19:47:45 2011
@@ -26,12 +26,12 @@ import org.apache.airavata.xbaya.gui.Can
 import org.apache.airavata.xbaya.gui.ErrorMessages;
 import org.apache.airavata.xbaya.gui.WaitDialog;
 import org.apache.airavata.xbaya.monitor.MonitorException;
-
-import xsul5.MLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MonitorStarter implements Cancelable {
 
-    private static final MLogger logger = MLogger.getLogger();
+    private static final Logger logger = LoggerFactory.getLogger(MonitorStarter.class);
 
     private XBayaEngine engine;
 
@@ -93,7 +93,7 @@ public class MonitorStarter implements C
             try {
                 this.subscribingThread.join();
             } catch (InterruptedException e) {
-                logger.caught(e);
+                logger.error(e.getMessage(), e);
             }
         }
     }
@@ -105,14 +105,14 @@ public class MonitorStarter implements C
         } catch (MonitorException e) {
             // Probably canceled by a user.
             if (this.canceled) {
-                logger.caught(e);
+                logger.error(e.getMessage(), e);
             } else {
                 this.engine.getErrorWindow().error(ErrorMessages.MONITOR_SUBSCRIPTION_ERROR, e);
                 this.startingDialog.hide();
             }
         } catch (RuntimeException e) {
             if (this.canceled) {
-                logger.caught(e);
+                logger.error(e.getMessage(), e);
             } else {
                 this.engine.getErrorWindow().error(ErrorMessages.MONITOR_SUBSCRIPTION_ERROR, e);
                 this.startingDialog.hide();

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/MyProxyClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/MyProxyClient.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/MyProxyClient.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/MyProxyClient.java Thu Oct  6 19:47:45 2011
@@ -31,12 +31,12 @@ import org.globus.myproxy.MyProxy;
 import org.globus.myproxy.MyProxyException;
 import org.ietf.jgss.GSSCredential;
 import org.ietf.jgss.GSSException;
-
-import xsul5.MLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MyProxyClient {
 
-    private static final MLogger logger = MLogger.getLogger();
+    private static final Logger logger = LoggerFactory.getLogger(MyProxyClient.class);
 
     private boolean initialized = false;
 
@@ -217,7 +217,7 @@ public class MyProxyClient {
                     return false;
                 }
             } catch (GSSException e) {
-                logger.caught(e);
+                logger.error(e.getMessage(), e);
                 return false;
             }
         }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyLoader.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyLoader.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyLoader.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyLoader.java Thu Oct  6 19:47:45 2011
@@ -27,12 +27,12 @@ import org.apache.airavata.xbaya.gui.Err
 import org.apache.airavata.xbaya.gui.WaitDialog;
 import org.apache.airavata.xbaya.myproxy.MyProxyClient;
 import org.globus.myproxy.MyProxyException;
-
-import xsul5.MLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MyProxyLoader implements Cancelable {
 
-    private static final MLogger logger = MLogger.getLogger();
+    private static final Logger logger = LoggerFactory.getLogger(MyProxyLoader.class);
 
     private XBayaEngine engine;
 
@@ -87,7 +87,7 @@ public class MyProxyLoader implements Ca
             this.waitDialog.hide();
         } catch (MyProxyException e) {
             if (this.canceled) {
-                logger.caught(e);
+                logger.error(e.getMessage(), e);
             } else {
                 String message = ErrorMessages.MYPROXY_LOAD_ERROR + "\n" + e.getMessage();
                 this.engine.getErrorWindow().error(message, e);
@@ -96,7 +96,7 @@ public class MyProxyLoader implements Ca
 
         } catch (RuntimeException e) {
             if (this.canceled) {
-                logger.caught(e);
+                logger.error(e.getMessage(), e);
             } else {
                 this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
                 this.waitDialog.hide();

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvoker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvoker.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvoker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvoker.java Thu Oct  6 19:47:45 2011
@@ -24,6 +24,7 @@ package org.apache.airavata.xbaya.ode;
 import java.net.URI;
 import java.util.List;
 
+import org.apache.airavata.common.utils.StringUtil;
 import org.apache.airavata.xbaya.XBayaConfiguration;
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.XBayaException;
@@ -37,22 +38,22 @@ import org.apache.airavata.xbaya.monitor
 import org.apache.airavata.xbaya.monitor.MonitorException;
 import org.apache.airavata.xbaya.myproxy.MyProxyClient;
 import org.apache.airavata.xbaya.security.XBayaSecurity;
-import org.apache.airavata.common.utils.StringUtil;
 import org.apache.airavata.xbaya.util.XBayaUtil;
 import org.apache.airavata.xbaya.wf.Workflow;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import xsul.XmlConstants;
 import xsul.invoker.gsi.GsiInvoker;
 import xsul.lead.LeadContextHeader;
 import xsul.lead.LeadResourceMapping;
-import xsul5.MLogger;
 import xsul5.wsdl.WsdlDefinitions;
 
 public class ODEInvoker implements Cancelable {
 
     private XBayaEngine engine;
 
-    private static final MLogger logger = MLogger.getLogger();
+    private static final Logger logger = LoggerFactory.getLogger(ODEInvoker.class);
 
     private Thread invokeThread;
 
@@ -138,7 +139,7 @@ public class ODEInvoker implements Cance
             invoker = new LEADWorkflowInvoker(wsdl, leadContext, messageBoxURL, secureInvoker);
         } catch (ComponentException e) {
             if (this.canceled) {
-                logger.caught(e);
+                logger.error(e.getMessage(), e);
             } else {
                 this.engine.getErrorWindow().error(ErrorMessages.GRAPH_NOT_READY_ERROR, e);
                 this.invokingDialog.hide();
@@ -146,7 +147,7 @@ public class ODEInvoker implements Cance
             return;
         } catch (RuntimeException e) {
             if (this.canceled) {
-                logger.caught(e);
+                logger.error(e.getMessage(), e);
             } else {
                 this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
                 this.invokingDialog.hide();
@@ -165,7 +166,7 @@ public class ODEInvoker implements Cance
             this.engine.getMonitor().start();
         } catch (MonitorException e) {
             if (this.canceled) {
-                logger.caught(e);
+                logger.error(e.getMessage(), e);
             } else {
                 this.engine.getErrorWindow().error(ErrorMessages.MONITOR_SUBSCRIPTION_ERROR, e);
                 this.invokingDialog.hide();
@@ -173,7 +174,7 @@ public class ODEInvoker implements Cance
             return;
         } catch (RuntimeException e) {
             if (this.canceled) {
-                logger.caught(e);
+                logger.error(e.getMessage(), e);
             } else {
                 this.engine.getErrorWindow().error(ErrorMessages.MONITOR_SUBSCRIPTION_ERROR, e);
                 this.invokingDialog.hide();

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/taverna/TavernaRunnerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/taverna/TavernaRunnerWindow.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/taverna/TavernaRunnerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/taverna/TavernaRunnerWindow.java Thu Oct  6 19:47:45 2011
@@ -33,6 +33,7 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.xml.namespace.QName;
 
+import org.apache.airavata.common.utils.StringUtil;
 import org.apache.airavata.common.utils.XMLUtil;
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.XBayaException;
@@ -48,17 +49,17 @@ import org.apache.airavata.xbaya.interpr
 import org.apache.airavata.xbaya.jython.script.JythonScript;
 import org.apache.airavata.xbaya.monitor.MonitorConfiguration;
 import org.apache.airavata.xbaya.scufl.script.ScuflScript;
-import org.apache.airavata.common.utils.StringUtil;
 import org.apache.airavata.xbaya.wf.Workflow;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmlpull.infoset.XmlElement;
 import org.xmlpull.v1.builder.XmlInfosetBuilder;
 
 import xsul.XmlConstants;
-import xsul5.MLogger;
 
 public class TavernaRunnerWindow {
 
-    private static final MLogger logger = MLogger.getLogger();
+    private static final Logger logger = LoggerFactory.getLogger(TavernaRunnerWindow.class);
 
     private XBayaEngine engine;
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/BPELScriptTestCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/BPELScriptTestCase.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/BPELScriptTestCase.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/BPELScriptTestCase.java Thu Oct  6 19:47:45 2011
@@ -42,7 +42,7 @@ import xsul5.wsdl.WsdlDefinitions;
 
 public class BPELScriptTestCase extends XBayaTestCase {
 
-    // private static final MLogger logger = MLogger.getLogger();
+    // private static final Logger logger = LoggerFactory.getLogger();
 
     private WorkflowCreator workflowCreator;
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/DSCTestCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/DSCTestCase.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/DSCTestCase.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/DSCTestCase.java Thu Oct  6 19:47:45 2011
@@ -30,6 +30,8 @@ import org.apache.airavata.common.utils.
 import org.apache.airavata.xbaya.file.XBayaPathConstants;
 import org.apache.airavata.xbaya.gpel.DSCUtil;
 import org.apache.airavata.xbaya.lead.LeadContextHeaderHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmlpull.v1.builder.XmlElement;
 
 import xsul.lead.LeadContextHeader;
@@ -42,7 +44,6 @@ import xsul.xwsif_runtime.WSIFClient;
 import xsul.xwsif_runtime.WSIFRuntime;
 import xsul.xwsif_runtime_async.WSIFAsyncResponsesCorrelator;
 import xsul.xwsif_runtime_async_http.XsulSoapHttpWsaResponsesCorrelator;
-import xsul5.MLogger;
 import xsul5.wsdl.WsdlDefinitions;
 import xsul5.wsdl.WsdlException;
 import xsul5.wsdl.WsdlResolver;
@@ -51,7 +52,7 @@ public class DSCTestCase extends XBayaTe
 
     private static final String SAMPLE_AWSDL = XBayaPathConstants.WSDL_DIRECTORY + "/test/TestCMD_Example1_AWSDL.xml";
 
-    private static final MLogger logger = MLogger.getLogger();
+    private static final Logger logger = LoggerFactory.getLogger(DSCTestCase.class);
 
     /**
      * @param args
@@ -84,7 +85,7 @@ public class DSCTestCase extends XBayaTe
         int clientPort = 0;
         WSIFAsyncResponsesCorrelator correlator = new XsulSoapHttpWsaResponsesCorrelator(clientPort);
         String serverLoc = ((XsulSoapHttpWsaResponsesCorrelator) correlator).getServerLocation();
-        logger.finest("client is waiting at " + serverLoc);
+        logger.info("client is waiting at " + serverLoc);
 
         // LEAD Context Header
         // Create lead context.

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/DSCUtilTestCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/DSCUtilTestCase.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/DSCUtilTestCase.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/DSCUtilTestCase.java Thu Oct  6 19:47:45 2011
@@ -30,8 +30,9 @@ import org.apache.airavata.xbaya.gpel.DS
 import org.apache.airavata.xbaya.graph.GraphException;
 import org.apache.airavata.xbaya.test.util.WorkflowCreator;
 import org.apache.airavata.xbaya.wf.Workflow;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import xsul5.MLogger;
 import xsul5.wsdl.WsdlDefinitions;
 import xsul5.wsdl.WsdlException;
 import xsul5.wsdl.WsdlResolver;
@@ -43,7 +44,7 @@ public class DSCUtilTestCase extends XBa
     private static final String WSDL_WITH_MULTIPLE_PORT_TYPES = XBayaPathConstants.BPEL_SCRIPT_DIRECTORY
             + File.separator + "receive-test-wsdl.xml";
 
-    private static final MLogger logger = MLogger.getLogger();
+    private static final Logger logger = LoggerFactory.getLogger(DSCUtilTestCase.class);
 
     /**
      * @throws WsdlException

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GFacServiceCreaterTestCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GFacServiceCreaterTestCase.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GFacServiceCreaterTestCase.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GFacServiceCreaterTestCase.java Thu Oct  6 19:47:45 2011
@@ -43,8 +43,8 @@ import org.apache.airavata.xbaya.jython.
 import org.apache.airavata.xbaya.jython.script.JythonScript;
 import org.apache.airavata.xbaya.test.util.WorkflowCreator;
 import org.apache.airavata.xbaya.wf.Workflow;
-
-import xsul5.MLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class GFacServiceCreaterTestCase extends XBayaTestCase {
 
@@ -53,7 +53,7 @@ public class GFacServiceCreaterTestCase 
     private static final String TEST_AWSDL = XBayaPathConstants.WSDL_DIRECTORY + File.separator
             + WorkflowCreator.GFAC_TEST_AWSDL;
 
-    private static final MLogger logger = MLogger.getLogger();
+    private static final Logger logger = LoggerFactory.getLogger(GFacServiceCreaterTestCase.class);
 
     /**
      * @throws XBayaException

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GPELClientTestCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GPELClientTestCase.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GPELClientTestCase.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GPELClientTestCase.java Thu Oct  6 19:47:45 2011
@@ -52,16 +52,17 @@ import org.gpel.client.GcInstance;
 import org.gpel.client.GcSearchList;
 import org.gpel.client.GcSearchResult;
 import org.ietf.jgss.GSSCredential;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmlpull.infoset.XmlElement;
 
 import xsul.lead.LeadContextHeader;
 import xsul.wsif.WSIFMessage;
-import xsul5.MLogger;
 import xsul5.wsdl.WsdlDefinitions;
 
 public class GPELClientTestCase extends XBayaTestCase {
 
-    private static final MLogger logger = MLogger.getLogger();
+    private static final Logger logger = LoggerFactory.getLogger(GPELClientTestCase.class);
 
     /**
      * @param args

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/HierarchicalWorkflowTestCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/HierarchicalWorkflowTestCase.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/HierarchicalWorkflowTestCase.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/HierarchicalWorkflowTestCase.java Thu Oct  6 19:47:45 2011
@@ -60,15 +60,16 @@ import org.apache.airavata.xbaya.workflo
 import org.apache.airavata.xbaya.workflow.WorkflowEngineManager;
 import org.gpel.client.GcInstance;
 import org.ietf.jgss.GSSCredential;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import xsul.lead.LeadContextHeader;
 import xsul.wsif.WSIFMessage;
-import xsul5.MLogger;
 import xsul5.wsdl.WsdlDefinitions;
 
 public class HierarchicalWorkflowTestCase extends XBayaTestCase {
 
-    private static final MLogger logger = MLogger.getLogger();
+    private static final Logger logger = LoggerFactory.getLogger(HierarchicalWorkflowTestCase.class);
 
     private WorkflowClient workflowClient;
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/LEADWorkflowInvokerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/LEADWorkflowInvokerTestCase.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/LEADWorkflowInvokerTestCase.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/LEADWorkflowInvokerTestCase.java Thu Oct  6 19:47:45 2011
@@ -43,6 +43,8 @@ import org.apache.airavata.xbaya.test.se
 import org.apache.airavata.xbaya.test.service.adder.AdderService;
 import org.globus.gsi.CertUtil;
 import org.ietf.jgss.GSSCredential;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmlpull.v1.builder.XmlContainer;
 import org.xmlpull.v1.builder.XmlDocument;
 import org.xmlpull.v1.builder.XmlElement;
@@ -57,7 +59,6 @@ import xsul.wsif.WSIFService;
 import xsul.wsif.WSIFServiceFactory;
 import xsul.xwsif_runtime.WSIFClient;
 import xsul.xwsif_runtime.WSIFRuntime;
-import xsul5.MLogger;
 import xsul5.wsdl.WsdlDefinitions;
 import xsul5.wsdl.WsdlException;
 import xsul5.wsdl.WsdlResolver;
@@ -66,7 +67,7 @@ public class LEADWorkflowInvokerTestCase
 
     private static final String SAMPLE_AWSDL = XBayaPathConstants.WSDL_DIRECTORY + File.separator + Adder.WSDL_PATH;
 
-    private static final MLogger logger = MLogger.getLogger();
+    private static final Logger logger = LoggerFactory.getLogger(LEADWorkflowInvokerTestCase.class);
 
     /**
      * @param args

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MetadataTestCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MetadataTestCase.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MetadataTestCase.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MetadataTestCase.java Thu Oct  6 19:47:45 2011
@@ -45,10 +45,10 @@ import org.apache.airavata.xbaya.graph.s
 import org.apache.airavata.xbaya.graph.ws.WSGraph;
 import org.apache.airavata.xbaya.wf.Workflow;
 import org.apache.airavata.xbaya.workflow.WorkflowClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmlpull.infoset.XmlElement;
 
-import xsul5.MLogger;
-
 public class MetadataTestCase extends TestCase {
 
     private static final String WSDL_DIRECTORY = "/u/sshirasu/codes/appservices/gfac2/wsdls";
@@ -65,7 +65,7 @@ public class MetadataTestCase extends Te
 
     private static final String WRF_FORECASTING_MODEL_WSDL = "WRFForecastingModel.wsdl";
 
-    private static final MLogger logger = MLogger.getLogger();
+    private static final Logger logger = LoggerFactory.getLogger(MetadataTestCase.class);
 
     /**
      * @throws ComponentException

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MyProxyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MyProxyTestCase.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MyProxyTestCase.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MyProxyTestCase.java Thu Oct  6 19:47:45 2011
@@ -26,12 +26,12 @@ import junit.framework.TestSuite;
 import org.apache.airavata.xbaya.myproxy.MyProxyClient;
 import org.globus.myproxy.MyProxyException;
 import org.ietf.jgss.GSSCredential;
-
-import xsul5.MLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MyProxyTestCase extends XBayaTestCase {
 
-    private static final MLogger logger = MLogger.getLogger();
+    private static final Logger logger = LoggerFactory.getLogger(MyProxyTestCase.class);
 
     private static String username = System.getProperty("username");
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WSDLTestCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WSDLTestCase.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WSDLTestCase.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WSDLTestCase.java Thu Oct  6 19:47:45 2011
@@ -35,7 +35,7 @@ import org.apache.airavata.xbaya.wf.Work
 
 public class WSDLTestCase extends XBayaTestCase {
 
-    // private static final MLogger logger = MLogger.getLogger();
+    // private static final Logger logger = LoggerFactory.getLogger();
 
     private WorkflowCreator graphCreater;
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WSIFTestCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WSIFTestCase.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WSIFTestCase.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WSIFTestCase.java Thu Oct  6 19:47:45 2011
@@ -26,12 +26,12 @@ import junit.framework.TestSuite;
 import org.apache.airavata.xbaya.XBayaConstants;
 import org.apache.airavata.xbaya.component.gui.ComponentTreeNode;
 import org.apache.airavata.xbaya.xregistry.XRegistryComponent;
-
-import xsul5.MLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class WSIFTestCase extends XBayaTestCase {
 
-    private static final MLogger logger = MLogger.getLogger();
+    private static final Logger logger = LoggerFactory.getLogger(WSIFTestCase.class);
 
     private ComponentTreeNode resouceCatalogComponentTree;
 
@@ -66,7 +66,7 @@ public class WSIFTestCase extends XBayaT
                             XRegistryComponent.Type.ABSTRACT);
                     WSIFTestCase.this.xRegistryComponentTree = client.getComponentTree();
                 } catch (Exception e) {
-                    logger.caught(e);
+                    logger.error(e.getMessage(), e);
                 }
             }
         };
@@ -93,7 +93,7 @@ public class WSIFTestCase extends XBayaT
                     WSIFTestCase.this.xRegistryComponentTree = client.getComponentTree();
                     System.err.println("ALEK c=" + WSIFTestCase.this.xRegistryComponentTree);
                 } catch (Exception e) {
-                    logger.caught(e);
+                    logger.error(e.getMessage(), e);
                 }
             }
         };

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowModificationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowModificationTestCase.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowModificationTestCase.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowModificationTestCase.java Thu Oct  6 19:47:45 2011
@@ -69,6 +69,8 @@ import org.apache.airavata.xbaya.wf.Work
 import org.apache.airavata.xbaya.workflow.WorkflowClient;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.xmlbeans.XmlObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmlpull.infoset.view.XmlValidationException;
 import org.xmlpull.v1.builder.XmlElement;
 
@@ -81,7 +83,6 @@ import xsul.wsif.WSIFServiceFactory;
 import xsul.xbeans_util.XBeansUtil;
 import xsul.xwsif_runtime.WSIFClient;
 import xsul.xwsif_runtime.WSIFRuntime;
-import xsul5.MLogger;
 import xsul5.wsdl.WsdlDefinitions;
 import xsul5.wsdl.WsdlResolver;
 
@@ -89,7 +90,7 @@ import xsul5.wsdl.WsdlResolver;
 
 public class WorkflowModificationTestCase extends XBayaTestCase {
 
-    private static final MLogger logger = MLogger.getLogger();
+    private static final Logger logger = LoggerFactory.getLogger(WorkflowModificationTestCase.class);
 
     private boolean gui = false;
 
@@ -328,7 +329,7 @@ public class WorkflowModificationTestCas
             try {
                 Thread.sleep(second * 1000);
             } catch (InterruptedException e) {
-                logger.caught(e);
+                logger.error(e.getMessage(), e);
             }
         }
     }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowTestCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowTestCase.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowTestCase.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowTestCase.java Thu Oct  6 19:47:45 2011
@@ -37,13 +37,13 @@ import org.apache.airavata.xbaya.graph.u
 import org.apache.airavata.xbaya.graph.ws.WSNode;
 import org.apache.airavata.xbaya.test.util.WorkflowCreator;
 import org.apache.airavata.xbaya.wf.Workflow;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmlpull.infoset.XmlElement;
 
-import xsul5.MLogger;
-
 public class WorkflowTestCase extends XBayaTestCase {
 
-    private static MLogger logger = MLogger.getLogger();
+    private static Logger logger = LoggerFactory.getLogger(WorkflowTestCase.class);
 
     private WorkflowCreator workflowCreator;
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaSecurityTestCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaSecurityTestCase.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaSecurityTestCase.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaSecurityTestCase.java Thu Oct  6 19:47:45 2011
@@ -26,13 +26,14 @@ import java.net.URI;
 import junit.framework.TestSuite;
 
 import org.apache.airavata.common.utils.WSDLUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import xsul.wsdl.WsdlResolver;
-import xsul5.MLogger;
 
 public class XBayaSecurityTestCase extends XBayaTestCase {
 
-    private static final MLogger logger = MLogger.getLogger();
+    private static final Logger logger = LoggerFactory.getLogger(XBayaSecurityTestCase.class);
 
     /**
      * @param args

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaTestCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaTestCase.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaTestCase.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaTestCase.java Thu Oct  6 19:47:45 2011
@@ -28,8 +28,7 @@ import junit.framework.TestCase;
 
 import org.apache.airavata.xbaya.XBayaConfiguration;
 import org.apache.airavata.xbaya.security.XBayaSecurity;
-
-import xsul5.MLogger;
+import org.slf4j.Logger;
 
 public abstract class XBayaTestCase extends TestCase {
 
@@ -48,8 +47,6 @@ public abstract class XBayaTestCase exte
     protected void setUp() throws Exception {
         super.setUp();
 
-        MLogger.setCmdNames("org.apache.airavata.xbaya:ALL");
-
         this.configuration = new XBayaConfiguration();
 
         // tmp directory

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XRegistryTextCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XRegistryTextCase.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XRegistryTextCase.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XRegistryTextCase.java Thu Oct  6 19:47:45 2011
@@ -25,14 +25,15 @@ import org.apache.airavata.xbaya.XBayaCo
 import org.apache.airavata.xbaya.component.registry.ComponentRegistryException;
 import org.ogce.xregistry.client.XRegistryClient;
 import org.ogce.xregistry.utils.XRegistryClientException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import xregistry.generated.ServiceDescData;
 import xregistry.generated.WsdlData;
-import xsul5.MLogger;
 
 public class XRegistryTextCase extends XBayaTestCase {
 
-    private static final MLogger logger = MLogger.getLogger();
+    private static final Logger logger = LoggerFactory.getLogger(XRegistryTextCase.class);
 
     /**
      * @throws XregistryException

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XppTestCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XppTestCase.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XppTestCase.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XppTestCase.java Thu Oct  6 19:47:45 2011
@@ -26,15 +26,15 @@ import java.io.StringWriter;
 
 import junit.framework.TestCase;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlPullParserFactory;
 import org.xmlpull.v1.XmlSerializer;
 
-import xsul5.MLogger;
-
 public class XppTestCase extends TestCase {
 
-    private static final MLogger logger = MLogger.getLogger();
+    private static final Logger logger = LoggerFactory.getLogger(XppTestCase.class);
 
     /*
      * @see TestCase#setUp()

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/jython/JythonLibraryTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/jython/JythonLibraryTest.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/jython/JythonLibraryTest.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/jython/JythonLibraryTest.java Thu Oct  6 19:47:45 2011
@@ -31,12 +31,12 @@ import org.apache.airavata.xbaya.jython.
 import org.apache.airavata.xbaya.jython.lib.WorkflowNotifiable;
 import org.apache.airavata.xbaya.test.service.adder.AdderService;
 import org.apache.airavata.xbaya.test.service.multiplier.MultiplierService;
-
-import xsul5.MLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class JythonLibraryTest extends TestCase {
 
-    private static final MLogger logger = MLogger.getLogger();
+    private static final Logger logger = LoggerFactory.getLogger(JythonLibraryTest.class);
 
     /**
      * @throws XBayaException

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/AllServices.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/AllServices.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/AllServices.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/AllServices.java Thu Oct  6 19:47:45 2011
@@ -48,7 +48,7 @@ import xsul.xservo_soap_http.HttpBasedSe
 
 public class AllServices {
 
-    // private static final MLogger logger = MLogger.getLogger();
+    // private static final Logger logger = LoggerFactory.getLogger();
 
     private int port;
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/ServiceNotificationSender.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/ServiceNotificationSender.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/ServiceNotificationSender.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/ServiceNotificationSender.java Thu Oct  6 19:47:45 2011
@@ -32,6 +32,8 @@ import org.apache.airavata.workflow.trac
 import org.apache.airavata.workflow.tracking.common.WorkflowTrackingContext;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.xmlbeans.XmlObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmlpull.v1.builder.XmlDocument;
 import org.xmlpull.v1.builder.XmlElement;
 
@@ -41,13 +43,12 @@ import xsul.soap.SoapUtil;
 import xsul.soap11_util.Soap11Util;
 import xsul.soap12_util.Soap12Util;
 import xsul.xbeans_util.XBeansUtil;
-import xsul5.MLogger;
 
 
 
 public class ServiceNotificationSender {
 
-    private final static MLogger logger = MLogger.getLogger();
+    private final static Logger logger = LoggerFactory.getLogger(ServiceNotificationSender.class);
 
     private final static String INVOKED_MESSAGE = "Service is invoked";
 
@@ -78,7 +79,7 @@ public class ServiceNotificationSender {
                     new SoapUtil[] { Soap11Util.getInstance(), Soap12Util.getInstance() });
             XmlElement soapHeader = soapEnvelope.element(null, XmlConstants.S_HEADER);
             XmlElement leadHeader = soapHeader.element(LeadContextHeader.NS, LeadContextHeader.TYPE.getLocalPart());
-            logger.finest("leadHeader: " + XMLUtil.xmlElementToString(leadHeader));
+            logger.info("leadHeader: " + XMLUtil.xmlElementToString(leadHeader));
             if (leadHeader == null) {
                 return null;
             }
@@ -88,7 +89,7 @@ public class ServiceNotificationSender {
 
             return sender;
         } catch (RuntimeException e) {
-            logger.caught(e);
+            logger.error(e.getMessage(), e);
             return null;
         }
     }
@@ -116,7 +117,7 @@ public class ServiceNotificationSender {
             try {
                 timeStep = new Integer(timeStepString);
             } catch (NumberFormatException e) {
-                logger.caught(e);
+                logger.error(e.getMessage(), e);
             }
         }
         this.initiator = this.notifier.createEntity(workflowID, serviceID, nodeID, timeStep);
@@ -154,7 +155,7 @@ public class ServiceNotificationSender {
             XmlObject bodyObject = XBeansUtil.xmlElementToXmlObject(soapBody);
             this.notifier.sendingResult(this.context,this.invocationContext, headerObject, bodyObject, SENDING_RESULT_MESSAGE);
         } catch (RuntimeException e) {
-            logger.caught(e);
+            logger.error(e.getMessage(), e);
         }
     }
 }
\ No newline at end of file

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderClient.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderClient.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderClient.java Thu Oct  6 19:47:45 2011
@@ -26,6 +26,8 @@ import java.net.URI;
 import org.apache.airavata.common.utils.XMLUtil;
 import org.apache.airavata.xbaya.XBayaConfiguration;
 import org.apache.airavata.xbaya.lead.LeadContextHeaderHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmlpull.v1.builder.XmlElement;
 
 import xsul.lead.LeadContextHeader;
@@ -36,11 +38,10 @@ import xsul.xhandler_soap_sticky_header.
 import xsul.xwsif_runtime.WSIFClient;
 import xsul.xwsif_runtime.WSIFRuntime;
 import xsul.xwsif_runtime_async.WSIFAsyncResponsesCorrelator;
-import xsul5.MLogger;
 
 public class AdderClient {
 
-    private final static MLogger logger = MLogger.getLogger();
+    private final static Logger logger = LoggerFactory.getLogger(AdderClient.class);
 
     private AdderService service;
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderImpl.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderImpl.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderImpl.java Thu Oct  6 19:47:45 2011
@@ -25,21 +25,22 @@ import java.util.Random;
 
 import org.apache.airavata.common.utils.XMLUtil;
 import org.apache.airavata.xbaya.test.service.ServiceNotificationSender;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmlpull.v1.builder.XmlElement;
 import org.xmlpull.v1.builder.XmlNamespace;
 
 import xsul.XmlConstants;
-import xsul5.MLogger;
 
 public class AdderImpl implements Adder {
 
-    private final static MLogger logger = MLogger.getLogger();
+    private final static Logger logger = LoggerFactory.getLogger(AdderImpl.class);
 
     /**
      * @see org.apache.airavata.xbaya.test.service.adder.Adder#add(org.xmlpull.v1.builder.XmlElement)
      */
     public XmlElement add(XmlElement inputElement) {
-        logger.finest(XMLUtil.xmlElementToString(inputElement));
+        logger.info(XMLUtil.xmlElementToString(inputElement));
         ServiceNotificationSender notifier = ServiceNotificationSender.invoked(inputElement);
 
         XmlElement xElement = inputElement.requiredElement(null, "x");
@@ -58,7 +59,7 @@ public class AdderImpl implements Adder 
         try {
             Thread.sleep(msec);
         } catch (InterruptedException e) {
-            logger.caught(e);
+            logger.error(e.getMessage(), e);
         }
 
         String zString = "" + z;
@@ -72,7 +73,7 @@ public class AdderImpl implements Adder 
         if (notifier != null) {
             notifier.sendingResult(outputElement);
         }
-        logger.finest(XMLUtil.xmlElementToString(outputElement));
+        logger.info(XMLUtil.xmlElementToString(outputElement));
         return outputElement;
     }
 }
\ No newline at end of file

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderService.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderService.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderService.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderService.java Thu Oct  6 19:47:45 2011
@@ -24,6 +24,8 @@ package org.apache.airavata.xbaya.test.s
 import java.io.File;
 
 import org.apache.airavata.common.utils.XMLUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import xsul.lead.LeadContextHeader;
 import xsul.wsdl.WsdlDefinitions;
@@ -31,7 +33,6 @@ import xsul.xhandler_soap_sticky_header.
 import xsul.xservo.XService;
 import xsul.xservo_soap.XSoapDocLiteralService;
 import xsul.xservo_soap_http.HttpBasedServices;
-import xsul5.MLogger;
 
 public class AdderService {
 
@@ -41,7 +42,7 @@ public class AdderService {
 
     private final static String OUTPUT_WSDL_LOCATION = "wsdls/sample/adder.wsdl";
 
-    private final static MLogger logger = MLogger.getLogger();
+    private final static Logger logger = LoggerFactory.getLogger(AdderService.class);
 
     private HttpBasedServices httpServices;
 
@@ -124,7 +125,7 @@ public class AdderService {
             File wsdlFile = new File(OUTPUT_WSDL_LOCATION);
             XMLUtil.saveXML(wsdl, wsdlFile);
         } catch (Exception e) {
-            logger.caught(e);
+            logger.error(e.getMessage(), e);
         }
     }
 }
\ No newline at end of file

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverClient.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverClient.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverClient.java Thu Oct  6 19:47:45 2011
@@ -26,6 +26,8 @@ import java.net.URI;
 import org.apache.airavata.common.utils.XMLUtil;
 import org.apache.airavata.xbaya.XBayaConfiguration;
 import org.apache.airavata.xbaya.lead.LeadContextHeaderHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmlpull.v1.builder.XmlElement;
 
 import xsul.lead.LeadContextHeader;
@@ -36,11 +38,10 @@ import xsul.xhandler_soap_sticky_header.
 import xsul.xwsif_runtime.WSIFClient;
 import xsul.xwsif_runtime.WSIFRuntime;
 import xsul.xwsif_runtime_async.WSIFAsyncResponsesCorrelator;
-import xsul5.MLogger;
 
 public class ApproverClient {
 
-    private final static MLogger logger = MLogger.getLogger();
+    private final static Logger logger = LoggerFactory.getLogger(ApproverClient.class);
 
     private ApproverService service;
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverImpl.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverImpl.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverImpl.java Thu Oct  6 19:47:45 2011
@@ -25,21 +25,22 @@ import java.util.Random;
 
 import org.apache.airavata.common.utils.XMLUtil;
 import org.apache.airavata.xbaya.test.service.ServiceNotificationSender;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmlpull.v1.builder.XmlElement;
 import org.xmlpull.v1.builder.XmlNamespace;
 
 import xsul.XmlConstants;
-import xsul5.MLogger;
 
 public class ApproverImpl implements Approver {
 
-    private final static MLogger logger = MLogger.getLogger();
+    private final static Logger logger = LoggerFactory.getLogger(ApproverImpl.class);
 
     /**
      * @see org.apache.airavata.xbaya.test.service.approver.Approver#approve(org.xmlpull.v1.builder.XmlElement)
      */
     public XmlElement approve(XmlElement inputElement) {
-        logger.finest(XMLUtil.xmlElementToString(inputElement));
+        logger.info(XMLUtil.xmlElementToString(inputElement));
         ServiceNotificationSender notifier = ServiceNotificationSender.invoked(inputElement);
 
         XmlElement amountElement = inputElement.requiredElement(null, "amount");
@@ -53,7 +54,7 @@ public class ApproverImpl implements App
         try {
             Thread.sleep(msec);
         } catch (InterruptedException e) {
-            logger.caught(e);
+            logger.error(e.getMessage(), e);
         }
 
         String accept = "No";
@@ -67,7 +68,7 @@ public class ApproverImpl implements App
         if (notifier != null) {
             notifier.sendingResult(outputElement);
         }
-        logger.finest(XMLUtil.xmlElementToString(outputElement));
+        logger.info(XMLUtil.xmlElementToString(outputElement));
         return outputElement;
     }
 }
\ No newline at end of file

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverService.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverService.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverService.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverService.java Thu Oct  6 19:47:45 2011
@@ -24,6 +24,8 @@ package org.apache.airavata.xbaya.test.s
 import java.io.File;
 
 import org.apache.airavata.common.utils.XMLUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import xsul.lead.LeadContextHeader;
 import xsul.wsdl.WsdlDefinitions;
@@ -31,7 +33,6 @@ import xsul.xhandler_soap_sticky_header.
 import xsul.xservo.XService;
 import xsul.xservo_soap.XSoapDocLiteralService;
 import xsul.xservo_soap_http.HttpBasedServices;
-import xsul5.MLogger;
 
 public class ApproverService {
 
@@ -41,7 +42,7 @@ public class ApproverService {
 
     private final static String OUTPUT_WSDL_LOCATION = "wsdls/sample/approver-wsdl.xml";
 
-    private final static MLogger logger = MLogger.getLogger();
+    private final static Logger logger = LoggerFactory.getLogger(ApproverService.class);
 
     private HttpBasedServices httpServices;
 
@@ -124,7 +125,7 @@ public class ApproverService {
             File wsdlFile = new File(OUTPUT_WSDL_LOCATION);
             XMLUtil.saveXML(wsdl, wsdlFile);
         } catch (Exception e) {
-            logger.caught(e);
+            logger.error(e.getMessage(), e);
         }
     }
 }
\ No newline at end of file

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderClient.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderClient.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderClient.java Thu Oct  6 19:47:45 2011
@@ -26,6 +26,8 @@ import java.net.URI;
 import org.apache.airavata.common.utils.XMLUtil;
 import org.apache.airavata.xbaya.XBayaConfiguration;
 import org.apache.airavata.xbaya.lead.LeadContextHeaderHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmlpull.v1.builder.XmlElement;
 
 import xsul.XmlConstants;
@@ -37,11 +39,10 @@ import xsul.xhandler_soap_sticky_header.
 import xsul.xwsif_runtime.WSIFClient;
 import xsul.xwsif_runtime.WSIFRuntime;
 import xsul.xwsif_runtime_async.WSIFAsyncResponsesCorrelator;
-import xsul5.MLogger;
 
 public class ArrayAdderClient {
 
-    private final static MLogger logger = MLogger.getLogger();
+    private final static Logger logger = LoggerFactory.getLogger(ArrayAdderClient.class);
 
     private ArrayAdderService service;
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderImpl.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderImpl.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderImpl.java Thu Oct  6 19:47:45 2011
@@ -26,21 +26,22 @@ import java.util.Random;
 
 import org.apache.airavata.common.utils.XMLUtil;
 import org.apache.airavata.xbaya.test.service.ServiceNotificationSender;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmlpull.v1.builder.XmlElement;
 import org.xmlpull.v1.builder.XmlNamespace;
 
 import xsul.XmlConstants;
-import xsul5.MLogger;
 
 public class ArrayAdderImpl implements ArrayAdder {
 
-    private final static MLogger logger = MLogger.getLogger();
+    private final static Logger logger = LoggerFactory.getLogger(ArrayAdderImpl.class);
 
     /**
      * @see org.apache.airavata.xbaya.test.service.arrayadder.ArrayAdder#add(org.xmlpull.v1.builder.XmlElement)
      */
     public XmlElement add(XmlElement inputElement) {
-        logger.finest(XMLUtil.xmlElementToString(inputElement));
+        logger.info(XMLUtil.xmlElementToString(inputElement));
 
         ServiceNotificationSender notifier = ServiceNotificationSender.invoked(inputElement);
 
@@ -61,7 +62,7 @@ public class ArrayAdderImpl implements A
         try {
             Thread.sleep(msec);
         } catch (InterruptedException e) {
-            logger.caught(e);
+            logger.error(e.getMessage(), e);
         }
 
         String sumString = "" + sum;
@@ -75,7 +76,7 @@ public class ArrayAdderImpl implements A
         if (notifier != null) {
             notifier.sendingResult(outputElement);
         }
-        logger.finest(XMLUtil.xmlElementToString(outputElement));
+        logger.info(XMLUtil.xmlElementToString(outputElement));
         return outputElement;
     }
 }
\ No newline at end of file

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderService.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderService.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderService.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderService.java Thu Oct  6 19:47:45 2011
@@ -24,6 +24,8 @@ package org.apache.airavata.xbaya.test.s
 import java.io.File;
 
 import org.apache.airavata.common.utils.XMLUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import xsul.lead.LeadContextHeader;
 import xsul.wsdl.WsdlDefinitions;
@@ -31,7 +33,6 @@ import xsul.xhandler_soap_sticky_header.
 import xsul.xservo.XService;
 import xsul.xservo_soap.XSoapDocLiteralService;
 import xsul.xservo_soap_http.HttpBasedServices;
-import xsul5.MLogger;
 
 public class ArrayAdderService {
 
@@ -41,7 +42,7 @@ public class ArrayAdderService {
 
     private final static String OUTPUT_WSDL_LOCATION = "wsdls/sample/arrayadder-wsdl.xml";
 
-    private final static MLogger logger = MLogger.getLogger();
+    private final static Logger logger = LoggerFactory.getLogger(ArrayAdderService.class);
 
     private HttpBasedServices httpServices;
 
@@ -124,7 +125,7 @@ public class ArrayAdderService {
             File wsdlFile = new File(OUTPUT_WSDL_LOCATION);
             XMLUtil.saveXML(wsdl, wsdlFile);
         } catch (Exception e) {
-            logger.caught(e);
+            logger.error(e.getMessage(), e);
         }
     }
 }
\ No newline at end of file

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arraygen/ArrayGeneratorClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arraygen/ArrayGeneratorClient.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arraygen/ArrayGeneratorClient.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arraygen/ArrayGeneratorClient.java Thu Oct  6 19:47:45 2011
@@ -26,6 +26,8 @@ import java.net.URI;
 import org.apache.airavata.common.utils.XMLUtil;
 import org.apache.airavata.xbaya.XBayaConfiguration;
 import org.apache.airavata.xbaya.lead.LeadContextHeaderHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmlpull.v1.builder.XmlElement;
 
 import xsul.lead.LeadContextHeader;
@@ -36,11 +38,10 @@ import xsul.xhandler_soap_sticky_header.
 import xsul.xwsif_runtime.WSIFClient;
 import xsul.xwsif_runtime.WSIFRuntime;
 import xsul.xwsif_runtime_async.WSIFAsyncResponsesCorrelator;
-import xsul5.MLogger;
 
 public class ArrayGeneratorClient {
 
-    private final static MLogger logger = MLogger.getLogger();
+    private final static Logger logger = LoggerFactory.getLogger(ArrayGeneratorClient.class);
 
     private ArrayGeneratorService service;
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arraygen/ArrayGeneratorImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arraygen/ArrayGeneratorImpl.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arraygen/ArrayGeneratorImpl.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arraygen/ArrayGeneratorImpl.java Thu Oct  6 19:47:45 2011
@@ -25,21 +25,22 @@ import java.util.Random;
 
 import org.apache.airavata.common.utils.XMLUtil;
 import org.apache.airavata.xbaya.test.service.ServiceNotificationSender;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmlpull.v1.builder.XmlElement;
 import org.xmlpull.v1.builder.XmlNamespace;
 
 import xsul.XmlConstants;
-import xsul5.MLogger;
 
 public class ArrayGeneratorImpl implements ArrayGenerator {
 
-    private final static MLogger logger = MLogger.getLogger();
+    private final static Logger logger = LoggerFactory.getLogger(ArrayGeneratorImpl.class);
 
     /**
      * @see org.apache.airavata.xbaya.test.service.arraygen.ArrayGenerator#generate(org.xmlpull.v1.builder.XmlElement)
      */
     public XmlElement generate(XmlElement inputElement) {
-        logger.finest(XMLUtil.xmlElementToString(inputElement));
+        logger.info(XMLUtil.xmlElementToString(inputElement));
 
         ServiceNotificationSender notifier = ServiceNotificationSender.invoked(inputElement);
 
@@ -54,7 +55,7 @@ public class ArrayGeneratorImpl implemen
         try {
             Thread.sleep(msec);
         } catch (InterruptedException e) {
-            logger.caught(e);
+            logger.error(e.getMessage(), e);
         }
 
         XmlNamespace namespace = XmlConstants.BUILDER.newNamespace("typens",
@@ -70,7 +71,7 @@ public class ArrayGeneratorImpl implemen
         if (notifier != null) {
             notifier.sendingResult(outputElement);
         }
-        logger.finest(XMLUtil.xmlElementToString(outputElement));
+        logger.info(XMLUtil.xmlElementToString(outputElement));
         return outputElement;
     }
 }
\ No newline at end of file

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arraygen/ArrayGeneratorService.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arraygen/ArrayGeneratorService.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arraygen/ArrayGeneratorService.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arraygen/ArrayGeneratorService.java Thu Oct  6 19:47:45 2011
@@ -24,6 +24,8 @@ package org.apache.airavata.xbaya.test.s
 import java.io.File;
 
 import org.apache.airavata.common.utils.XMLUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import xsul.lead.LeadContextHeader;
 import xsul.wsdl.WsdlDefinitions;
@@ -31,7 +33,6 @@ import xsul.xhandler_soap_sticky_header.
 import xsul.xservo.XService;
 import xsul.xservo_soap.XSoapDocLiteralService;
 import xsul.xservo_soap_http.HttpBasedServices;
-import xsul5.MLogger;
 
 public class ArrayGeneratorService {
 
@@ -41,7 +42,7 @@ public class ArrayGeneratorService {
 
     private final static String OUTPUT_WSDL_LOCATION = "wsdls/sample/arraygen-wsdl.xml";
 
-    private final static MLogger logger = MLogger.getLogger();
+    private final static Logger logger = LoggerFactory.getLogger(ArrayGeneratorService.class);
 
     private HttpBasedServices httpServices;
 
@@ -124,7 +125,7 @@ public class ArrayGeneratorService {
             File wsdlFile = new File(OUTPUT_WSDL_LOCATION);
             XMLUtil.saveXML(wsdl, wsdlFile);
         } catch (Exception e) {
-            logger.caught(e);
+            logger.error(e.getMessage(), e);
         }
     }
 }
\ No newline at end of file

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/echo/EchoClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/echo/EchoClient.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/echo/EchoClient.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/echo/EchoClient.java Thu Oct  6 19:47:45 2011
@@ -26,6 +26,8 @@ import java.net.URI;
 import org.apache.airavata.common.utils.XMLUtil;
 import org.apache.airavata.xbaya.XBayaConfiguration;
 import org.apache.airavata.xbaya.lead.LeadContextHeaderHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmlpull.v1.builder.XmlElement;
 
 import xsul.lead.LeadContextHeader;
@@ -36,11 +38,10 @@ import xsul.xhandler_soap_sticky_header.
 import xsul.xwsif_runtime.WSIFClient;
 import xsul.xwsif_runtime.WSIFRuntime;
 import xsul.xwsif_runtime_async.WSIFAsyncResponsesCorrelator;
-import xsul5.MLogger;
 
 public class EchoClient {
 
-    private final static MLogger logger = MLogger.getLogger();
+    private final static Logger logger = LoggerFactory.getLogger(EchoClient.class);
 
     private EchoService service;
 



Mime
View raw message