335872: Replaced MavenLogger with slf4j loggers

6 files changed, 32 insertions, 23 deletions

diff --git a/org.eclipse.m2e.launching/src/org/eclipse/m2e/actions/ExecutePomAction.java b/org.eclipse.m2e.launching/src/org/eclipse/m2e/actions/ExecutePomAction.java
index 39fdcc83..78796491 100644
--- a/org.eclipse.m2e.launching/src/org/eclipse/m2e/actions/ExecutePomAction.java
+++ b/org.eclipse.m2e.launching/src/org/eclipse/m2e/actions/ExecutePomAction.java
@@ -47,7 +47,6 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.window.Window;
 import org.eclipse.m2e.core.MavenPlugin;
 import org.eclipse.m2e.core.core.IMavenConstants;
-import org.eclipse.m2e.core.core.MavenLogger;
 import org.eclipse.m2e.core.project.IMavenProjectFacade;
 import org.eclipse.m2e.core.project.MavenProjectManager;
 import org.eclipse.m2e.core.project.ResolverConfiguration;
@@ -62,6 +61,8 @@ import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IFileEditorInput;
 import org.eclipse.ui.dialogs.ElementListSelectionDialog;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -71,6 +72,7 @@ import org.eclipse.ui.dialogs.ElementListSelectionDialog;
  * @author Eugene Kuleshov
  */
 public class ExecutePomAction implements ILaunchShortcut, IExecutableExtension {
+  private static final Logger log = LoggerFactory.getLogger(ExecutePomAction.class);
 
   private boolean showDialog = false;
 
@@ -143,7 +145,7 @@ public class ExecutePomAction implements ILaunchShortcut, IExecutableExtension {
         String goals = launchConfiguration.getAttribute(MavenLaunchConstants.ATTR_GOALS, (String) null);
         openDialog = goals == null || goals.trim().length() == 0;
       } catch(CoreException ex) {
-        MavenLogger.log(ex);
+        log.error(ex.getMessage(), ex);
       }
     }
 
@@ -216,7 +218,7 @@ public class ExecutePomAction implements ILaunchShortcut, IExecutableExtension {
 
       return workingCopy;
     } catch(CoreException ex) {
-      MavenLogger.log(ex);
+      log.error(ex.getMessage(), ex);
     }
     return null;
   }
@@ -346,7 +348,7 @@ public class ExecutePomAction implements ILaunchShortcut, IExecutableExtension {
         }
         
       } catch(CoreException ex) {
-        MavenLogger.log(ex);
+        log.error(ex.getMessage(), ex);
       }
     }
 
@@ -366,7 +368,7 @@ public class ExecutePomAction implements ILaunchShortcut, IExecutableExtension {
 
       return workingCopy.doSave();
     } catch(Exception ex) {
-      MavenLogger.log("Error creating new launch configuration", ex);
+      log.error("Error creating new launch configuration", ex);
     }
     return null;
   }
diff --git a/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenConsoleLineTracker.java b/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenConsoleLineTracker.java
index 7023f497..2f7bae5a 100644
--- a/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenConsoleLineTracker.java
+++ b/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenConsoleLineTracker.java
@@ -35,6 +35,9 @@ import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.m2e.actions.MavenLaunchConstants;
+import org.eclipse.m2e.core.MavenPlugin;
+import org.eclipse.m2e.core.project.IMavenProjectFacade;
+import org.eclipse.m2e.core.project.MavenProjectManager;
 import org.eclipse.ui.IEditorDescriptor;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPage;
@@ -43,10 +46,8 @@ import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.console.IHyperlink;
 import org.eclipse.ui.ide.IDE;
-import org.eclipse.m2e.core.MavenPlugin;
-import org.eclipse.m2e.core.core.MavenLogger;
-import org.eclipse.m2e.core.project.IMavenProjectFacade;
-import org.eclipse.m2e.core.project.MavenProjectManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -55,6 +56,7 @@ import org.eclipse.m2e.core.project.MavenProjectManager;
  * @author Eugene Kuleshov
  */
 public class MavenConsoleLineTracker implements IConsoleLineTracker {
+  private static final Logger log = LoggerFactory.getLogger(MavenConsoleLineTracker.class);
 
   private static final String PLUGIN_ID = "org.eclipse.m2e.launching"; //$NON-NLS-1$
 
@@ -120,7 +122,7 @@ public class MavenConsoleLineTracker implements IConsoleLineTracker {
       } catch(BadLocationException ex) {
         // ignore
       } catch(CoreException ex) {
-        MavenLogger.log(ex);
+        log.error(ex.getMessage(), ex);
       }
     }
   }
