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 2012/10/20 21:04:16 UTC
svn commit: r1400501 [4/5] - in /airavata/trunk: ./ modules/airavata-client/
modules/commons/gfac-schema/
modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/
modules/commons/provenance-registry/ modules/commons/utils/ modul...
Modified: airavata/trunk/modules/xbaya-gui/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/pom.xml?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/pom.xml (original)
+++ airavata/trunk/modules/xbaya-gui/pom.xml Sat Oct 20 19:04:07 2012
@@ -363,7 +363,7 @@
<artifactId>airavata-gfac-core</artifactId>
<version>${project.version}</version>
</dependency>
- <!--dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${org.slf4j.version}</version>
@@ -379,7 +379,7 @@
<artifactId>slf4j-log4j12</artifactId>
<version>${org.slf4j.version}</version>
<scope>runtime</scope>
- </dependency-->
+ </dependency>
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
@@ -410,9 +410,5 @@
<artifactId>derbyclient</artifactId>
<version>${derby.version}</version>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
</dependencies>
</project>
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBaya.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBaya.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBaya.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBaya.java Sat Oct 20 19:04:07 2012
@@ -28,12 +28,12 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.workflow.model.exceptions.WorkflowException;
import org.apache.airavata.xbaya.XBayaConfiguration.XBayaExecutionMode;
import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class XBaya {
- private static final Log logger = LogFactory.getLog(XBaya.class);
+ private static final Logger logger = LoggerFactory.getLogger(XBaya.class);
private XBayaConfiguration config;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java Sat Oct 20 19:04:07 2012
@@ -31,14 +31,14 @@ import java.util.Observer;
import org.apache.airavata.workflow.model.component.registry.JCRComponentRegistry;
import org.apache.airavata.xbaya.core.ide.XBayaExecutionModeListener;
import org.apache.airavata.xbaya.file.XBayaPathConstants;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import xsul.lead.LeadDeploymentConfig;
public class XBayaConfiguration extends Observable implements Observer {
- private static final Log logger = LogFactory.getLog(XBayaConfiguration.class);
+ private static final Logger logger = LoggerFactory.getLogger(XBayaConfiguration.class);
private String title = XBayaConstants.APPLICATION_NAME;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java Sat Oct 20 19:04:07 2012
@@ -43,12 +43,12 @@ import org.apache.airavata.xbaya.ui.util
import org.apache.airavata.xbaya.ui.widgets.component.ComponentSelector;
import org.apache.airavata.xbaya.ui.widgets.component.ComponentTreeNode;
import org.apache.airavata.xbaya.workflow.WorkflowClient;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class XBayaEngine {
- private static final Log logger = LogFactory.getLog(XBayaEngine.class);
+ private static final Logger logger = LoggerFactory.getLogger(XBayaEngine.class);
private XBayaConfiguration configuration;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java Sat Oct 20 19:04:07 2012
@@ -36,12 +36,12 @@ import org.apache.airavata.xbaya.ui.dial
import org.apache.airavata.xbaya.ui.utils.Cancelable;
import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
import org.apache.airavata.xbaya.ui.widgets.component.ComponentTreeNode;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ComponentRegistryLoader implements Cancelable, Observer {
- private static final Log logger = LogFactory.getLog(ComponentRegistryLoader.class);
+ private static final Logger logger = LoggerFactory.getLogger(ComponentRegistryLoader.class);
private XBayaEngine engine;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/BPELFiler.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/BPELFiler.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/BPELFiler.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/BPELFiler.java Sat Oct 20 19:04:07 2012
@@ -39,12 +39,12 @@ import org.apache.airavata.xbaya.XBayaEn
import org.apache.airavata.xbaya.file.XBayaPathConstants;
import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
import org.gpel.model.GpelProcess;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class BPELFiler {
- private static final Log logger = LogFactory.getLog(BPELFiler.class);
+ private static Logger logger = LoggerFactory.getLogger(BPELFiler.class);
private XBayaEngine engine;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/ImageFiler.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/ImageFiler.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/ImageFiler.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/ImageFiler.java Sat Oct 20 19:04:07 2012
@@ -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.ui.utils.ErrorMessages;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ImageFiler {
- private static final Log logger = LogFactory.getLog(ImageFiler.class);
+ private static Logger logger = LoggerFactory.getLogger(ImageFiler.class);
private XBayaEngine engine;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/JythonFiler.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/JythonFiler.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/JythonFiler.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/JythonFiler.java Sat Oct 20 19:04:07 2012
@@ -36,12 +36,12 @@ import org.apache.airavata.xbaya.XBayaEn
import org.apache.airavata.xbaya.file.XBayaPathConstants;
import org.apache.airavata.xbaya.jython.script.JythonScript;
import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class JythonFiler {
- private static final Log logger = LogFactory.getLog(JythonFiler.class);
+ private static Logger logger = LoggerFactory.getLogger(JythonFiler.class);
private XBayaEngine engine;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/ScuflFiler.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/ScuflFiler.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/ScuflFiler.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/ScuflFiler.java Sat Oct 20 19:04:07 2012
@@ -36,12 +36,12 @@ import org.apache.airavata.xbaya.XBayaEn
import org.apache.airavata.xbaya.file.XBayaPathConstants;
import org.apache.airavata.xbaya.scufl.script.ScuflScript;
import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ScuflFiler {
- private static final Log logger = LogFactory.getLog(ScuflFiler.class);
+ private static Logger logger = LoggerFactory.getLogger(ScuflFiler.class);
private XBayaEngine engine;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/WorkflowFiler.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/WorkflowFiler.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/WorkflowFiler.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/core/generators/WorkflowFiler.java Sat Oct 20 19:04:07 2012
@@ -39,13 +39,13 @@ import org.apache.airavata.xbaya.XBayaEn
import org.apache.airavata.xbaya.file.XBayaPathConstants;
import org.apache.airavata.xbaya.ui.graph.GraphCanvas;
import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
public class WorkflowFiler {
- private static final Log logger = LogFactory.getLog(WorkflowFiler.class);
+ private static Logger logger = LoggerFactory.getLogger(WorkflowFiler.class);
private XBayaEngine engine;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/event/EventProducer.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/event/EventProducer.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/event/EventProducer.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/event/EventProducer.java Sat Oct 20 19:04:07 2012
@@ -26,12 +26,12 @@ import java.util.List;
import org.apache.airavata.workflow.model.exceptions.WorkflowException;
import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class EventProducer {
- private static final Log logger = LogFactory.getLog(EventProducer.class);
+ private static final Logger logger = LoggerFactory.getLogger(EventProducer.class);
private List<EventListener> listeners = new LinkedList<EventListener>();
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gfac/SimpleWSClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gfac/SimpleWSClient.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gfac/SimpleWSClient.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gfac/SimpleWSClient.java Sat Oct 20 19:04:07 2012
@@ -26,8 +26,8 @@ import java.util.Collection;
import java.util.Iterator;
import org.apache.airavata.workflow.model.component.ComponentRegistryException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.v1.builder.XmlElement;
import org.xmlpull.v1.builder.XmlInfosetBuilder;
@@ -45,7 +45,7 @@ import xsul.xwsif_runtime.WSIFRuntime;
*/
public class SimpleWSClient {
- private static final Log logger = LogFactory.getLog(SimpleWSClient.class);
+ private static final Logger logger = LoggerFactory.getLogger(SimpleWSClient.class);
private static final XmlInfosetBuilder builder = XmlConstants.BUILDER;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/DoWhileHandler.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/DoWhileHandler.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/DoWhileHandler.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/DoWhileHandler.java Sat Oct 20 19:04:07 2012
@@ -45,12 +45,12 @@ import org.apache.airavata.xbaya.graph.c
import org.apache.airavata.xbaya.invoker.Invoker;
import org.apache.airavata.xbaya.ui.monitor.MonitorEventHandler.NodeState;
import org.apache.airavata.xbaya.util.InterpreterUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
public class DoWhileHandler implements Callable<Boolean> {
- private static final Log log = LogFactory.getLog(DoWhileHandler.class);
+ private static Logger log = LoggerFactory.getLogger(DoWhileHandler.class);
private DoWhileNode dowhilenode;
private Map<Node, Invoker> invokerMap;
private ArrayList<Node> waitingNode;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java Sat Oct 20 19:04:07 2012
@@ -55,8 +55,8 @@ import org.apache.airavata.xbaya.ui.grap
import org.apache.airavata.xbaya.ui.monitor.MonitorEventHandler.NodeState;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
public class WorkflowInterpretorEventListener implements NotificationHandler, ConsumerNotificationHandler {
@@ -73,7 +73,7 @@ public class WorkflowInterpretorEventLis
private WorkflowNodeStatusUpdater workflowNodeStatusUpdater;
private WorkflowInterpreterConfiguration workflowInterpreterConfiguration;
- private static final Log logger = LogFactory.getLog(WorkflowInterpretorEventListener.class);
+ private static Logger logger = LoggerFactory.getLogger(WorkflowInterpretorEventListener.class);
public WorkflowInterpretorEventListener(Workflow workflow, XBayaConfiguration configuration) {
this.workflow = workflow;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java Sat Oct 20 19:04:07 2012
@@ -101,7 +101,7 @@ public class WorkflowInterpretorSkeleton
public static JCRComponentRegistry jcrComponentRegistry = null;
public static int provenanceWriterThreadPoolSize = 1;
public static final String PROVENANCE_WRITER_THREAD_POOL_SIZE = "provenanceWriterThreadPoolSize";
- public static final int JCR_AVAIALABILITY_WAIT_INTERVAL = 1000;
+ public static final int JCR_AVAIALABILITY_WAIT_INTERVAL = 1000 * 10;
public static final String GFAC_EMBEDDED = "gfac.embedded";
public static ConfigurationContext configurationContext;
public static final String OUTPUT_DATA_PATH = "outputDataPath";
@@ -452,12 +452,12 @@ public class WorkflowInterpretorSkeleton
}
}catch (Exception e){
try {
- log.info("Thread is sleeping since registry database is not up");
Thread.sleep(JCR_AVAIALABILITY_WAIT_INTERVAL);
} catch (InterruptedException e1) {
e1.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
return;
}
+ log.severe("Workflow Interpreter Service URL update thread is interrupted");
}
}
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/AsynchronousInvoker.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/AsynchronousInvoker.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/AsynchronousInvoker.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/AsynchronousInvoker.java Sat Oct 20 19:04:07 2012
@@ -22,8 +22,8 @@
package org.apache.airavata.xbaya.invoker;
import org.apache.airavata.workflow.model.exceptions.WorkflowException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import xsul.wsdl.WsdlDefinitions;
import xsul.wsif.WSIFMessage;
@@ -33,7 +33,7 @@ import xsul.xwsif_runtime_async_http.Xsu
public class AsynchronousInvoker extends SimpleInvoker {
- private static final Log logger = LogFactory.getLog(AsynchronousInvoker.class);
+ private static final Logger logger = LoggerFactory.getLogger(AsynchronousInvoker.class);
private String messageBoxURL;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java Sat Oct 20 19:04:07 2012
@@ -62,8 +62,8 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.v1.builder.XmlElement;
import xsul.wsdl.WsdlDefinitions;
@@ -73,7 +73,7 @@ import xsul.xwsif_runtime.WSIFClient;
public class EmbeddedGFacInvoker implements Invoker{
- private static final Log logger = LogFactory.getLog(EmbeddedGFacInvoker.class);
+ private static final Logger logger = LoggerFactory.getLogger(EmbeddedGFacInvoker.class);
private String nodeID;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GFacInvoker.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GFacInvoker.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GFacInvoker.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GFacInvoker.java Sat Oct 20 19:04:07 2012
@@ -30,8 +30,8 @@ import org.apache.airavata.common.workfl
import org.apache.airavata.workflow.model.exceptions.WorkflowException;
import org.apache.airavata.xbaya.invoker.factory.InvokerFactory;
import org.apache.airavata.xbaya.lead.NotificationHandler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import xsul.lead.LeadContextHeader;
import xsul.wsdl.WsdlDefinitions;
@@ -42,7 +42,7 @@ import xsul.xwsif_runtime.WSIFClient;
public class GFacInvoker implements Invoker {
- private static final Log logger = LogFactory.getLog(GFacInvoker.class);
+ private final static Logger logger = LoggerFactory.getLogger(GFacInvoker.class);
private String gfacURL;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GenericInvoker.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GenericInvoker.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GenericInvoker.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GenericInvoker.java Sat Oct 20 19:04:07 2012
@@ -44,8 +44,8 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.xbaya.invoker.factory.InvokerFactory;
import org.apache.airavata.xbaya.jython.lib.ServiceNotifiable;
import org.apache.airavata.xbaya.jython.lib.WorkflowNotifiable;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.v1.builder.XmlElement;
import xsul.wsdl.WsdlDefinitions;
@@ -57,7 +57,7 @@ import xsul.xwsif_runtime.WSIFClient;
public class GenericInvoker implements Invoker {
- private static final Log logger = LogFactory.getLog(GenericInvoker.class);
+ private static final Logger logger = LoggerFactory.getLogger(GenericInvoker.class);
private String nodeID;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEInvoker.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEInvoker.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEInvoker.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEInvoker.java Sat Oct 20 19:04:07 2012
@@ -40,8 +40,8 @@ import org.apache.airavata.xbaya.ui.dial
import org.apache.airavata.xbaya.ui.utils.Cancelable;
import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
import org.apache.airavata.xbaya.util.XBayaUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import xsul.XmlConstants;
import xsul.invoker.gsi.GsiInvoker;
@@ -53,7 +53,7 @@ public class ODEInvoker implements Cance
private XBayaEngine engine;
- private static final Log logger = LogFactory.getLog(ODEInvoker.class);
+ private static final Logger logger = LoggerFactory.getLogger(ODEInvoker.class);
private Thread invokeThread;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/SimpleInvoker.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/SimpleInvoker.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/SimpleInvoker.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/SimpleInvoker.java Sat Oct 20 19:04:07 2012
@@ -25,8 +25,8 @@ import java.util.Iterator;
import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.workflow.model.exceptions.WorkflowException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.v1.builder.XmlElement;
import xsul.wsdl.WsdlDefinitions;
@@ -41,7 +41,7 @@ import xsul.xwsif_runtime.WSIFRuntime;
public class SimpleInvoker implements Invoker {
- private static final Log log = LogFactory.getLog(GenericInvoker.class);
+ private static final Logger log = LoggerFactory.getLogger(GenericInvoker.class);
protected WSIFClient client;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/WorkflowInvokerWrapperForGFacInvoker.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/WorkflowInvokerWrapperForGFacInvoker.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/WorkflowInvokerWrapperForGFacInvoker.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/WorkflowInvokerWrapperForGFacInvoker.java Sat Oct 20 19:04:07 2012
@@ -35,8 +35,8 @@ import org.apache.airavata.common.utils.
import org.apache.airavata.workflow.model.exceptions.WorkflowException;
import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
import org.apache.airavata.xbaya.jython.lib.ServiceNotifiable;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.v1.builder.XmlElement;
import xsul.lead.LeadContextHeader;
@@ -44,7 +44,7 @@ import xsul.wsif.WSIFMessage;
public class WorkflowInvokerWrapperForGFacInvoker extends GFacInvoker {
- private static final Log logger = LogFactory.getLog(WorkflowInvokerWrapperForGFacInvoker.class);
+ private static final Logger logger = LoggerFactory.getLogger(WorkflowInvokerWrapperForGFacInvoker.class);
private ServiceNotifiable notifier;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/GFacServiceCreator.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/GFacServiceCreator.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/GFacServiceCreator.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/GFacServiceCreator.java Sat Oct 20 19:04:07 2012
@@ -28,8 +28,8 @@ import javax.xml.namespace.QName;
import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.workflow.model.exceptions.WorkflowException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.v1.builder.XmlElement;
import xsul.wsdl.WsdlDefinitions;
@@ -55,7 +55,7 @@ public class GFacServiceCreator {
private static final String SECURITY_NONE = "None";
- private static final Log logger = LogFactory.getLog(GFacServiceCreator.class);
+ private static final Logger logger = LoggerFactory.getLogger(GFacServiceCreator.class);
private WSIFOperation gFacOperation;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/NotificationSender.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/NotificationSender.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/NotificationSender.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/NotificationSender.java Sat Oct 20 19:04:07 2012
@@ -33,13 +33,13 @@ import org.apache.airavata.workflow.trac
import org.apache.airavata.workflow.tracking.common.WorkflowTrackingContext;
import org.apache.axis2.addressing.EndpointReference;
import org.python.core.PyObject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
public class NotificationSender implements WorkflowNotifiable {
- private static final Log logger = LogFactory.getLog(NotificationSender.class);
+ protected static final Logger logger = LoggerFactory.getLogger(NotificationSender.class);
protected WorkflowNotifier notifier;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/ServiceNotificationSender.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/ServiceNotificationSender.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/ServiceNotificationSender.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/ServiceNotificationSender.java Sat Oct 20 19:04:07 2012
@@ -34,15 +34,15 @@ import org.apache.airavata.workflow.trac
import org.apache.axis2.addressing.EndpointReference;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
import xsul.wsif.WSIFMessage;
public class ServiceNotificationSender implements ServiceNotifiable {
- private static final Log logger = LogFactory.getLog(ServiceNotificationSender.class);
+ private static final Logger logger = LoggerFactory.getLogger(ServiceNotificationSender.class);
private WorkflowNotifier notifier;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonClassLoader.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonClassLoader.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonClassLoader.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonClassLoader.java Sat Oct 20 19:04:07 2012
@@ -47,8 +47,8 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.xbaya.XBayaVersion;
import org.apache.airavata.xbaya.jython.lib.NotificationSender;
import org.python.util.PythonInterpreter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class loader loads jython related classes without counting on parent class loader. This is because jython
@@ -57,7 +57,7 @@ import org.apache.commons.logging.LogFac
*/
public class JythonClassLoader extends SecureClassLoader {
- private static final Log logger = LogFactory.getLog(JythonClassLoader.class);
+ private final static Logger logger = LoggerFactory.getLogger(JythonClassLoader.class);
private ClassLoader parent;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonOneTimeRunnerImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonOneTimeRunnerImpl.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonOneTimeRunnerImpl.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/runner/JythonOneTimeRunnerImpl.java Sat Oct 20 19:04:07 2012
@@ -30,12 +30,12 @@ import java.util.jar.JarFile;
import org.apache.airavata.workflow.model.exceptions.WorkflowException;
import org.python.core.PySystemState;
import org.python.util.PythonInterpreter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class JythonOneTimeRunnerImpl implements JythonOneTimeRunner {
- private static final Log logger = LogFactory.getLog(JythonOneTimeRunnerImpl.class);
+ private static final Logger logger = LoggerFactory.getLogger(JythonOneTimeRunnerImpl.class);
/**
* @throws WorkflowException
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADTypes.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADTypes.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADTypes.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADTypes.java Sat Oct 20 19:04:07 2012
@@ -24,12 +24,12 @@ package org.apache.airavata.xbaya.lead;
import javax.xml.namespace.QName;
import org.apache.airavata.common.utils.WSConstants;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class LEADTypes {
- private static final Log logger = LogFactory.getLog(LEADTypes.class);
+ private static final Logger logger = LoggerFactory.getLogger(LEADTypes.class);
/**
* http://www.extreme.indiana.edu/lead/xsd
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADWorkflowInvoker.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADWorkflowInvoker.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADWorkflowInvoker.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADWorkflowInvoker.java Sat Oct 20 19:04:07 2012
@@ -34,8 +34,8 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.workflow.model.component.ws.WSComponentFactory;
import org.apache.airavata.workflow.model.component.ws.WSComponentPort;
import org.apache.airavata.workflow.model.exceptions.WorkflowException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.v1.builder.XmlElement;
import xsul.XmlConstants;
@@ -59,7 +59,7 @@ import xsul5.wsdl.WsdlDefinitions;
public class LEADWorkflowInvoker {
- private static final Log logger = LogFactory.getLog(LEADWorkflowInvoker.class);
+ private static final Logger logger = LoggerFactory.getLogger(LEADWorkflowInvoker.class);
private WsdlDefinitions definitions;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/NotificationHandler.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/NotificationHandler.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/NotificationHandler.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/NotificationHandler.java Sat Oct 20 19:04:07 2012
@@ -35,8 +35,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.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.v1.builder.XmlElement;
import xsul.XmlConstants;
@@ -48,7 +48,7 @@ import xsul.xhandler.BaseHandler;
public class NotificationHandler extends BaseHandler {
- private static final Log logger = LogFactory.getLog(NotificationHandler.class);
+ private static final Logger logger = LoggerFactory.getLogger(NotificationHandler.class);
private static final String INVOKING_MESSAGE = "Invoking a workflow";
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/tools/ToolsMenuItem.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/tools/ToolsMenuItem.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/tools/ToolsMenuItem.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/tools/ToolsMenuItem.java Sat Oct 20 19:04:07 2012
@@ -23,8 +23,8 @@ package org.apache.airavata.xbaya.menues
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.ui.dialogs.GlobusFileTransferWindow;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.swing.*;
import java.awt.event.ActionEvent;
@@ -38,7 +38,7 @@ public class ToolsMenuItem {
private JMenuItem globusFileTransferItem;
- private static final Log logger = LogFactory.getLog(ToolsMenuItem.class);
+ private static final Logger logger = LoggerFactory.getLogger(ToolsMenuItem.class);
/**
* Constructs a WorkflowMenu.
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/modifier/WorkflowModifier.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/modifier/WorkflowModifier.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/modifier/WorkflowModifier.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/modifier/WorkflowModifier.java Sat Oct 20 19:04:07 2012
@@ -51,8 +51,8 @@ import org.apache.airavata.xbaya.monitor
import org.apache.airavata.xbaya.monitor.MonitorUtil;
import org.apache.airavata.xbaya.monitor.MonitorUtil.EventType;
import org.apache.airavata.xbaya.ui.monitor.MonitorEventHandler.NodeState;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
import xsul.XmlConstants;
@@ -60,7 +60,7 @@ import xsul5.wsdl.WsdlPortTypeOperation;
public class WorkflowModifier {
- private static final Log logger = LogFactory.getLog(WorkflowModifier.class);
+ private static final Logger logger = LoggerFactory.getLogger(WorkflowModifier.class);
private Workflow modifiedWorkflow;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java Sat Oct 20 19:04:07 2012
@@ -32,13 +32,13 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.xbaya.event.Event;
import org.apache.airavata.xbaya.event.Event.Type;
import org.apache.airavata.xbaya.event.EventProducer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
public class Monitor extends EventProducer {
- private static final Log logger = LogFactory.getLog(Monitor.class);
+ protected static final Logger logger = LoggerFactory.getLogger(Monitor.class);
protected MonitorConfiguration configuration;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorConfiguration.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorConfiguration.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorConfiguration.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorConfiguration.java Sat Oct 20 19:04:07 2012
@@ -31,7 +31,7 @@ import org.apache.airavata.common.utils.
public class MonitorConfiguration extends EventProducer implements Cloneable{
- // private static final Log logger = LogFactory.getLog();
+ // private static final Logger logger = LoggerFactory.getLogger();
private URI brokerURL;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorEventData.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorEventData.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorEventData.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorEventData.java Sat Oct 20 19:04:07 2012
@@ -32,8 +32,8 @@ import javax.swing.event.TableModelEvent
import javax.swing.event.TableModelListener;
import javax.swing.table.TableModel;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
public class MonitorEventData implements TableModel, BoundedRangeModel {
@@ -73,7 +73,7 @@ public class MonitorEventData implements
}
}
- private static final Log logger = LogFactory.getLog(MonitorEventData.class);
+ private static final Logger logger = LoggerFactory.getLogger(MonitorEventData.class);
private List<TableModelListener> tableModelListeners;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorUtil.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorUtil.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorUtil.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/MonitorUtil.java Sat Oct 20 19:04:07 2012
@@ -27,8 +27,8 @@ import java.util.Date;
import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
import org.xmlpull.infoset.XmlNamespace;
@@ -39,7 +39,7 @@ import atomixmiser.DcDate;
*/
public class MonitorUtil {
- private static final Log logger = LogFactory.getLog(MonitorUtil.class);
+ private static final Logger logger = LoggerFactory.getLogger(MonitorUtil.class);
/**
* Workflow tracking namespace
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/WsmgClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/WsmgClient.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/WsmgClient.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/WsmgClient.java Sat Oct 20 19:04:07 2012
@@ -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.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
public class WsmgClient implements ConsumerNotificationHandler, NotificationHandler {
- private static final Log logger = LogFactory.getLog(WsmgClient.class);
+ private static final Logger logger = LoggerFactory.getLogger(WsmgClient.class);
private Monitor monitor;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/MyProxyClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/MyProxyClient.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/MyProxyClient.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/MyProxyClient.java Sat Oct 20 19:04:07 2012
@@ -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 org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MyProxyClient {
- private static final Log logger = LogFactory.getLog(MyProxyClient.class);
+ private static final Logger logger = LoggerFactory.getLogger(MyProxyClient.class);
private boolean initialized = false;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java Sat Oct 20 19:04:07 2012
@@ -26,11 +26,11 @@ import org.apache.airavata.registry.api.
import org.apache.airavata.registry.api.workflow.WorkflowInstanceNode;
import org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus;
import org.apache.airavata.registry.api.workflow.WorkflowNodeType;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class WorkflowNodeStatusUpdater {
- private static final Log logger = LogFactory.getLog(WorkflowNodeStatusUpdater.class);
+ private static Logger logger = LoggerFactory.getLogger(WorkflowNodeStatusUpdater.class);
private AiravataRegistry2 registry;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java Sat Oct 20 19:04:07 2012
@@ -26,11 +26,11 @@ import org.apache.airavata.registry.api.
import org.apache.airavata.registry.api.AiravataRegistry2;
import org.apache.airavata.registry.api.workflow.WorkflowInstance;
import org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class WorkflowStatusUpdater {
- private static final Log logger = LogFactory.getLog(WorkflowStatusUpdater.class);
+ private static Logger logger = LoggerFactory.getLogger(WorkflowStatusUpdater.class);
private AiravataRegistry2 registry;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/taverna/TavernaRunnerWindow.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/taverna/TavernaRunnerWindow.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/taverna/TavernaRunnerWindow.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/taverna/TavernaRunnerWindow.java Sat Oct 20 19:04:07 2012
@@ -54,8 +54,8 @@ import org.apache.airavata.xbaya.ui.util
import org.apache.airavata.xbaya.ui.widgets.GridPanel;
import org.apache.airavata.xbaya.ui.widgets.XBayaLabel;
import org.apache.airavata.xbaya.ui.widgets.XBayaTextField;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
import org.xmlpull.v1.builder.XmlInfosetBuilder;
@@ -63,7 +63,7 @@ import xsul.XmlConstants;
public class TavernaRunnerWindow {
- private static final Log logger = LogFactory.getLog(TavernaRunnerWindow.class);
+ private static final Logger logger = LoggerFactory.getLogger(TavernaRunnerWindow.class);
private XBayaEngine engine;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/BPELScriptTestCase.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/BPELScriptTestCase.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/BPELScriptTestCase.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/BPELScriptTestCase.java Sat Oct 20 19:04:07 2012
@@ -42,7 +42,7 @@ import xsul5.wsdl.WsdlDefinitions;
public class BPELScriptTestCase extends XBayaTestCase {
- // private static final Log logger = LogFactory.getLog();
+ // private static final Logger logger = LoggerFactory.getLogger();
private WorkflowCreator workflowCreator;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/DSCTestCase.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/DSCTestCase.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/DSCTestCase.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/DSCTestCase.java Sat Oct 20 19:04:07 2012
@@ -30,8 +30,8 @@ import org.apache.airavata.common.utils.
import org.apache.airavata.workflow.model.gpel.DSCUtil;
import org.apache.airavata.xbaya.file.XBayaPathConstants;
import org.apache.airavata.xbaya.lead.LeadContextHeaderHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.v1.builder.XmlElement;
import xsul.lead.LeadContextHeader;
@@ -52,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 Log logger = LogFactory.getLog(DSCTestCase.class);
+ private static final Logger logger = LoggerFactory.getLogger(DSCTestCase.class);
/**
* @param args
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/DSCUtilTestCase.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/DSCUtilTestCase.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/DSCUtilTestCase.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/DSCUtilTestCase.java Sat Oct 20 19:04:07 2012
@@ -30,8 +30,8 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.file.XBayaPathConstants;
import org.apache.airavata.xbaya.test.util.WorkflowCreator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import xsul5.wsdl.WsdlDefinitions;
import xsul5.wsdl.WsdlException;
@@ -44,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 Log logger = LogFactory.getLog(DSCUtilTestCase.class);
+ private static final Logger logger = LoggerFactory.getLogger(DSCUtilTestCase.class);
/**
* @throws WsdlException
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GFacServiceCreaterTestCase.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GFacServiceCreaterTestCase.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GFacServiceCreaterTestCase.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GFacServiceCreaterTestCase.java Sat Oct 20 19:04:07 2012
@@ -43,8 +43,8 @@ import org.apache.airavata.xbaya.jython.
import org.apache.airavata.xbaya.jython.lib.NotificationSender;
import org.apache.airavata.xbaya.jython.script.JythonScript;
import org.apache.airavata.xbaya.test.util.WorkflowCreator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+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 Log logger = LogFactory.getLog(GFacServiceCreaterTestCase.class);
+ private static final Logger logger = LoggerFactory.getLogger(GFacServiceCreaterTestCase.class);
/**
* @throws WorkflowException
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/LEADWorkflowInvokerTestCase.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/LEADWorkflowInvokerTestCase.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/LEADWorkflowInvokerTestCase.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/LEADWorkflowInvokerTestCase.java Sat Oct 20 19:04:07 2012
@@ -43,8 +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.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+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;
@@ -67,7 +67,7 @@ public class LEADWorkflowInvokerTestCase
private static final String SAMPLE_AWSDL = XBayaPathConstants.WSDL_DIRECTORY + File.separator + Adder.WSDL_PATH;
- private static final Log logger = LogFactory.getLog(LEADWorkflowInvokerTestCase.class);
+ private static final Logger logger = LoggerFactory.getLogger(LEADWorkflowInvokerTestCase.class);
/**
* @param args
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MetadataTestCase.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MetadataTestCase.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MetadataTestCase.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MetadataTestCase.java Sat Oct 20 19:04:07 2012
@@ -44,8 +44,8 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.workflow.model.graph.system.OutputNode;
import org.apache.airavata.workflow.model.graph.ws.WSGraph;
import org.apache.airavata.workflow.model.wf.Workflow;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
public class MetadataTestCase extends TestCase {
@@ -64,7 +64,7 @@ public class MetadataTestCase extends Te
private static final String WRF_FORECASTING_MODEL_WSDL = "WRFForecastingModel.wsdl";
- private static final Log logger = LogFactory.getLog(MetadataTestCase.class);
+ private static final Logger logger = LoggerFactory.getLogger(MetadataTestCase.class);
/**
* @throws ComponentException
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MyProxyTestCase.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MyProxyTestCase.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MyProxyTestCase.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MyProxyTestCase.java Sat Oct 20 19:04:07 2012
@@ -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 org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MyProxyTestCase extends XBayaTestCase {
- private static final Log logger = LogFactory.getLog(MyProxyTestCase.class);
+ private static final Logger logger = LoggerFactory.getLogger(MyProxyTestCase.class);
private static String username = System.getProperty("username");
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WSDLTestCase.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WSDLTestCase.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WSDLTestCase.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WSDLTestCase.java Sat Oct 20 19:04:07 2012
@@ -35,7 +35,7 @@ import org.apache.airavata.common.utils.
public class WSDLTestCase extends XBayaTestCase {
- // private static final Log logger = LogFactory.getLog();
+ // private static final Logger logger = LoggerFactory.getLogger();
private WorkflowCreator graphCreater;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WSIFTestCase.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WSIFTestCase.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WSIFTestCase.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WSIFTestCase.java Sat Oct 20 19:04:07 2012
@@ -25,12 +25,12 @@ import junit.framework.TestSuite;
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.ui.widgets.component.ComponentTreeNode;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class WSIFTestCase extends XBayaTestCase {
- private static final Log logger = LogFactory.getLog(WSIFTestCase.class);
+ private static final Logger logger = LoggerFactory.getLogger(WSIFTestCase.class);
private ComponentTreeNode resouceCatalogComponentTree;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowModificationTestCase.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowModificationTestCase.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowModificationTestCase.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowModificationTestCase.java Sat Oct 20 19:04:07 2012
@@ -68,8 +68,8 @@ import org.apache.airavata.xbaya.test.ut
import org.apache.airavata.xbaya.ui.graph.GraphCanvas;
import org.apache.airavata.xbaya.ui.monitor.MonitorEventHandler.NodeState;
import org.apache.xmlbeans.XmlObject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.view.XmlValidationException;
import org.xmlpull.v1.builder.XmlElement;
@@ -87,7 +87,7 @@ import xsul5.wsdl.WsdlResolver;
public class WorkflowModificationTestCase extends XBayaTestCase {
- private static final Log logger = LogFactory.getLog(WorkflowModificationTestCase.class);
+ private static final Logger logger = LoggerFactory.getLogger(WorkflowModificationTestCase.class);
private boolean gui = false;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowTestCase.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowTestCase.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowTestCase.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowTestCase.java Sat Oct 20 19:04:07 2012
@@ -37,13 +37,13 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.file.XBayaPathConstants;
import org.apache.airavata.xbaya.test.util.WorkflowCreator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
public class WorkflowTestCase extends XBayaTestCase {
- private static final Log logger = LogFactory.getLog(WorkflowTestCase.class);
+ private static Logger logger = LoggerFactory.getLogger(WorkflowTestCase.class);
private WorkflowCreator workflowCreator;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaSecurityTestCase.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaSecurityTestCase.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaSecurityTestCase.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaSecurityTestCase.java Sat Oct 20 19:04:07 2012
@@ -26,14 +26,14 @@ import java.net.URI;
import junit.framework.TestSuite;
import org.apache.airavata.common.utils.WSDLUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import xsul.wsdl.WsdlResolver;
public class XBayaSecurityTestCase extends XBayaTestCase {
- private static final Log logger = LogFactory.getLog(XBayaSecurityTestCase.class);
+ private static final Logger logger = LoggerFactory.getLogger(XBayaSecurityTestCase.class);
/**
* @param args
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaTestCase.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaTestCase.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaTestCase.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaTestCase.java Sat Oct 20 19:04:07 2012
@@ -28,7 +28,7 @@ import junit.framework.TestCase;
import org.apache.airavata.xbaya.XBayaConfiguration;
import org.apache.airavata.xbaya.security.XBayaSecurity;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
public abstract class XBayaTestCase extends TestCase {
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XppTestCase.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XppTestCase.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XppTestCase.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XppTestCase.java Sat Oct 20 19:04:07 2012
@@ -26,15 +26,15 @@ import java.io.StringWriter;
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlPullParserFactory;
import org.xmlpull.v1.XmlSerializer;
public class XppTestCase extends TestCase {
- private static final Log logger = LogFactory.getLog(XppTestCase.class);
+ private static final Logger logger = LoggerFactory.getLogger(XppTestCase.class);
/*
* @see TestCase#setUp()
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/jython/JythonLibraryTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/jython/JythonLibraryTest.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/jython/JythonLibraryTest.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/jython/JythonLibraryTest.java Sat Oct 20 19:04:07 2012
@@ -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 org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class JythonLibraryTest extends TestCase {
- private static final Log logger = LogFactory.getLog(JythonLibraryTest.class);
+ private static final Logger logger = LoggerFactory.getLogger(JythonLibraryTest.class);
/**
* @throws WorkflowException
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/AllServices.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/AllServices.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/AllServices.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/AllServices.java Sat Oct 20 19:04:07 2012
@@ -48,7 +48,7 @@ import xsul.xservo_soap_http.HttpBasedSe
public class AllServices {
- // private static final Log logger = LogFactory.getLog();
+ // private static final Logger logger = LoggerFactory.getLogger();
private int port;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/ServiceNotificationSender.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/ServiceNotificationSender.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/ServiceNotificationSender.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/ServiceNotificationSender.java Sat Oct 20 19:04:07 2012
@@ -32,8 +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.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.v1.builder.XmlDocument;
import org.xmlpull.v1.builder.XmlElement;
@@ -46,7 +46,7 @@ import xsul.xbeans_util.XBeansUtil;
public class ServiceNotificationSender {
- private static final Log logger = LogFactory.getLog(ServiceNotificationSender.class);
+ private final static Logger logger = LoggerFactory.getLogger(ServiceNotificationSender.class);
private final static String INVOKED_MESSAGE = "Service is invoked";
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderClient.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderClient.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderClient.java Sat Oct 20 19:04:07 2012
@@ -26,8 +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.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.v1.builder.XmlElement;
import xsul.lead.LeadContextHeader;
@@ -41,7 +41,7 @@ import xsul.xwsif_runtime_async.WSIFAsyn
public class AdderClient {
- private static final Log logger = LogFactory.getLog(AdderClient.class);
+ private final static Logger logger = LoggerFactory.getLogger(AdderClient.class);
private AdderService service;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderImpl.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderImpl.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderImpl.java Sat Oct 20 19:04:07 2012
@@ -25,8 +25,8 @@ import java.util.Random;
import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.xbaya.test.service.ServiceNotificationSender;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.v1.builder.XmlElement;
import org.xmlpull.v1.builder.XmlNamespace;
@@ -34,7 +34,7 @@ import xsul.XmlConstants;
public class AdderImpl implements Adder {
- private static final Log logger = LogFactory.getLog(AdderImpl.class);
+ private final static Logger logger = LoggerFactory.getLogger(AdderImpl.class);
/**
* @see org.apache.airavata.xbaya.test.service.adder.Adder#add(org.xmlpull.v1.builder.XmlElement)
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderService.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderService.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/adder/AdderService.java Sat Oct 20 19:04:07 2012
@@ -24,8 +24,8 @@ package org.apache.airavata.xbaya.test.s
import java.io.File;
import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import xsul.lead.LeadContextHeader;
import xsul.wsdl.WsdlDefinitions;
@@ -42,7 +42,7 @@ public class AdderService {
private final static String OUTPUT_WSDL_LOCATION = "wsdls/sample/adder.wsdl";
- private static final Log logger = LogFactory.getLog(AdderService.class);
+ private final static Logger logger = LoggerFactory.getLogger(AdderService.class);
private HttpBasedServices httpServices;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverClient.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverClient.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverClient.java Sat Oct 20 19:04:07 2012
@@ -26,8 +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.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.v1.builder.XmlElement;
import xsul.lead.LeadContextHeader;
@@ -41,7 +41,7 @@ import xsul.xwsif_runtime_async.WSIFAsyn
public class ApproverClient {
- private static final Log logger = LogFactory.getLog(ApproverClient.class);
+ private final static Logger logger = LoggerFactory.getLogger(ApproverClient.class);
private ApproverService service;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverImpl.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverImpl.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverImpl.java Sat Oct 20 19:04:07 2012
@@ -25,8 +25,8 @@ import java.util.Random;
import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.xbaya.test.service.ServiceNotificationSender;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.v1.builder.XmlElement;
import org.xmlpull.v1.builder.XmlNamespace;
@@ -34,7 +34,7 @@ import xsul.XmlConstants;
public class ApproverImpl implements Approver {
- private static final Log logger = LogFactory.getLog(ApproverImpl.class);
+ private final static Logger logger = LoggerFactory.getLogger(ApproverImpl.class);
/**
* @see org.apache.airavata.xbaya.test.service.approver.Approver#approve(org.xmlpull.v1.builder.XmlElement)
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverService.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverService.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/approver/ApproverService.java Sat Oct 20 19:04:07 2012
@@ -24,8 +24,8 @@ package org.apache.airavata.xbaya.test.s
import java.io.File;
import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import xsul.lead.LeadContextHeader;
import xsul.wsdl.WsdlDefinitions;
@@ -42,7 +42,7 @@ public class ApproverService {
private final static String OUTPUT_WSDL_LOCATION = "wsdls/sample/approver-wsdl.xml";
- private static final Log logger = LogFactory.getLog(ApproverService.class);
+ private final static Logger logger = LoggerFactory.getLogger(ApproverService.class);
private HttpBasedServices httpServices;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderClient.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderClient.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderClient.java Sat Oct 20 19:04:07 2012
@@ -26,8 +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.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.v1.builder.XmlElement;
import xsul.XmlConstants;
@@ -42,7 +42,7 @@ import xsul.xwsif_runtime_async.WSIFAsyn
public class ArrayAdderClient {
- private static final Log logger = LogFactory.getLog(ArrayAdderClient.class);
+ private final static Logger logger = LoggerFactory.getLogger(ArrayAdderClient.class);
private ArrayAdderService service;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderImpl.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderImpl.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderImpl.java Sat Oct 20 19:04:07 2012
@@ -26,8 +26,8 @@ import java.util.Random;
import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.xbaya.test.service.ServiceNotificationSender;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xmlpull.v1.builder.XmlElement;
import org.xmlpull.v1.builder.XmlNamespace;
@@ -35,7 +35,7 @@ import xsul.XmlConstants;
public class ArrayAdderImpl implements ArrayAdder {
- private static final Log logger = LogFactory.getLog(ArrayAdderImpl.class);
+ private final static Logger logger = LoggerFactory.getLogger(ArrayAdderImpl.class);
/**
* @see org.apache.airavata.xbaya.test.service.arrayadder.ArrayAdder#add(org.xmlpull.v1.builder.XmlElement)
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderService.java?rev=1400501&r1=1400500&r2=1400501&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderService.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arrayadder/ArrayAdderService.java Sat Oct 20 19:04:07 2012
@@ -24,8 +24,8 @@ package org.apache.airavata.xbaya.test.s
import java.io.File;
import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import xsul.lead.LeadContextHeader;
import xsul.wsdl.WsdlDefinitions;
@@ -42,7 +42,7 @@ public class ArrayAdderService {
private final static String OUTPUT_WSDL_LOCATION = "wsdls/sample/arrayadder-wsdl.xml";
- private static final Log logger = LogFactory.getLog(ArrayAdderService.class);
+ private final static Logger logger = LoggerFactory.getLogger(ArrayAdderService.class);
private HttpBasedServices httpServices;