You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2012/10/19 23:10:15 UTC
svn commit: r1400294 [5/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/src/main/java/org/apache/airavata/xbaya/test/service/arraygen/ArrayGeneratorImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arraygen/ArrayGeneratorImpl.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arraygen/ArrayGeneratorImpl.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arraygen/ArrayGeneratorImpl.java Fri Oct 19 21:10:06 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.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.xmlpull.v1.builder.XmlElement;
import org.xmlpull.v1.builder.XmlNamespace;
@@ -34,7 +34,7 @@ import xsul.XmlConstants;
public class ArrayGeneratorImpl implements ArrayGenerator {
- private final static Logger logger = LoggerFactory.getLogger(ArrayGeneratorImpl.class);
+ private static final Log logger = LogFactory.getLog(ArrayGeneratorImpl.class);
/**
* @see org.apache.airavata.xbaya.test.service.arraygen.ArrayGenerator#generate(org.xmlpull.v1.builder.XmlElement)
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arraygen/ArrayGeneratorService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arraygen/ArrayGeneratorService.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arraygen/ArrayGeneratorService.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/arraygen/ArrayGeneratorService.java Fri Oct 19 21:10:06 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.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import xsul.lead.LeadContextHeader;
import xsul.wsdl.WsdlDefinitions;
@@ -42,7 +42,7 @@ public class ArrayGeneratorService {
private final static String OUTPUT_WSDL_LOCATION = "wsdls/sample/arraygen-wsdl.xml";
- private final static Logger logger = LoggerFactory.getLogger(ArrayGeneratorService.class);
+ private static final Log logger = LogFactory.getLog(ArrayGeneratorService.class);
private HttpBasedServices httpServices;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/echo/EchoClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/echo/EchoClient.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/echo/EchoClient.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/echo/EchoClient.java Fri Oct 19 21:10:06 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.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.xmlpull.v1.builder.XmlElement;
import xsul.lead.LeadContextHeader;
@@ -41,7 +41,7 @@ import xsul.xwsif_runtime_async.WSIFAsyn
public class EchoClient {
- private final static Logger logger = LoggerFactory.getLogger(EchoClient.class);
+ private static final Log logger = LogFactory.getLog(EchoClient.class);
private EchoService service;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/echo/EchoImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/echo/EchoImpl.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/echo/EchoImpl.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/echo/EchoImpl.java Fri Oct 19 21:10:06 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.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.xmlpull.v1.builder.XmlElement;
import org.xmlpull.v1.builder.XmlNamespace;
@@ -34,7 +34,7 @@ import xsul.XmlConstants;
public class EchoImpl implements Echo {
- private final static Logger logger = LoggerFactory.getLogger(EchoImpl.class);
+ private static final Log logger = LogFactory.getLog(EchoImpl.class);
/**
* @see org.apache.airavata.xbaya.test.service.echo.Echo#echo(org.xmlpull.v1.builder.XmlElement)
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/echo/EchoService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/echo/EchoService.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/echo/EchoService.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/echo/EchoService.java Fri Oct 19 21:10:06 2012
@@ -25,8 +25,8 @@ import java.io.File;
import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.xbaya.test.service.Service;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import xsul.lead.LeadContextHeader;
import xsul.wsdl.WsdlDefinitions;
@@ -37,7 +37,7 @@ import xsul.xservo_soap_http.HttpBasedSe
public class EchoService implements Service {
- private final static Logger logger = LoggerFactory.getLogger(EchoService.class);
+ private static final Log logger = LogFactory.getLog(EchoService.class);
private HttpBasedServices httpServices;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/multiplier/MultiplierImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/multiplier/MultiplierImpl.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/multiplier/MultiplierImpl.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/multiplier/MultiplierImpl.java Fri Oct 19 21:10:06 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.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.xmlpull.v1.builder.XmlElement;
import org.xmlpull.v1.builder.XmlNamespace;
@@ -34,7 +34,7 @@ import xsul.XmlConstants;
public class MultiplierImpl implements Multiplier {
- private final static Logger logger = LoggerFactory.getLogger(MultiplierImpl.class);
+ private static final Log logger = LogFactory.getLog(MultiplierImpl.class);
/**
* @see org.apache.airavata.xbaya.test.service.multiplier.Multiplier#multiply(org.xmlpull.v1.builder.XmlElement)
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/multiplier/MultiplierService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/multiplier/MultiplierService.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/multiplier/MultiplierService.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/service/multiplier/MultiplierService.java Fri Oct 19 21:10:06 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.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import xsul.lead.LeadContextHeader;
import xsul.wsdl.WsdlDefinitions;
@@ -42,7 +42,7 @@ public class MultiplierService {
private final static String OUTPUT_WSDL_LOCATION = "wsdls/sample/multiplier-wsdl.xml";
- private final static Logger logger = LoggerFactory.getLogger(MultiplierService.class);
+ private static final Log logger = LogFactory.getLog(MultiplierService.class);
private HttpBasedServices httpServices;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaGUI.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaGUI.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaGUI.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaGUI.java Fri Oct 19 21:10:06 2012
@@ -86,13 +86,13 @@ import org.apache.airavata.xbaya.ui.widg
import org.apache.airavata.xbaya.ui.widgets.TabLabelButton;
import org.apache.airavata.xbaya.ui.widgets.XBayaToolBar;
import org.apache.airavata.xbaya.ui.widgets.component.ComponentSelector;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.xmlpull.infoset.XmlElement;
public class XBayaGUI implements EventListener, XBayaExecutionModeListener {
- private static final Logger logger = LoggerFactory.getLogger(XBayaGUI.class);
+ private static final Log logger = LogFactory.getLog(XBayaGUI.class);
private static final int STATIC_MENU_ITEMS = 4;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/AboutWindow.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/AboutWindow.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/AboutWindow.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/AboutWindow.java Fri Oct 19 21:10:06 2012
@@ -38,14 +38,14 @@ import org.apache.airavata.common.utils.
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.XBayaVersion;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import xsul5.XmlConstants;
public class AboutWindow {
- private static final Logger logger = LoggerFactory.getLogger(AboutWindow.class);
+ private static final Log logger = LogFactory.getLog(AboutWindow.class);
private XBayaEngine engine;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/ErrorWindow.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/ErrorWindow.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/ErrorWindow.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/ErrorWindow.java Fri Oct 19 21:10:06 2012
@@ -36,8 +36,8 @@ import javax.swing.SwingUtilities;
import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
import org.apache.airavata.xbaya.ui.widgets.GridPanel;
import org.apache.airavata.xbaya.ui.widgets.XBayaTextArea;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class ErrorWindow {
@@ -47,7 +47,7 @@ public class ErrorWindow {
private static final String DEFAULT_INFORMATION_TITLE = "Information";
- private static final Logger logger = LoggerFactory.getLogger(ErrorWindow.class);
+ private static final Log logger = LogFactory.getLog(ErrorWindow.class);
private Component defaultParent;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/GridChemRunnerWindow.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/GridChemRunnerWindow.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/GridChemRunnerWindow.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/GridChemRunnerWindow.java Fri Oct 19 21:10:06 2012
@@ -61,15 +61,15 @@ import org.apache.commons.httpclient.Htt
import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.NameValuePair;
import org.apache.commons.httpclient.methods.PostMethod;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.xmlpull.infoset.XmlElement;
import xsul5.wsdl.WsdlDefinitions;
public class GridChemRunnerWindow {
- private static final Logger logger = LoggerFactory.getLogger(GridChemRunnerWindow.class);
+ private static final Log logger = LogFactory.getLog(GridChemRunnerWindow.class);
private XBayaEngine engine;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/JythonRunnerWindow.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/JythonRunnerWindow.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/JythonRunnerWindow.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/JythonRunnerWindow.java Fri Oct 19 21:10:06 2012
@@ -56,15 +56,15 @@ 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.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.xmlpull.infoset.XmlElement;
import xsul5.wsdl.WsdlDefinitions;
public class JythonRunnerWindow {
- private static final Logger logger = LoggerFactory.getLogger(JythonRunnerWindow.class);
+ private static final Log logger = LogFactory.getLog(JythonRunnerWindow.class);
private XBayaEngine engine;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/TextWindow.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/TextWindow.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/TextWindow.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/TextWindow.java Fri Oct 19 21:10:06 2012
@@ -42,14 +42,14 @@ import org.apache.airavata.common.utils.
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.ui.widgets.GridPanel;
import org.apache.airavata.xbaya.ui.widgets.XBayaTextField;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import xsul5.XmlConstants;
public class TextWindow {
- private static final Logger logger = LoggerFactory.getLogger(TextWindow.class);
+ private static final Log logger = LogFactory.getLog(TextWindow.class);
private XBayaEngine engine;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/WaitDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/WaitDialog.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/WaitDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/WaitDialog.java Fri Oct 19 21:10:06 2012
@@ -35,12 +35,12 @@ import javax.swing.WindowConstants;
import org.apache.airavata.common.utils.SwingUtil;
import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.utils.Cancelable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class WaitDialog {
- private static final Logger logger = LoggerFactory.getLogger(WaitDialog.class);
+ private static final Log logger = LogFactory.getLog(WaitDialog.class);
private XBayaGUI xbayaGUI;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java Fri Oct 19 21:10:06 2012
@@ -65,8 +65,8 @@ import org.apache.airavata.xbaya.ui.widg
import org.apache.airavata.xbaya.ui.widgets.XBayaLabel;
import org.apache.airavata.xbaya.ui.widgets.XBayaTextField;
import org.apache.airavata.xbaya.util.XBayaUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.xmlpull.infoset.XmlElement;
import org.xmlpull.v1.builder.XmlInfosetBuilder;
@@ -75,7 +75,7 @@ import xsul.lead.LeadResourceMapping;
public class DynamicWorkflowRunnerWindow {
- private static final Logger logger = LoggerFactory.getLogger(DynamicWorkflowRunnerWindow.class);
+ private static final Log logger = LogFactory.getLog(DynamicWorkflowRunnerWindow.class);
private XBayaEngine engine;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/myproxy/MyProxyLoader.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/myproxy/MyProxyLoader.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/myproxy/MyProxyLoader.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/myproxy/MyProxyLoader.java Fri Oct 19 21:10:06 2012
@@ -27,12 +27,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.globus.myproxy.MyProxyException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class MyProxyLoader implements Cancelable {
- private static final Logger logger = LoggerFactory.getLogger(MyProxyLoader.class);
+ private static final Log logger = LogFactory.getLog(MyProxyLoader.class);
private XBayaEngine engine;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java Fri Oct 19 21:10:06 2012
@@ -64,8 +64,8 @@ import org.apache.airavata.xbaya.ui.widg
import org.apache.airavata.xbaya.ui.widgets.XBayaTextField;
import org.apache.airavata.xbaya.util.XBayaUtil;
import org.apache.axiom.om.impl.llom.util.AXIOMUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.xmlpull.infoset.XmlElement;
import org.xmlpull.v1.builder.XmlInfosetBuilder;
@@ -73,7 +73,7 @@ import xsul.XmlConstants;
public class WorkflowInterpreterLaunchWindow {
- private static final Logger logger = LoggerFactory.getLogger(WorkflowInterpreterLaunchWindow.class);
+ private static final Log logger = LogFactory.getLog(WorkflowInterpreterLaunchWindow.class);
private XBayaEngine engine;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/GraphCanvas.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/GraphCanvas.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/GraphCanvas.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/GraphCanvas.java Fri Oct 19 21:10:06 2012
@@ -84,8 +84,8 @@ import org.apache.airavata.xbaya.core.id
import org.apache.airavata.xbaya.graph.controller.NodeController;
import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
import org.apache.airavata.xbaya.ui.widgets.component.ComponentSourceTransferable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.xmlpull.infoset.XmlElement;
@@ -95,7 +95,7 @@ import org.xmlpull.infoset.XmlElement;
*/
public class GraphCanvas implements XBayaExecutionModeListener{
- private static final Logger logger = LoggerFactory.getLogger(GraphCanvas.class);
+ private static final Log logger = LogFactory.getLog(GraphCanvas.class);
private XBayaEngine engine;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/dynamic/DynamicNodeGUI.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/dynamic/DynamicNodeGUI.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/dynamic/DynamicNodeGUI.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/dynamic/DynamicNodeGUI.java Fri Oct 19 21:10:06 2012
@@ -27,12 +27,12 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.ui.dialogs.graph.dynamic.DynamicNodeWindow;
import org.apache.airavata.xbaya.ui.graph.NodeGUI;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class DynamicNodeGUI extends NodeGUI {
- private final static Logger logger = LoggerFactory.getLogger(DynamicNodeGUI.class);
+ private static final Log logger = LogFactory.getLog(DynamicNodeGUI.class);
private DynamicNode node;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/subworkflow/SubWorkflowNodeGUI.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/subworkflow/SubWorkflowNodeGUI.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/subworkflow/SubWorkflowNodeGUI.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/subworkflow/SubWorkflowNodeGUI.java Fri Oct 19 21:10:06 2012
@@ -32,12 +32,12 @@ import org.apache.airavata.xbaya.XBayaEn
import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.graph.NodeGUI;
import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class SubWorkflowNodeGUI extends NodeGUI {
- private final static Logger logger = LoggerFactory.getLogger(SubWorkflowNodeGUI.class);
+ private static final Log logger = LogFactory.getLog(SubWorkflowNodeGUI.class);
private SubWorkflowNode node;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/ws/WSNodeGUI.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/ws/WSNodeGUI.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/ws/WSNodeGUI.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/ws/WSNodeGUI.java Fri Oct 19 21:10:06 2012
@@ -37,12 +37,12 @@ import org.apache.airavata.xbaya.ui.dial
import org.apache.airavata.xbaya.ui.dialogs.graph.ws.WSNodeWindow;
import org.apache.airavata.xbaya.ui.graph.NodeGUI;
import org.apache.airavata.xbaya.ui.monitor.MonitorEventHandler.NodeState;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class WSNodeGUI extends NodeGUI {
- private final static Logger logger = LoggerFactory.getLogger(WSNodeGUI.class);
+ private static final Log logger = LogFactory.getLog(WSNodeGUI.class);
private WSNode node;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/ws/WorkflowNodeGUI.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/ws/WorkflowNodeGUI.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/ws/WorkflowNodeGUI.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/graph/ws/WorkflowNodeGUI.java Fri Oct 19 21:10:06 2012
@@ -30,12 +30,12 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.ui.graph.NodeGUI;
import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class WorkflowNodeGUI extends NodeGUI {
- private final static Logger logger = LoggerFactory.getLogger(WorkflowNodeGUI.class);
+ private static final Log logger = LogFactory.getLog(WorkflowNodeGUI.class);
private WorkflowNode node;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/EditMenuItem.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/EditMenuItem.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/EditMenuItem.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/EditMenuItem.java Fri Oct 19 21:10:06 2012
@@ -34,8 +34,8 @@ import org.apache.airavata.xbaya.ui.dial
import org.apache.airavata.xbaya.ui.dialogs.workflow.ParameterPropertyWindow;
import org.apache.airavata.xbaya.ui.dialogs.workflow.WorkflowPropertyWindow;
import org.apache.airavata.xbaya.util.XBayaUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class EditMenuItem {
@@ -53,7 +53,7 @@ public class EditMenuItem {
private JMenuItem editApplicationDescription;
- private static final Logger logger = LoggerFactory.getLogger(EditMenuItem.class);
+ private static final Log logger = LogFactory.getLog(EditMenuItem.class);
/**
* Constructs a WorkflowMenu.
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RegistryMenuItem.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RegistryMenuItem.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RegistryMenuItem.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RegistryMenuItem.java Fri Oct 19 21:10:06 2012
@@ -36,8 +36,8 @@ import org.apache.airavata.xbaya.ui.dial
import org.apache.airavata.xbaya.ui.widgets.ToolbarButton;
import org.apache.airavata.xbaya.ui.widgets.XBayaToolBar;
import org.apache.airavata.xbaya.util.XBayaUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class RegistryMenuItem implements XBayaExecutionModeListener {
@@ -49,7 +49,7 @@ public class RegistryMenuItem implements
private JMenuItem jcrRegistryItem;
- private static final Logger logger = LoggerFactory.getLogger(RegistryMenuItem.class);
+ private static final Log logger = LogFactory.getLog(RegistryMenuItem.class);
private XBayaToolBar toolBar;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java Fri Oct 19 21:10:06 2012
@@ -55,8 +55,8 @@ import org.apache.airavata.xbaya.ui.moni
import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
import org.apache.airavata.xbaya.ui.widgets.ToolbarButton;
import org.apache.airavata.xbaya.ui.widgets.XBayaToolBar;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class RunMenuItem implements EventListener, XBayaExecutionModeListener{
@@ -80,7 +80,7 @@ public class RunMenuItem implements Eve
private JMenuItem resetMonitoringItem;
- private static final Logger logger = LoggerFactory.getLogger(RunMenuItem.class);
+ private static final Log logger = LogFactory.getLog(RunMenuItem.class);
private static final String EXECUTE_ACTIONS = "run_actions";
private static final String EXECUTE_MONITOR_ACTIONS = "monitor_actions";
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/ViewMenuItem.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/ViewMenuItem.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/ViewMenuItem.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/ViewMenuItem.java Fri Oct 19 21:10:06 2012
@@ -31,8 +31,8 @@ import javax.swing.JMenu;
import javax.swing.JMenuItem;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class ViewMenuItem {
@@ -48,9 +48,6 @@ public class ViewMenuItem {
private JMenuItem parametersView;
- private static final Logger logger = LoggerFactory
- .getLogger(ViewMenuItem.class);
-
/**
* Constructs a WorkflowMenu.
*
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java Fri Oct 19 21:10:06 2012
@@ -55,12 +55,12 @@ import org.apache.airavata.xbaya.ui.grap
import org.apache.airavata.xbaya.ui.widgets.ToolbarButton;
import org.apache.airavata.xbaya.ui.widgets.XBayaToolBar;
import org.apache.airavata.xbaya.util.XBayaUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class XBayaMenuItem implements XBayaExecutionModeListener {
- private static final Logger logger = LoggerFactory.getLogger(XBayaMenuItem.class);
+ private static final Log logger = LogFactory.getLog(XBayaMenuItem.class);
private JMenu xbayaMenuItem;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java Fri Oct 19 21:10:06 2012
@@ -55,8 +55,8 @@ import org.apache.airavata.xbaya.monitor
import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.graph.GraphCanvas;
import org.apache.airavata.xbaya.ui.graph.NodeGUI;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.xmlpull.infoset.XmlElement;
public class MonitorEventHandler implements ChangeListener {
@@ -97,7 +97,7 @@ public class MonitorEventHandler impleme
}
}
- private static Logger logger = LoggerFactory.getLogger(MonitorEventHandler.class);
+ private static final Log logger = LogFactory.getLog(MonitorEventHandler.class);
private XBayaGUI xbayaGUI;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorStarter.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorStarter.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorStarter.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorStarter.java Fri Oct 19 21:10:06 2012
@@ -26,12 +26,12 @@ import org.apache.airavata.xbaya.monitor
import org.apache.airavata.xbaya.ui.dialogs.WaitDialog;
import org.apache.airavata.xbaya.ui.utils.Cancelable;
import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class MonitorStarter implements Cancelable {
- private static final Logger logger = LoggerFactory.getLogger(MonitorStarter.class);
+ private static final Log logger = LogFactory.getLog(MonitorStarter.class);
private XBayaEngine engine;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/component/ComponentSelector.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/component/ComponentSelector.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/component/ComponentSelector.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/component/ComponentSelector.java Fri Oct 19 21:10:06 2012
@@ -64,8 +64,8 @@ import org.apache.airavata.xbaya.compone
import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
import org.apache.airavata.xbaya.ui.widgets.XBayaComponent;
import org.apache.airavata.xbaya.ui.widgets.component.ComponentSelectorEvent.ComponentSelectorEventType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* The ComponentTreeViewer class shows the selectedComponent tree.
@@ -78,7 +78,7 @@ public class ComponentSelector implement
*/
public static final String TITLE = "Component List";
- private static final Logger logger = LoggerFactory.getLogger(ComponentSelector.class);
+ private static final Log logger = LogFactory.getLog(ComponentSelector.class);
private XBayaEngine engine;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java Fri Oct 19 21:10:06 2012
@@ -60,8 +60,8 @@ import org.apache.airavata.xbaya.lead.Le
import org.apache.airavata.xbaya.monitor.MonitorConfiguration;
import org.apache.airavata.xbaya.ui.dialogs.registry.JCRRegistryWindow;
import org.apache.axis2.util.XMLUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
import org.xmlpull.infoset.XmlElement;
@@ -72,7 +72,7 @@ import xsul5.XmlConstants;
public class XBayaUtil {
- private static final Logger logger = LoggerFactory.getLogger(XBayaUtil.class);
+ private static final Log logger = LogFactory.getLog(XBayaUtil.class);
public static final String JCR_USER = "jcr.username";
public static final String JCR_PASS = "jcr.password";
public static final String JCR_URL = "jcr.url";
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/WorkflowClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/WorkflowClient.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/WorkflowClient.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/WorkflowClient.java Fri Oct 19 21:10:06 2012
@@ -33,8 +33,8 @@ import org.apache.airavata.xbaya.event.E
import org.apache.airavata.xbaya.security.UserX509Credential;
import org.gpel.client.GcInstance;
import org.gpel.client.GcSearchList;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import xsul5.wsdl.WsdlDefinitions;
@@ -62,7 +62,7 @@ public abstract class WorkflowClient ext
protected static final String GRAPH_MIME_TYPE = "application/x-xbaya+xml";
- protected final static Logger logger = LoggerFactory.getLogger(WorkflowClient.class);
+ private static final Log logger = LogFactory.getLog(WorkflowClient.class);
protected URI engineURL;
Modified: airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexForEachWorkflowTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexForEachWorkflowTest.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexForEachWorkflowTest.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexForEachWorkflowTest.java Fri Oct 19 21:10:06 2012
@@ -39,8 +39,8 @@ import org.junit.Test;
import org.junit.rules.MethodRule;
import org.junit.rules.TestWatchman;
import org.junit.runners.model.FrameworkMethod;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class ComplexForEachWorkflowTest {
final Logger logger = LoggerFactory.getLogger(ForEachWorkflowTest.class);
Modified: airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java Fri Oct 19 21:10:06 2012
@@ -40,8 +40,8 @@ import org.junit.Test;
import org.junit.rules.MethodRule;
import org.junit.rules.TestWatchman;
import org.junit.runners.model.FrameworkMethod;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class ComplexMathWorkflowTest {
final Logger logger = LoggerFactory.getLogger(ComplexMathWorkflowTest.class);
Modified: airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java Fri Oct 19 21:10:06 2012
@@ -40,8 +40,8 @@ import org.junit.Test;
import org.junit.rules.MethodRule;
import org.junit.rules.TestWatchman;
import org.junit.runners.model.FrameworkMethod;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class CrossProductWorkflowTest {
final Logger logger = LoggerFactory.getLogger(CrossProductWorkflowTest.class);
Modified: airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java Fri Oct 19 21:10:06 2012
@@ -40,8 +40,8 @@ import org.junit.Test;
import org.junit.rules.MethodRule;
import org.junit.rules.TestWatchman;
import org.junit.runners.model.FrameworkMethod;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class ForEachWorkflowTest {
final Logger logger = LoggerFactory.getLogger(ForEachWorkflowTest.class);
Modified: airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/RegistryServiceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/RegistryServiceTest.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/RegistryServiceTest.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/RegistryServiceTest.java Fri Oct 19 21:10:06 2012
@@ -34,8 +34,8 @@ import org.junit.rules.ExpectedException
import org.junit.rules.MethodRule;
import org.junit.rules.TestWatchman;
import org.junit.runners.model.FrameworkMethod;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
//FIXME: Add tests for new registry. Airavata-592
public class RegistryServiceTest {
@Rule
Modified: airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleForEachWorkflowTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleForEachWorkflowTest.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleForEachWorkflowTest.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleForEachWorkflowTest.java Fri Oct 19 21:10:06 2012
@@ -39,8 +39,8 @@ import org.junit.Test;
import org.junit.rules.MethodRule;
import org.junit.rules.TestWatchman;
import org.junit.runners.model.FrameworkMethod;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class SimpleForEachWorkflowTest {
final Logger logger = LoggerFactory.getLogger(ForEachWorkflowTest.class);
Modified: airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java Fri Oct 19 21:10:06 2012
@@ -40,8 +40,8 @@ import org.junit.Test;
import org.junit.rules.MethodRule;
import org.junit.rules.TestWatchman;
import org.junit.runners.model.FrameworkMethod;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class SimpleMathWorkflowTest {
final Logger logger = LoggerFactory.getLogger(SimpleMathWorkflowTest.class);
Modified: airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java Fri Oct 19 21:10:06 2012
@@ -41,8 +41,8 @@ import org.junit.Test;
import org.junit.rules.MethodRule;
import org.junit.rules.TestWatchman;
import org.junit.runners.model.FrameworkMethod;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class WorkflowTest{
final Logger logger = LoggerFactory.getLogger(WorkflowTest.class);
Modified: airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTrackingTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTrackingTest.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTrackingTest.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTrackingTest.java Fri Oct 19 21:10:06 2012
@@ -32,13 +32,13 @@ import org.junit.Test;
import org.junit.rules.MethodRule;
import org.junit.rules.TestWatchman;
import org.junit.runners.model.FrameworkMethod;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import java.util.Properties;
public class WorkflowTrackingTest implements ConsumerNotificationHandler{
- final static Logger logger = LoggerFactory.getLogger(ConsumerNotificationHandler.class);
+ final private static final Log logger = LogFactory.getLog(ConsumerNotificationHandler.class);
@Rule
public MethodRule watchman = new TestWatchman() {
Modified: airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/XBayaClientTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/XBayaClientTest.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/XBayaClientTest.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/XBayaClientTest.java Fri Oct 19 21:10:06 2012
@@ -30,11 +30,11 @@ import org.junit.Test;
import org.junit.rules.MethodRule;
import org.junit.rules.TestWatchman;
import org.junit.runners.model.FrameworkMethod;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class XBayaClientTest {
- final static Logger logger = LoggerFactory.getLogger(XBayaClientTest.class);
+ final private static final Log logger = LogFactory.getLog(XBayaClientTest.class);
@Rule
public MethodRule watchman = new TestWatchman() {
Modified: airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/XBayaConsolidatedTestSuite.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/XBayaConsolidatedTestSuite.java?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/XBayaConsolidatedTestSuite.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/XBayaConsolidatedTestSuite.java Fri Oct 19 21:10:06 2012
@@ -31,8 +31,8 @@ import org.junit.rules.TestWatchman;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.model.FrameworkMethod;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
@RunWith(Suite.class)
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
public class XBayaConsolidatedTestSuite {
private static ListenerManager manager = null;
- final static Logger logger = LoggerFactory.getLogger(XBayaConsolidatedTestSuite.class);
+ final private static final Log logger = LogFactory.getLog(XBayaConsolidatedTestSuite.class);
@Rule
public MethodRule watchman = new TestWatchman() {
Modified: airavata/trunk/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/pom.xml?rev=1400294&r1=1400293&r2=1400294&view=diff
==============================================================================
--- airavata/trunk/pom.xml (original)
+++ airavata/trunk/pom.xml Fri Oct 19 21:10:06 2012
@@ -265,10 +265,15 @@
<dependencyManagement>
<dependencies>
- <dependency>
+ <!--dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${org.slf4j.version}</version>
+ </dependency-->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -280,11 +285,11 @@
<artifactId>junit</artifactId>
<version>${junit.version}</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${org.slf4j.version}</version>
- </dependency>
+ </dependency-->
</dependencies>
</dependencyManagement>
<repositories>