@@ -137,7 +139,7 @@ public class MavenConsoleLineTracker implements IConsoleLineTracker {
       ILaunchConfigurationType type = launchConfiguration.getType();
       return PLUGIN_ID.equals(type.getPluginIdentifier());
     } catch(CoreException ex) {
-      MavenLogger.log(ex);
+      log.error(ex.getMessage(), ex);
       return false;
     }
   }
@@ -233,7 +235,7 @@ public class MavenConsoleLineTracker implements IConsoleLineTracker {
         try {
           IDE.openEditor(page, new MavenFileEditorInput(reportFile.getAbsolutePath()), desc.getId());
         } catch(PartInitException ex) {
-          MavenLogger.log(ex);
+          log.error(ex.getMessage(), ex);
         }
       }
     }
@@ -265,7 +267,7 @@ public class MavenConsoleLineTracker implements IConsoleLineTracker {
       try {
         launchRemoteJavaApp(baseDir, portString);
       } catch (CoreException ex) {
-        MavenLogger.log(ex);
+        log.error(ex.getMessage(), ex);
       }
     }
 
diff --git a/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenFileEditorInput.java b/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenFileEditorInput.java
index 56fffd5c..7e6c1f73 100644
--- a/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenFileEditorInput.java
+++ b/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenFileEditorInput.java
@@ -23,13 +23,12 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.m2e.core.core.IMavenConstants;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.ui.IPersistableElement;
 import org.eclipse.ui.IStorageEditorInput;
 import org.eclipse.ui.editors.text.ILocationProvider;
 
-import org.eclipse.m2e.core.core.IMavenConstants;
-
 /**
  * Maven file editor input
  *
diff --git a/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchDelegate.java b/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchDelegate.java
index 87cab6c4..9ac8550d 100644
--- a/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchDelegate.java
+++ b/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchDelegate.java
@@ -38,12 +38,14 @@ import org.eclipse.m2e.actions.MavenLaunchConstants;
 import org.eclipse.m2e.core.MavenPlugin;
 import org.eclipse.m2e.core.core.IMavenConstants;
 import org.eclipse.m2e.core.core.MavenConsole;
-import org.eclipse.m2e.core.core.MavenLogger;
 import org.eclipse.m2e.core.embedder.IMavenConfiguration;
 import org.eclipse.m2e.core.embedder.IMavenLauncherConfiguration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 public class MavenLaunchDelegate extends JavaLaunchDelegate implements MavenLaunchConstants {
+  private static final Logger log = LoggerFactory.getLogger(MavenLaunchDelegate.class);
 
   private static final String LAUNCHER_TYPE = "org.codehaus.classworlds.Launcher"; //$NON-NLS-1$
   private static final String LAUNCHER_TYPE3 = "org.codehaus.plexus.classworlds.launcher.Launcher"; // classwordls 2.0 //$NON-NLS-1$
@@ -200,7 +202,7 @@ public class MavenLaunchDelegate extends JavaLaunchDelegate implements MavenLaun
       }
     } catch(CoreException e) {
       String msg = "Exception while getting configuration attribute " + ATTR_PROPERTIES;
-      MavenLogger.log(msg, e);
+      log.error(msg, e);
     }
 
     try {
@@ -210,7 +212,7 @@ public class MavenLaunchDelegate extends JavaLaunchDelegate implements MavenLaun
       }
     } catch(CoreException ex) {
       String msg = "Exception while getting configuration attribute " + ATTR_PROFILES;
-      MavenLogger.log(msg, ex);
+      log.error(msg, ex);
     }
 
     return sb.toString();
@@ -335,7 +337,7 @@ public class MavenLaunchDelegate extends JavaLaunchDelegate implements MavenLaun
             RefreshTab.refreshResources(configuration, monitor);
             return Status.OK_STATUS;
           } catch (CoreException e) {
-            MavenLogger.log(e);
+            log.error(e.getMessage(), e);
             return e.getStatus();
           } 
         }
diff --git a/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchUtils.java b/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchUtils.java
index 6b8e5532..c76a5734 100644
--- a/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchUtils.java
+++ b/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchUtils.java
@@ -26,7 +26,6 @@ import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.m2e.actions.MavenLaunchConstants;
 import org.eclipse.m2e.core.MavenPlugin;
 import org.eclipse.m2e.core.core.IMavenConstants;
-import org.eclipse.m2e.core.core.MavenLogger;
 import org.eclipse.m2e.core.embedder.IMaven;
 import org.eclipse.m2e.core.embedder.IMavenLauncherConfiguration;
 import org.eclipse.m2e.core.embedder.MavenRuntime;
@@ -34,6 +33,8 @@ import org.eclipse.m2e.core.embedder.MavenRuntimeManager;
 import org.eclipse.m2e.core.project.IMavenProjectFacade;
 import org.eclipse.m2e.core.project.MavenProjectManager;
 import org.eclipse.osgi.util.NLS;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.ibm.icu.util.StringTokenizer;
 
@@ -43,6 +44,7 @@ import com.ibm.icu.util.StringTokenizer;
  * @author Igor Fedorenko
  */
 public class MavenLaunchUtils {
+  private static final Logger log = LoggerFactory.getLogger(MavenLaunchUtils.class);
 
   public static MavenRuntime getMavenRuntime(ILaunchConfiguration configuration) throws CoreException {
     MavenRuntimeManager runtimeManager = MavenPlugin.getDefault().getMavenRuntimeManager();
@@ -104,7 +106,7 @@ public class MavenLaunchUtils {
             collector.addArchiveEntry(file.getAbsolutePath());
           }
         } catch(CoreException ex) {
-          MavenLogger.log("Artifact not found " + name, ex);
+          log.error("Artifact not found " + name, ex);
         }
       }
     }
