You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by pa...@apache.org on 2011/10/06 21:47:49 UTC
svn commit: r1179790 [1/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...
Author: patanachai
Date: Thu Oct 6 19:47:45 2011
New Revision: 1179790
URL: http://svn.apache.org/viewvc?rev=1179790&view=rev
Log:
AIRAVATA-109 change to SLF4J
Modified:
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBaya.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentSelector.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/WebComponentRegistry.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/ws/WSComponent.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/event/EventProducer.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/BPELFiler.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/ImageFiler.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/JythonFiler.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/ScuflFiler.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/WorkflowFiler.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gfac/SimpleWSClient.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/GPELClient.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELDeployWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELDeployer.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvokeWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvoker.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELLoader.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELMenu.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/script/BPELScript.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/CepNodeGUI.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicNodeGUI.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/GraphCanvas.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/GraphImpl.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/NodeImpl.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/SubWorkflowNodeGUI.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ConstantNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/InputNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/S3InputNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/gui/InteractionNodeGUI.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/gui/WSNodeGUI.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/gui/WorkflowNodeGUI.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gridchem/gui/GridChemRunnerWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/AboutWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/ErrorWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/WaitDialog.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaGUI.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/AsynchronousInvoker.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GFacInvoker.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GenericInvoker.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/WorkflowInvokerWrapperForGFacInvoker.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/gui/JythonRunnerWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/GFacServiceCreator.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/NotificationSender.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/ServiceNotificationSender.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonClassLoader.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonOneTimeRunnerImpl.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADTypes.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADWorkflowInvoker.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/NotificationHandler.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/modifier/WorkflowModifier.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorConfiguration.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorEventData.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorUtil.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/WsmgClient.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorEventHandler.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorMenu.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorPanel.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorStarter.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/MyProxyClient.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyLoader.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvoker.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/taverna/TavernaRunnerWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/BPELScriptTestCase.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/DSCTestCase.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/DSCUtilTestCase.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GFacServiceCreaterTestCase.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GPELClientTestCase.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/HierarchicalWorkflowTestCase.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/LEADWorkflowInvokerTestCase.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MetadataTestCase.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MyProxyTestCase.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WSDLTestCase.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WSIFTestCase.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowModificationTestCase.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowTestCase.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaSecurityTestCase.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaTestCase.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XRegistryTextCase.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XppTestCase.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/jython/JythonLibraryTest.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/AllServices.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/ServiceNotificationSender.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderClient.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderImpl.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderService.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverClient.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverImpl.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverService.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderClient.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderImpl.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderService.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arraygen/ArrayGeneratorClient.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arraygen/ArrayGeneratorImpl.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arraygen/ArrayGeneratorService.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/echo/EchoClient.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/echo/EchoImpl.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/echo/EchoService.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/multiplier/MultiplierImpl.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/multiplier/MultiplierService.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/Workflow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/gui/WorkflowMenu.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/WorkflowClient.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/proxy/GPELWorkflowClient.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/proxy/WorkflowProxyClient.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xregistry/XRegistryComponent.java
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBaya.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBaya.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBaya.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBaya.java Thu Oct 6 19:47:45 2011
@@ -23,15 +23,14 @@ package org.apache.airavata.xbaya;
import java.net.URI;
import java.net.URISyntaxException;
-import java.util.Vector;
import org.apache.airavata.xbaya.gui.ErrorMessages;
-
-import xsul5.MLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class XBaya {
- private static MLogger logger = MLogger.getLogger();
+ private static final Logger logger = LoggerFactory.getLogger(XBaya.class);
private XBayaConfiguration config;
@@ -50,14 +49,14 @@ public class XBaya {
this.engine = new XBayaEngine(this.config);
} catch (RuntimeException e) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
try {
this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
} catch (Throwable t) {
// Cannot do anything
}
} catch (Error e) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
try {
this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
} catch (Throwable t) {
@@ -108,7 +107,7 @@ public class XBaya {
this.config.loadConfiguration(configPath);
} catch (RuntimeException e) {
String message = "Error while reading config file, " + configPath;
- logger.warning(message, e);
+ logger.warn(message, e);
this.config.addError(new XBayaException(message, e));
}
} else if ("-title".equalsIgnoreCase(arg)) {
@@ -124,7 +123,7 @@ public class XBaya {
this.config.setXRegistryURL(parseURL(url));
} catch (URISyntaxException e) {
String message = "The XRegistry URL is in wrong format: " + url;
- logger.warning(message, e);
+ logger.warn(message, e);
this.config.addError(new XBayaException(message, e));
}
} else if ("-gfacURL".equalsIgnoreCase(arg)) {
@@ -134,7 +133,7 @@ public class XBaya {
this.config.setGFacURL(parseURL(url));
} catch (URISyntaxException e) {
String message = "The GFac URL is in wrong format: " + url;
- logger.warning(message, e);
+ logger.warn(message, e);
this.config.addError(new XBayaException(message, e));
}
} else if ("-dscURL".equalsIgnoreCase(arg)) {
@@ -144,7 +143,7 @@ public class XBaya {
this.config.setDSCURL(parseURL(url));
} catch (URISyntaxException e) {
String message = "The DSC URL is in wrong format: " + url;
- logger.warning(message, e);
+ logger.warn(message, e);
this.config.addError(new XBayaException(message, e));
}
} else if ("-startMonitor".equalsIgnoreCase(arg)) {
@@ -156,7 +155,7 @@ public class XBaya {
this.config.setBrokerURL(parseURL(brokerURL));
} catch (URISyntaxException e) {
String message = "The broker URL is in wrong format: " + brokerURL;
- logger.warning(message, e);
+ logger.warn(message, e);
this.config.addError(new XBayaException(message, e));
}
} else if ("-odeEngine".equalsIgnoreCase(arg)) {
@@ -184,7 +183,7 @@ public class XBaya {
this.config.setPullMode(false);
} else {
String message = "-pullMode has to be either true or false, not " + nextArg;
- logger.warning(message);
+ logger.warn(message);
this.config.addError(new XBayaException(message));
}
} else {
@@ -198,7 +197,7 @@ public class XBaya {
this.config.setMessageBoxURL(parseURL(messageBoxURL));
} catch (URISyntaxException e) {
String message = "The message box URL is in wrong format: " + messageBoxURL;
- logger.warning(message, e);
+ logger.warn(message, e);
this.config.addError(new XBayaException(message, e));
}
} else if ("-registryURL".equalsIgnoreCase(arg)) {
@@ -208,7 +207,7 @@ public class XBaya {
this.config.setRegistryURL(parseURL(registryURL));
} catch (URISyntaxException e) {
String message = "The message box URL is in wrong format: " + registryURL;
- logger.warning(message, e);
+ logger.warn(message, e);
this.config.addError(new XBayaException(message, e));
}
} else if ("-registryUserName".equalsIgnoreCase(arg)) {
@@ -236,7 +235,7 @@ public class XBaya {
// this.config.setMyProxyPort(Integer.parseInt(port));
// } catch (NumberFormatException e) {
// String message = "The myProxyPort must be an integer: " + port;
-// logger.warning(message, e);
+// logger.warn(message, e);
// this.config.addError(new XBayaException(message, e));
// }
// } else if ("-myProxyUsername".equalsIgnoreCase(arg)) {
@@ -252,7 +251,7 @@ public class XBaya {
// this.config.setMyProxyLifetime(Integer.parseInt(lifetime));
// } catch (NumberFormatException e) {
// String message = "The myProxyLifetime must be an integer: " + lifetime;
-// logger.warning(message, e);
+// logger.warn(message, e);
// this.config.addError(new XBayaException(message, e));
// }
// } else if ("-loadMyProxy".equalsIgnoreCase(arg)) {
@@ -264,7 +263,7 @@ public class XBaya {
// this.config.setLoadMyProxy(false);
// } else {
// String message = "-loadMyProxy has to be either true or false, not " + load;
-// logger.warning(message);
+// logger.warn(message);
// this.config.addError(new XBayaException(message));
// }
// }
@@ -275,7 +274,7 @@ public class XBaya {
this.config.setWidth(Integer.parseInt(width));
} catch (NumberFormatException e) {
String message = "The width must be an integer: " + width;
- logger.warning(message, e);
+ logger.warn(message, e);
this.config.addError(new XBayaException(message, e));
}
} else if ("-height".equalsIgnoreCase(arg)) {
@@ -285,7 +284,7 @@ public class XBaya {
this.config.setHeight(Integer.parseInt(height));
} catch (NumberFormatException e) {
String message = "The height must be an integer: " + height;
- logger.warning(message, e);
+ logger.warn(message, e);
this.config.addError(new XBayaException(message, e));
}
} else if ("-exitOnClose".equalsIgnoreCase(arg)) {
@@ -296,17 +295,17 @@ public class XBaya {
}
} else {
String message = "Unknown option: " + arg;
- logger.severe(message);
+ logger.error(message);
this.config.addError(new XBayaException(message));
}
index++;
}
} catch (ArrayIndexOutOfBoundsException e) {
String message = "Argument is missing after " + args[args.length - 1];
- logger.severe(message, e);
+ logger.error(message, e);
this.config.addError(new XBayaException(message));
} catch (Throwable e) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
String message = "Unknown error while parsing the arguments";
this.config.addError(new XBayaException(message, e));
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java Thu Oct 6 19:47:45 2011
@@ -28,13 +28,14 @@ import java.util.List;
import org.apache.airavata.xbaya.component.registry.JCRComponentRegistry;
import org.apache.airavata.xbaya.file.XBayaPathConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import xsul.lead.LeadDeploymentConfig;
-import xsul5.MLogger;
public class XBayaConfiguration {
- private static final MLogger logger = MLogger.getLogger();
+ private static final Logger logger = LoggerFactory.getLogger(XBayaConfiguration.class);
private String title = XBayaConstants.APPLICATION_NAME;
@@ -135,7 +136,7 @@ public class XBayaConfiguration {
}
} catch (RuntimeException e) {
String message = "Error while reading a configuration file, " + systemConfig;
- logger.warning(message, e);
+ logger.warn(message, e);
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java Thu Oct 6 19:47:45 2011
@@ -54,12 +54,12 @@ import org.apache.airavata.xbaya.workflo
import org.apache.airavata.xbaya.workflow.WorkflowEngineManager;
import org.apache.airavata.xbaya.xregistry.XRegistryAccesser;
import org.apache.airavata.xbaya.xregistry.XRegistryComponent;
-
-import xsul5.MLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class XBayaEngine {
- private static final MLogger logger = MLogger.getLogger();
+ private static final Logger logger = LoggerFactory.getLogger(XBayaEngine.class);
private XBayaConfiguration configuration;
@@ -224,7 +224,6 @@ public class XBayaEngine {
* Initialization process. This method is called after the GUI is initialized.
*/
private void initAfterGUI() {
- logger.entering();
// Initialize security at the beginning.
initSecurity();
@@ -273,7 +272,6 @@ public class XBayaEngine {
* Initializes registris.
*/
private void initRegistry() {
- logger.entering();
final ComponentSelector componentTreeViewer = this.gui.getComponentSelector();
try {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentSelector.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentSelector.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentSelector.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentSelector.java Thu Oct 6 19:47:45 2011
@@ -63,8 +63,8 @@ import org.apache.airavata.xbaya.compone
import org.apache.airavata.xbaya.component.ws.WSComponent;
import org.apache.airavata.xbaya.gui.ErrorMessages;
import org.apache.airavata.xbaya.gui.XBayaComponent;
-
-import xsul5.MLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The ComponentTreeViewer class shows the selectedComponent tree.
@@ -77,7 +77,7 @@ public class ComponentSelector implement
*/
public static final String TITLE = "Component List";
- private static final MLogger logger = MLogger.getLogger();
+ private static final Logger logger = LoggerFactory.getLogger(ComponentSelector.class);
private XBayaEngine engine;
@@ -236,15 +236,13 @@ public class ComponentSelector implement
SwingUtilities.invokeLater(new Runnable() {
public void run() {
- logger.entering();
ComponentTreeNode root = ComponentSelector.this.treeModel.getRoot();
ComponentSelector.this.treeModel.removeChildren(root);
- logger.finest("Removed all");
+ logger.info("Removed all");
for (ComponentTreeNode subTree : newSubTrees) {
ComponentSelector.this.treeModel.addNodeInto(subTree, root);
}
makeVisible((ComponentTreeNode) root.getFirstChild());
- logger.exiting();
}
});
@@ -312,7 +310,6 @@ public class ComponentSelector implement
* The path of the selected selectedComponent.
*/
private void select(TreePath treePath) {
- logger.entering(treePath);
final ComponentTreeNode selectedNode = (ComponentTreeNode) treePath.getLastPathComponent();
final ComponentReference componentReference = selectedNode.getComponentReference();
selectComponent(null);
@@ -353,7 +350,6 @@ public class ComponentSelector implement
}.start();
}
- logger.exiting();
}
private void expandTreeLeaf(ComponentTreeNode selectedNode, List<? extends Component> components) {
@@ -426,7 +422,7 @@ public class ComponentSelector implement
renderer.setClosedIcon(SwingUtil.createImageIcon("closed.gif"));
renderer.setLeafIcon(SwingUtil.createImageIcon("leaf.gif"));
} catch (RuntimeException e) {
- logger.warning("Failed to load image icons. " + "It will use the default icons instead.", e);
+ logger.warn("Failed to load image icons. " + "It will use the default icons instead.", e);
}
this.tree.setCellRenderer(renderer);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java Thu Oct 6 19:47:45 2011
@@ -26,12 +26,12 @@ import org.apache.airavata.xbaya.compone
import org.apache.airavata.xbaya.gui.Cancelable;
import org.apache.airavata.xbaya.gui.ErrorMessages;
import org.apache.airavata.xbaya.gui.WaitDialog;
-
-import xsul5.MLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ComponentRegistryLoader implements Cancelable {
- private static final MLogger logger = MLogger.getLogger();
+ private static final Logger logger = LoggerFactory.getLogger(ComponentRegistryLoader.class);
private XBayaEngine engine;
@@ -86,7 +86,6 @@ public class ComponentRegistryLoader imp
* @param registry
*/
private void runInThread(ComponentRegistry registry) {
- logger.entering();
try {
ComponentTreeNode componentTree = registry.getComponentTree();
if (this.canceled) {
@@ -96,14 +95,14 @@ public class ComponentRegistryLoader imp
this.loadingDialog.hide();
} catch (ComponentRegistryException e) {
if (this.canceled) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
} else {
this.engine.getErrorWindow().error(ErrorMessages.COMPONENT_LIST_LOAD_ERROR, e);
this.loadingDialog.hide();
}
} catch (RuntimeException e) {
if (this.canceled) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
} else {
this.engine.getErrorWindow().error(ErrorMessages.COMPONENT_LIST_LOAD_ERROR, e);
this.loadingDialog.hide();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/WebComponentRegistry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/WebComponentRegistry.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/WebComponentRegistry.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/WebComponentRegistry.java Thu Oct 6 19:47:45 2011
@@ -37,17 +37,17 @@ import javax.swing.text.html.HTML.Tag;
import javax.swing.text.html.HTMLEditorKit;
import javax.swing.text.html.parser.ParserDelegator;
+import org.apache.airavata.common.utils.IOUtil;
import org.apache.airavata.xbaya.component.ComponentException;
import org.apache.airavata.xbaya.component.gui.ComponentTreeNode;
import org.apache.airavata.xbaya.component.ws.WSComponent;
import org.apache.airavata.xbaya.component.ws.WSComponentFactory;
-import org.apache.airavata.common.utils.IOUtil;
-
-import xsul5.MLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class WebComponentRegistry extends ComponentRegistry {
- private static final MLogger logger = MLogger.getLogger();
+ private static final Logger logger = LoggerFactory.getLogger(WebComponentRegistry.class);
private URL url;
@@ -120,7 +120,7 @@ public class WebComponentRegistry extend
// TODO checking 3 is not enough
while (String.valueOf(connection.getResponseCode()).startsWith("3")) {
String location = connection.getHeaderField("Location");
- logger.finest("Redirecting to " + location);
+ logger.info("Redirecting to " + location);
connection.disconnect();
this.url = new URL(location);
connection = (HttpURLConnection) this.url.openConnection();
@@ -146,22 +146,22 @@ public class WebComponentRegistry extend
private void addComponents(String name) {
try {
URL wsdlUrl = new URL(this.url, name);
- logger.finest("WSDL URL: " + wsdlUrl);
+ logger.info("WSDL URL: " + wsdlUrl);
String wsdlString = IOUtil.readToString(wsdlUrl.openStream());
- logger.finest("WSDL: " + wsdlString);
+ logger.info("WSDL: " + wsdlString);
List<WSComponent> components = WSComponentFactory.createComponents(wsdlString);
addComponents(name, components);
} catch (MalformedURLException e) {
// Ignore
- logger.caught(e);
+ logger.error(e.getMessage(), e);
} catch (IOException e) {
// Ignore
- logger.caught(e);
+ logger.error(e.getMessage(), e);
} catch (ComponentException e) {
// Malformed WSDL.
- logger.caught(e);
+ logger.error(e.getMessage(), e);
} catch (RuntimeException e) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
}
}
@@ -180,8 +180,6 @@ public class WebComponentRegistry extend
*/
@Override
public void handleStartTag(Tag tag, MutableAttributeSet attrSet, int pos) {
- logger.entering(new Object[] { tag, attrSet, new Integer(pos) });
-
if (tag == HTML.Tag.A) {
String name = (String) attrSet.getAttribute(HTML.Attribute.HREF);
addComponents(name);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/ws/WSComponent.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/ws/WSComponent.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/ws/WSComponent.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/ws/WSComponent.java Thu Oct 6 19:47:45 2011
@@ -38,10 +38,11 @@ import org.apache.airavata.xbaya.gpel.DS
import org.apache.airavata.xbaya.graph.Graph;
import org.apache.airavata.xbaya.graph.Node;
import org.apache.airavata.xbaya.graph.ws.WSNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlCharacters;
import org.xmlpull.infoset.XmlElement;
-import xsul5.MLogger;
import xsul5.wsdl.WsdlDefinitions;
import xsul5.wsdl.WsdlDocumentation;
import xsul5.wsdl.WsdlMessage;
@@ -53,7 +54,7 @@ import xsul5.wsdl.WsdlPortTypeOutput;
public class WSComponent extends Component {
- private static final MLogger logger = MLogger.getLogger();
+ private static final Logger logger = LoggerFactory.getLogger(WSComponent.class);
protected WsdlDefinitions wsdl;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/event/EventProducer.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/event/EventProducer.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/event/EventProducer.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/event/EventProducer.java Thu Oct 6 19:47:45 2011
@@ -26,12 +26,12 @@ import java.util.List;
import org.apache.airavata.xbaya.XBayaException;
import org.apache.airavata.xbaya.XBayaRuntimeException;
-
-import xsul5.MLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class EventProducer {
- private static final MLogger logger = MLogger.getLogger();
+ private static final Logger logger = LoggerFactory.getLogger(EventProducer.class);
private List<EventListener> listeners = new LinkedList<EventListener>();
@@ -58,7 +58,7 @@ public abstract class EventProducer {
try {
listener.eventReceived(event);
} catch (Throwable e) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
// Just remember the first one.
if (exception == null) {
exception = e;
@@ -86,7 +86,7 @@ public abstract class EventProducer {
try {
listener.eventReceived(event);
} catch (Throwable e) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
// Just remember the first one.
if (exception == null) {
exception = e;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java Thu Oct 6 19:47:45 2011
@@ -35,6 +35,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.XBayaConfiguration;
import org.apache.airavata.xbaya.XBayaConstants;
@@ -55,17 +56,17 @@ import org.apache.airavata.xbaya.jython.
import org.apache.airavata.xbaya.monitor.MonitorConfiguration;
import org.apache.airavata.xbaya.monitor.MonitorException;
import org.apache.airavata.xbaya.ode.ODEClient;
-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 WorkflowInterpreterLaunchWindow {
- private static final MLogger logger = MLogger.getLogger();
+ private static final Logger logger = LoggerFactory.getLogger(WorkflowInterpreterLaunchWindow.class);
private XBayaEngine engine;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/BPELFiler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/BPELFiler.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/BPELFiler.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/BPELFiler.java Thu Oct 6 19:47:45 2011
@@ -39,12 +39,12 @@ import org.apache.airavata.xbaya.graph.G
import org.apache.airavata.xbaya.gui.ErrorMessages;
import org.apache.airavata.xbaya.wf.Workflow;
import org.gpel.model.GpelProcess;
-
-import xsul5.MLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class BPELFiler {
- private static MLogger logger = MLogger.getLogger();
+ private static Logger logger = LoggerFactory.getLogger(BPELFiler.class);
private XBayaEngine engine;
@@ -106,7 +106,7 @@ public class BPELFiler {
int returnVal = this.bpelFileChooser.showSaveDialog(this.engine.getGUI().getFrame());
if (returnVal == JFileChooser.APPROVE_OPTION) {
File file = this.bpelFileChooser.getSelectedFile();
- logger.finest(file.getPath());
+ logger.info(file.getPath());
String path = file.getPath();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/ImageFiler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/ImageFiler.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/ImageFiler.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/ImageFiler.java Thu Oct 6 19:47:45 2011
@@ -32,12 +32,12 @@ import javax.swing.filechooser.FileFilte
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.gui.ErrorMessages;
-
-import xsul5.MLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ImageFiler {
- private static MLogger logger = MLogger.getLogger();
+ private static Logger logger = LoggerFactory.getLogger(ImageFiler.class);
private XBayaEngine engine;
@@ -81,7 +81,7 @@ public class ImageFiler {
int returnVal = this.pngFileChooser.showSaveDialog(this.engine.getGUI().getFrame());
if (returnVal == JFileChooser.APPROVE_OPTION) {
File file = this.pngFileChooser.getSelectedFile();
- logger.finest(file.getPath());
+ logger.info(file.getPath());
// Put ".png" at the end of the file name
String path = file.getPath();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/JythonFiler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/JythonFiler.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/JythonFiler.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/JythonFiler.java Thu Oct 6 19:47:45 2011
@@ -36,12 +36,12 @@ import org.apache.airavata.xbaya.graph.G
import org.apache.airavata.xbaya.gui.ErrorMessages;
import org.apache.airavata.xbaya.jython.script.JythonScript;
import org.apache.airavata.xbaya.wf.Workflow;
-
-import xsul5.MLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class JythonFiler {
- private static MLogger logger = MLogger.getLogger();
+ private static Logger logger = LoggerFactory.getLogger(JythonFiler.class);
private XBayaEngine engine;
@@ -100,7 +100,7 @@ public class JythonFiler {
int returnVal = this.jythonFileChooser.showSaveDialog(this.engine.getGUI().getFrame());
if (returnVal == JFileChooser.APPROVE_OPTION) {
File file = this.jythonFileChooser.getSelectedFile();
- logger.finest(file.getPath());
+ logger.info(file.getPath());
// Put ".py" at the end of the file name
String path = file.getPath();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/ScuflFiler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/ScuflFiler.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/ScuflFiler.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/ScuflFiler.java Thu Oct 6 19:47:45 2011
@@ -28,20 +28,20 @@ import java.util.ArrayList;
import javax.swing.JFileChooser;
import javax.swing.filechooser.FileFilter;
+import org.apache.airavata.common.utils.IOUtil;
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.file.XBayaPathConstants;
import org.apache.airavata.xbaya.graph.GraphException;
import org.apache.airavata.xbaya.gui.ErrorMessages;
import org.apache.airavata.xbaya.scufl.script.ScuflScript;
-import org.apache.airavata.common.utils.IOUtil;
import org.apache.airavata.xbaya.wf.Workflow;
-
-import xsul5.MLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ScuflFiler {
- private static MLogger logger = MLogger.getLogger();
+ private static Logger logger = LoggerFactory.getLogger(ScuflFiler.class);
private XBayaEngine engine;
@@ -99,7 +99,7 @@ public class ScuflFiler {
int returnVal = this.scuflFileChooser.showSaveDialog(this.engine.getGUI().getFrame());
if (returnVal == JFileChooser.APPROVE_OPTION) {
File file = this.scuflFileChooser.getSelectedFile();
- logger.finest(file.getPath());
+ logger.info(file.getPath());
// Put ".py" at the end of the file name
String path = file.getPath();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/WorkflowFiler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/WorkflowFiler.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/WorkflowFiler.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/WorkflowFiler.java Thu Oct 6 19:47:45 2011
@@ -37,13 +37,13 @@ import org.apache.airavata.xbaya.graph.w
import org.apache.airavata.xbaya.graph.ws.WSGraphFactory;
import org.apache.airavata.xbaya.gui.ErrorMessages;
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 WorkflowFiler {
- private static MLogger logger = MLogger.getLogger();
+ private static Logger logger = LoggerFactory.getLogger(WorkflowFiler.class);
private XBayaEngine engine;
@@ -106,7 +106,7 @@ public class WorkflowFiler {
if (returnVal == JFileChooser.APPROVE_OPTION) {
File file = this.graphFileChooser.getSelectedFile();
- logger.finest(file.getPath());
+ logger.info(file.getPath());
try {
String path = file.getPath();
@@ -141,7 +141,7 @@ public class WorkflowFiler {
int returnVal = this.graphFileChooser.showSaveDialog(this.engine.getGUI().getFrame());
if (returnVal == JFileChooser.APPROVE_OPTION) {
File file = this.graphFileChooser.getSelectedFile();
- logger.finest(file.getPath());
+ logger.info(file.getPath());
// Put ".xwf" at the end of the file name
String path = file.getPath();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gfac/SimpleWSClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gfac/SimpleWSClient.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gfac/SimpleWSClient.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gfac/SimpleWSClient.java Thu Oct 6 19:47:45 2011
@@ -26,6 +26,8 @@ import java.util.Collection;
import java.util.Iterator;
import org.apache.airavata.xbaya.component.registry.ComponentRegistryException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.v1.builder.XmlElement;
import org.xmlpull.v1.builder.XmlInfosetBuilder;
@@ -36,7 +38,6 @@ import xsul.wsif.WSIFPort;
import xsul.wsif.impl.WSIFMessageElement;
import xsul.xwsif_runtime.WSIFClient;
import xsul.xwsif_runtime.WSIFRuntime;
-import xsul5.MLogger;
/**
* This is a Simple Web Service client for easy SOAP Messages creation
@@ -44,7 +45,7 @@ import xsul5.MLogger;
*/
public class SimpleWSClient {
- private static final MLogger logger = MLogger.getLogger();
+ private static final Logger logger = LoggerFactory.getLogger(SimpleWSClient.class);
private static final XmlInfosetBuilder builder = XmlConstants.BUILDER;
@@ -88,7 +89,7 @@ public class SimpleWSClient {
boolean success = operation.executeRequestResponseOperation(inputMessage, outputMessage, faultMessage);
if (success) {
- logger.finest("" + outputMessage);
+ logger.info("" + outputMessage);
return outputMessage;
} else {
throw new ComponentRegistryException("Excpetion at server " + faultMessage);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/GPELClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/GPELClient.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/GPELClient.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/GPELClient.java Thu Oct 6 19:47:45 2011
@@ -134,7 +134,7 @@ public class GPELClient extends Workflow
template = this.client.retrieveTemplate(templateID);
} catch (GcResourceNotFoundException e) {
// The workflow was not found in the engine.
- logger.caught(e);
+ logger.error(e.getMessage(), e);
template = null;
} catch (RuntimeException e) {
throw new WorkflowEngineException(ErrorMessages.GPEL_ERROR, e);
@@ -159,7 +159,7 @@ public class GPELClient extends Workflow
// Look for each resource.
for (GcWebResource link : links) {
String rel = link.getRel();
- logger.finest("rel: " + rel);
+ logger.info("rel: " + rel);
if (GpelConstants.REL_PROCESS.equals(rel)) {
processResource = (GcProcessResource) link;
} else if (GPELLinksFilter.REL_XWF.equals(rel)) {
@@ -169,7 +169,7 @@ public class GPELClient extends Workflow
} else if (GpelConstants.REL_WSDL.equals(rel)) {
GcWsdlResource wsdlResouece = (GcWsdlResource) link;
String wsdlTitle = wsdlResouece.getTitle();
- logger.finest("wsdlTitle: " + wsdlTitle);
+ logger.info("wsdlTitle: " + wsdlTitle);
// XXX Can we rely on the title to do the matching?
wsdlResourceMap.put(wsdlTitle, wsdlResouece);
}
@@ -188,7 +188,7 @@ public class GPELClient extends Workflow
// WSDL for the process
workflowWSDLresource = wsdlResourceMap.remove(PROCESS_WSDL_TYTLE);
WsdlDefinitions workflowWSDL = workflow.getWorkflowWSDL();
- logger.finest(workflowWSDL.xmlString());
+ logger.info(workflowWSDL.xmlString());
if (workflowWSDLresource == null) {
workflowWSDLresource = new GcWsdlResource(PROCESS_WSDL_TYTLE, workflowWSDL);
links.add(workflowWSDLresource);
@@ -216,12 +216,12 @@ public class GPELClient extends Workflow
// Graph
Graph graph = workflow.getGraph();
if (graphResource == null) {
- logger.finest("Creating a new graphResource");
+ logger.info("Creating a new graphResource");
graphResource = new GcXmlWebResource("process.xgr", graph.toXML(), GRAPH_MIME_TYPE);
graphResource.setRel(GPELLinksFilter.REL_XWF);
links.add(graphResource);
} else {
- logger.finest("Updating the graphResource");
+ logger.info("Updating the graphResource");
graphResource.setXmlContent(graph.toXML());
}
@@ -241,10 +241,10 @@ public class GPELClient extends Workflow
}
} catch (IOException e) {
// It's OK to not save the image for now.
- logger.caught(e);
+ logger.error(e.getMessage(), e);
} catch (IllegalArgumentException e) {
// This happens only from junit tests.
- logger.caught(e);
+ logger.error(e.getMessage(), e);
}
try {
@@ -254,7 +254,6 @@ public class GPELClient extends Workflow
URI templateID = template.getTemplateId();
workflow.setGPELTemplateID(templateID);
- logger.exiting();
return templateID;
} catch (RuntimeException e) {
throw new WorkflowEngineException(ErrorMessages.GPEL_ERROR, e);
@@ -271,7 +270,7 @@ public class GPELClient extends Workflow
*/
public synchronized Workflow load(URI id, WorkflowType workflowType) throws GraphException,
WorkflowEngineException, ComponentException {
- logger.entering(new Object[] { id, workflowType });
+ logger.debug("ID: " + id.toString() + " Type:" + workflowType );
if (!isConnected()) {
throw new IllegalStateException("The BPEL Engine has not configured.");
@@ -344,11 +343,11 @@ public class GPELClient extends Workflow
List<GcWebResource> links = workflowTemplate.getLinks();
for (GcWebResource link : links) {
String rel = link.getRel();
- logger.finest("rel: " + rel);
+ logger.info("rel: " + rel);
if (GpelConstants.REL_WSDL.equals(rel)) {
GcWsdlResource wsdlResouece = (GcWsdlResource) link;
String wsdlTitle = wsdlResouece.getTitle();
- logger.finest("wsdlTitle: " + wsdlTitle);
+ logger.info("wsdlTitle: " + wsdlTitle);
// Use use title to do matching
wsdlResourceMap.put(wsdlTitle, wsdlResouece);
}
@@ -382,11 +381,11 @@ public class GPELClient extends Workflow
String name = null;
if (workflowInstance != null) {
name = workflowInstance.getTitle();
- logger.finest("name from the instance: " + name);
+ logger.info("name from the instance: " + name);
}
if (name == null) {
name = workflowTemplate.getTitle();
- logger.finest("name from the template: " + name);
+ logger.info("name from the template: " + name);
}
workflow.setName(name);
@@ -398,7 +397,7 @@ public class GPELClient extends Workflow
workflow.setImage(image);
} catch (IOException e) {
// Not crucial
- logger.caught(e);
+ logger.error(e.getMessage(), e);
}
}
@@ -416,7 +415,7 @@ public class GPELClient extends Workflow
*/
@SuppressWarnings("boxing")
public synchronized GcSearchList list(int maxNum, WorkflowType type) throws WorkflowEngineException {
- logger.entering(new Object[] { maxNum, type });
+ logger.debug("Maxnum: " + maxNum + " Type: " + type);
if (!isConnected()) {
throw new IllegalStateException("The BPEL Engine has not configured.");
}
@@ -480,26 +479,26 @@ public class GPELClient extends Workflow
if (name != null) {
String title = instance.getTitle();
title = title + " (" + name + ")";
- logger.finest("new title: " + title);
+ logger.info("new title: " + title);
instance.setTitle(title);
}
Graph graph = workflow.getGraph();
for (WSNode node : GraphUtil.getNodes(graph, WSNode.class)) {
String partnerLinkName = BPELScript.createPartnerLinkName(node.getID());
- logger.finest("partnerLinkName: " + partnerLinkName);
+ logger.info("partnerLinkName: " + partnerLinkName);
WsdlDefinitions wsdl = node.getComponent().getWSDL();
- logger.finest("WSDL QName: " + WSDLUtil.getWSDLQName(wsdl));
+ logger.info("WSDL QName: " + WSDLUtil.getWSDLQName(wsdl));
if (WSDLUtil.isAWSDL(wsdl)) {
URI subWorkflowTemplateID = WorkflowComponent.getWorkflowTemplateID(wsdl);
if (subWorkflowTemplateID == null) {
// It's a service AWSDL. Create a CWSDL that uses DSC.
- logger.finest("service");
+ logger.info("service");
wsdl = DSCUtil.convertToCWSDL(WSDLUtil.deepClone(wsdl), dscURL);
} else {
// It's a workflow WSDL.
- logger.finest("workflow");
+ logger.info("workflow");
// recursively instantiate and start sub-workflows.
Workflow subWorkflow = load(subWorkflowTemplateID, WorkflowType.TEMPLATE);
GcInstance subInstance = instantiate(subWorkflow, dscURL, name);
@@ -614,12 +613,12 @@ public class GPELClient extends Workflow
return;
}
- logger.finest("Connecting a GPEL Engine at " + this.engineURL);
+ logger.info("Connecting a GPEL Engine at " + this.engineURL);
try {
Transport transport;
if (isSecure()) {
if (this.gpelUserX509Credential == null) {
- logger.finest("Using ssl without any credential.");
+ logger.info("Using ssl without any credential.");
this.gpelUserX509Credential = new GpelUserX509Credential(null,
XBayaSecurity.getTrustedCertificates());
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELDeployWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELDeployWindow.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELDeployWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELDeployWindow.java Thu Oct 6 19:47:45 2011
@@ -44,12 +44,12 @@ import org.apache.airavata.xbaya.wf.Work
import org.apache.airavata.xbaya.workflow.WorkflowClient;
import org.apache.airavata.xbaya.workflow.WorkflowEngineException;
import org.ietf.jgss.GSSCredential;
-
-import xsul5.MLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class GPELDeployWindow {
- private static final MLogger logger = MLogger.getLogger();
+ private static final Logger logger = LoggerFactory.getLogger(GPELDeployWindow.class);
protected XBayaEngine engine;
@@ -132,7 +132,7 @@ public class GPELDeployWindow {
this.redeployButton.setEnabled(true);
}
- logger.finest("before show");
+ logger.info("before show");
this.dialog.show();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELDeployer.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELDeployer.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELDeployer.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELDeployer.java Thu Oct 6 19:47:45 2011
@@ -30,12 +30,12 @@ import org.apache.airavata.xbaya.gui.Wai
import org.apache.airavata.xbaya.wf.Workflow;
import org.apache.airavata.xbaya.workflow.WorkflowClient;
import org.apache.airavata.xbaya.workflow.WorkflowEngineException;
-
-import xsul5.MLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class GPELDeployer implements Cancelable {
- private static final MLogger logger = MLogger.getLogger();
+ private static final Logger logger = LoggerFactory.getLogger(GPELDeployer.class);
private XBayaEngine engine;
@@ -101,28 +101,28 @@ public class GPELDeployer implements Can
this.deployingDialog.hide();
} catch (GraphException e) {
if (this.canceled) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
} else {
this.engine.getErrorWindow().error(ErrorMessages.GRAPH_NOT_READY_ERROR, e);
this.deployingDialog.hide();
}
} catch (WorkflowEngineException e) {
if (this.canceled) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
} else {
this.engine.getErrorWindow().error(ErrorMessages.GPEL_ERROR, e);
this.deployingDialog.hide();
}
} catch (ComponentException e) {
if (this.canceled) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
} else {
this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
this.deployingDialog.hide();
}
} catch (RuntimeException e) {
if (this.canceled) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
} else {
this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
this.deployingDialog.hide();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvokeWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvokeWindow.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvokeWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvokeWindow.java Thu Oct 6 19:47:45 2011
@@ -63,7 +63,7 @@ import org.xmlpull.infoset.XmlElement;
public class GPELInvokeWindow {
- // private static final MLogger logger = MLogger.getLogger();
+ // private static final Logger logger = LoggerFactory.getLogger();
protected XBayaEngine engine;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvoker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvoker.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvoker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvoker.java Thu Oct 6 19:47:45 2011
@@ -43,16 +43,17 @@ import org.apache.airavata.xbaya.wf.Work
import org.apache.airavata.xbaya.workflow.WorkflowClient;
import org.apache.airavata.xbaya.workflow.WorkflowEngineException;
import org.gpel.client.GcInstance;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import xsul.XmlConstants;
import xsul.invoker.gsi.GsiInvoker;
import xsul.lead.LeadContextHeader;
-import xsul5.MLogger;
import xsul5.wsdl.WsdlDefinitions;
public class GPELInvoker implements Cancelable {
- private static final MLogger logger = MLogger.getLogger();
+ private static final Logger logger = LoggerFactory.getLogger(GPELInvoker.class);
private XBayaEngine engine;
@@ -110,7 +111,7 @@ public class GPELInvoker implements Canc
client.deploy(workflow, redeploy);
} catch (WorkflowEngineException e) {
if (this.canceled) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
} else {
this.engine.getErrorWindow().error(ErrorMessages.GPEL_ERROR, e);
this.invokingDialog.hide();
@@ -118,7 +119,7 @@ public class GPELInvoker implements Canc
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();
@@ -126,7 +127,7 @@ public class GPELInvoker implements Canc
return;
} catch (Error e) {
if (this.canceled) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
} else {
this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
this.invokingDialog.hide();
@@ -143,7 +144,7 @@ public class GPELInvoker implements Canc
wsdl = client.start(instance);
} catch (WorkflowEngineException e) {
if (this.canceled) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
} else {
this.engine.getErrorWindow().error(ErrorMessages.GPEL_ERROR, e);
this.invokingDialog.hide();
@@ -151,7 +152,7 @@ public class GPELInvoker implements Canc
return;
} catch (ComponentException e) {
if (this.canceled) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
} else {
this.engine.getErrorWindow().error(ErrorMessages.GPEL_ERROR, e);
this.invokingDialog.hide();
@@ -159,7 +160,7 @@ public class GPELInvoker implements Canc
return;
} catch (GraphException e) {
if (this.canceled) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
} else {
this.engine.getErrorWindow().error(ErrorMessages.GPEL_ERROR, e);
this.invokingDialog.hide();
@@ -167,7 +168,7 @@ public class GPELInvoker implements Canc
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();
@@ -203,7 +204,7 @@ public class GPELInvoker implements Canc
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();
@@ -211,7 +212,7 @@ public class GPELInvoker implements Canc
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();
@@ -230,7 +231,7 @@ public class GPELInvoker implements Canc
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();
@@ -238,7 +239,7 @@ public class GPELInvoker implements Canc
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/gpel/gui/GPELLoader.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELLoader.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELLoader.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELLoader.java Thu Oct 6 19:47:45 2011
@@ -32,12 +32,12 @@ import org.apache.airavata.xbaya.gui.Wai
import org.apache.airavata.xbaya.wf.Workflow;
import org.apache.airavata.xbaya.workflow.WorkflowClient;
import org.apache.airavata.xbaya.workflow.WorkflowEngineException;
-
-import xsul5.MLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class GPELLoader implements Cancelable {
- private static final MLogger logger = MLogger.getLogger();
+ private static final Logger logger = LoggerFactory.getLogger(GPELLoader.class);
private XBayaEngine engine;
@@ -93,7 +93,7 @@ public class GPELLoader implements Cance
try {
this.loadThread.join();
} catch (InterruptedException e) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
}
}
}
@@ -114,28 +114,28 @@ public class GPELLoader implements Cance
// TODO load notification in case of workflow instance
} catch (WorkflowEngineException e) {
if (this.canceled) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
} else {
this.engine.getErrorWindow().error(e.getMessage(), e);
this.loadingDialog.hide();
}
} catch (GraphException e) {
if (this.canceled) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
} else {
this.engine.getErrorWindow().error(ErrorMessages.GRAPH_FORMAT_ERROR, e);
this.loadingDialog.hide();
}
} catch (ComponentException e) {
if (this.canceled) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
} else {
this.engine.getErrorWindow().error(ErrorMessages.COMPONENT_FORMAT_ERROR, e);
this.loadingDialog.hide();
}
} catch (RuntimeException e) {
if (this.canceled) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
} else {
this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
this.loadingDialog.hide();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELMenu.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELMenu.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELMenu.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELMenu.java Thu Oct 6 19:47:45 2011
@@ -35,12 +35,12 @@ import org.apache.airavata.xbaya.gpel.co
import org.apache.airavata.xbaya.modifier.gui.WorkflowModifierGUI;
import org.apache.airavata.xbaya.ode.ODEInvokerWindow;
import org.apache.airavata.xbaya.ode.gui.ODEDeploymentWindow;
-
-import xsul5.MLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class GPELMenu implements EventListener {
- private static final MLogger logger = MLogger.getLogger();
+ private static final Logger logger = LoggerFactory.getLogger(GPELMenu.class);
private XBayaEngine engine;
@@ -86,8 +86,7 @@ public class GPELMenu implements EventLi
* @see org.apache.airavata.xbaya.event.EventListener#eventReceived(org.apache.airavata.xbaya.event.Event)
*/
public void eventReceived(Event event) {
- logger.entering();
-
+
boolean connected;
if (event.getType() == Event.Type.GPEL_ENGINE_CONNECTED) {
connected = true;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/script/BPELScript.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/script/BPELScript.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/script/BPELScript.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/script/BPELScript.java Thu Oct 6 19:47:45 2011
@@ -30,6 +30,7 @@ import java.util.Set;
import javax.xml.namespace.QName;
+import org.apache.airavata.common.utils.StringUtil;
import org.apache.airavata.common.utils.WSConstants;
import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.xbaya.XBayaConstants;
@@ -61,7 +62,6 @@ import org.apache.airavata.xbaya.graph.s
import org.apache.airavata.xbaya.graph.system.gui.StreamSourceNode;
import org.apache.airavata.xbaya.graph.util.GraphUtil;
import org.apache.airavata.xbaya.graph.ws.WSNode;
-import org.apache.airavata.common.utils.StringUtil;
import org.apache.airavata.xbaya.wf.Workflow;
import org.gpel.GpelConstants;
import org.gpel.model.GpelAssign;
@@ -80,12 +80,13 @@ import org.gpel.model.GpelReply;
import org.gpel.model.GpelScope;
import org.gpel.model.GpelSequence;
import org.gpel.model.GpelVariable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlComment;
import org.xmlpull.infoset.XmlElement;
import org.xmlpull.infoset.XmlInfosetBuilder;
import org.xmlpull.infoset.XmlNamespace;
-import xsul5.MLogger;
import xsul5.wsdl.WsdlPortType;
import xsul5.wsdl.plnk.PartnerLinkRole;
import xsul5.wsdl.plnk.PartnerLinkType;
@@ -144,7 +145,7 @@ public class BPELScript {
private static final String FOREACH_VALUE_SUFFIX = "Value";
- private static final MLogger logger = MLogger.getLogger();
+ private static final Logger logger = LoggerFactory.getLogger(BPELScript.class);
private Workflow workflow;
@@ -349,7 +350,7 @@ public class BPELScript {
// Validate
this.process.xmlValidate();
- logger.finest(this.process.xmlStringPretty());
+ logger.info(this.process.xmlStringPretty());
} catch (RuntimeException e) {
throw new GraphException(e);
}
@@ -478,7 +479,7 @@ public class BPELScript {
// TODO: Add xml to BPEL
private void addSingle(Node node, Collection<Node> block, GpelSequence sequence) throws GraphException {
- logger.finest("Processing + " + node.getID());
+ logger.info("Processing + " + node.getID());
if (node instanceof WSNode) {
addInvoke((WSNode) node, sequence);
} else if (node instanceof ConstantNode) {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/CepNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/CepNodeGUI.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/CepNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/CepNodeGUI.java Thu Oct 6 19:47:45 2011
@@ -30,12 +30,12 @@ import org.apache.airavata.xbaya.XBayaEn
import org.apache.airavata.xbaya.graph.DataPort;
import org.apache.airavata.xbaya.graph.dynamic.CepNode;
import org.apache.airavata.xbaya.graph.gui.NodeGUI;
-
-import xsul.MLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class CepNodeGUI extends NodeGUI {
- private final static MLogger logger = MLogger.getLogger();
+ private final static Logger logger = LoggerFactory.getLogger(CepNodeGUI.class);
private CepNode node;
@@ -57,7 +57,7 @@ public class CepNodeGUI extends NodeGUI
*/
@Override
public void mouseClicked(MouseEvent event, XBayaEngine engine) {
- logger.finest(event.toString());
+ logger.info(event.toString());
if (event.getClickCount() >= 2) {
showWindow(engine);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicNodeGUI.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicNodeGUI.java Thu Oct 6 19:47:45 2011
@@ -26,12 +26,12 @@ import java.awt.event.MouseEvent;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.graph.dynamic.DynamicNode;
import org.apache.airavata.xbaya.graph.gui.NodeGUI;
-
-import xsul.MLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class DynamicNodeGUI extends NodeGUI {
- private final static MLogger logger = MLogger.getLogger();
+ private final static Logger logger = LoggerFactory.getLogger(DynamicNodeGUI.class);
private DynamicNode node;
@@ -53,7 +53,7 @@ public class DynamicNodeGUI extends Node
*/
@Override
public void mouseClicked(MouseEvent event, XBayaEngine engine) {
- logger.finest(event.toString());
+ logger.info(event.toString());
if (event.getClickCount() >= 2) {
showWindow(engine);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/GraphCanvas.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/GraphCanvas.java?rev=1179790&r1=1179789&r2=1179790&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/GraphCanvas.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/GraphCanvas.java Thu Oct 6 19:47:45 2011
@@ -85,8 +85,8 @@ import org.apache.airavata.xbaya.graph.s
import org.apache.airavata.xbaya.graph.util.GraphUtil;
import org.apache.airavata.xbaya.gui.ErrorMessages;
import org.apache.airavata.xbaya.wf.Workflow;
-
-import xsul5.MLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A canvas to display a graph (workflow).
@@ -94,7 +94,7 @@ import xsul5.MLogger;
*/
public class GraphCanvas {
- private static final MLogger logger = MLogger.getLogger();
+ private static final Logger logger = LoggerFactory.getLogger(GraphCanvas.class);
private XBayaEngine engine;
@@ -331,13 +331,13 @@ public class GraphCanvas {
}
} catch (GraphException e) {
// Should not happen
- logger.caught(e);
+ logger.error(e.getMessage(), e);
this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
} catch (RuntimeException e) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
} catch (Error e) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
}
@@ -369,13 +369,13 @@ public class GraphCanvas {
this.panel.repaint();
} catch (GraphException e) {
// Should not happen
- logger.caught(e);
+ logger.error(e.getMessage(), e);
this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
} catch (RuntimeException e) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
} catch (Error e) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
}
@@ -753,13 +753,13 @@ public class GraphCanvas {
removeSelected();
} catch (GraphException e) {
// Should not happen
- logger.caught(e);
+ logger.error(e.getMessage(), e);
this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
} catch (RuntimeException e) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
} catch (Error e) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
}
}
@@ -781,7 +781,7 @@ public class GraphCanvas {
}
private void drop(final DropTargetDropEvent event) {
- logger.entering(new Object[] { event });
+ logger.debug("Event:" + event);
Transferable transferable = event.getTransferable();
try {
// Cannot cast transferable.
@@ -803,10 +803,10 @@ public class GraphCanvas {
} catch (ComponentException e) {
// If there is any error, the component tree viewer
// shows the error dialog.
- logger.caught(e);
+ logger.error(e.getMessage(), e);
event.dropComplete(false);
} catch (ComponentRegistryException e) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
event.dropComplete(false);
}
}
@@ -814,10 +814,10 @@ public class GraphCanvas {
} catch (UnsupportedFlavorException e) {
// Should not happen.
- logger.caught(e);
+ logger.error(e.getMessage(), e);
} catch (IOException e) {
// Should not happen.
- logger.caught(e);
+ logger.error(e.getMessage(), e);
}
}
@@ -851,10 +851,10 @@ public class GraphCanvas {
Edge edge = this.graph.addEdge(fromPort, toPort);
selectEdge(edge);
} catch (GraphException e) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
this.engine.getErrorWindow().warning(e.getMessage());
} catch (RuntimeException e) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR);
}
}
@@ -1157,13 +1157,13 @@ public class GraphCanvas {
removeSelectedNode();
} catch (GraphException e) {
// Should not happen
- logger.caught(e);
+ logger.error(e.getMessage(), e);
GraphCanvas.this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
} catch (RuntimeException e) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
GraphCanvas.this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
} catch (Error e) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
GraphCanvas.this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
}
@@ -1178,10 +1178,10 @@ public class GraphCanvas {
try {
rerunSelectedNode();
} catch (RuntimeException e) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
GraphCanvas.this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
} catch (Error e) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
GraphCanvas.this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
}
@@ -1194,10 +1194,10 @@ public class GraphCanvas {
try {
toggleBreakPointToNode();
} catch (RuntimeException e) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
GraphCanvas.this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
} catch (Error e) {
- logger.caught(e);
+ logger.error(e.getMessage(), e);
GraphCanvas.this.engine.getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
}