diff --git a/org.eclipse.m2e.launching/src/org/eclipse/m2e/ui/internal/launch/MavenLaunchMainTab.java b/org.eclipse.m2e.launching/src/org/eclipse/m2e/ui/internal/launch/MavenLaunchMainTab.java
index 05f84bd8..669e04e5 100644
--- a/org.eclipse.m2e.launching/src/org/eclipse/m2e/ui/internal/launch/MavenLaunchMainTab.java
+++ b/org.eclipse.m2e.launching/src/org/eclipse/m2e/ui/internal/launch/MavenLaunchMainTab.java
@@ -37,7 +37,6 @@ import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.m2e.actions.MavenLaunchConstants;
 import org.eclipse.m2e.core.MavenPlugin;
-import org.eclipse.m2e.core.core.MavenLogger;
 import org.eclipse.m2e.core.core.Messages;
 import org.eclipse.m2e.core.embedder.IMavenConfiguration;
 import org.eclipse.m2e.core.embedder.MavenRuntime;
@@ -70,6 +69,8 @@ import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.dialogs.ContainerSelectionDialog;
 import org.eclipse.ui.dialogs.PreferencesUtil;
 import org.eclipse.ui.externaltools.internal.model.IExternalToolConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -80,6 +81,7 @@ import org.eclipse.ui.externaltools.internal.model.IExternalToolConstants;
  */
 @SuppressWarnings("restriction")
 public class MavenLaunchMainTab extends AbstractLaunchConfigurationTab implements MavenLaunchConstants {
+  private static final Logger log = LoggerFactory.getLogger(MavenLaunchMainTab.class);
 
   public static final String ID_EXTERNAL_TOOLS_LAUNCH_GROUP = "org.eclipse.ui.externaltools.launchGroup"; //$NON-NLS-1$
 
@@ -603,7 +605,7 @@ public class MavenLaunchMainTab extends AbstractLaunchConfigurationTab implement
     try {
       return configuration.getAttribute(name, defaultValue);
     } catch(CoreException ex) {
-      MavenLogger.log(ex);
+      log.error(ex.getMessage(), ex);
       return defaultValue;
     }
   }