335872: Replaced MavenLogger with slf4j loggers

16 files changed, 65 insertions, 51 deletions

diff --git a/org.eclipse.m2e.editor/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor/META-INF/MANIFEST.MF
index 953c878f..7e02623a 100644
--- a/org.eclipse.m2e.editor/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.editor/META-INF/MANIFEST.MF
@@ -16,7 +16,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.m2e.maven.runtime;bundle-version="[0.13.0,0.14.0)",
  org.eclipse.m2e.model.edit;bundle-version="[0.13.0,0.14.0)",
  org.eclipse.m2e.editor.xml;bundle-version="[0.13.0,0.14.0)",
- org.eclipse.m2e.core.ui;bundle-version="[0.13.0,0.14.0)"
+ org.eclipse.m2e.core.ui;bundle-version="[0.13.0,0.14.0)",
+ org.slf4j.api;bundle-version="1.5.11"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5,
  JavaSE-1.6
diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/MavenEditorImages.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/MavenEditorImages.java
index 2597fa6c..598c01fc 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/MavenEditorImages.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/MavenEditorImages.java
@@ -13,14 +13,16 @@ package org.eclipse.m2e.editor;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.m2e.core.core.MavenLogger;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author Eugene Kuleshov
  */
 public class MavenEditorImages {
+  private static final Logger log = LoggerFactory.getLogger(MavenEditorImages.class);
 
   // images
   
@@ -114,7 +116,7 @@ public class MavenEditorImages {
       }
       return imageDescriptor;
     } catch (Exception ex) {
-      MavenLogger.log(key, ex);
+      log.error(key, ex);
       return null;
     }
   }
diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/composites/DependenciesComposite.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/composites/DependenciesComposite.java
index 6283ab0c..ad39bf25 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/composites/DependenciesComposite.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/composites/DependenciesComposite.java
@@ -46,7 +46,6 @@ import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.jface.window.Window;
 import org.eclipse.m2e.core.MavenPlugin;
-import org.eclipse.m2e.core.core.MavenLogger;
 import org.eclipse.m2e.core.index.IndexedArtifactFile;
 import org.eclipse.m2e.core.project.IMavenProjectFacade;
 import org.eclipse.m2e.core.project.MavenProjectManager;
@@ -82,12 +81,15 @@ import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.Section;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
  * @author Eugene Kuleshov
  */
 public class DependenciesComposite extends Composite {
+  private static final Logger log = LoggerFactory.getLogger(DependenciesComposite.class);
 
   protected static PomPackage POM_PACKAGE = PomPackage.eINSTANCE;
 
@@ -664,7 +666,7 @@ public class DependenciesComposite extends Composite {
         return a.getBaseVersion();
       }
     } catch(CoreException ex) {
-      MavenLogger.log(ex);
+      log.error(ex.getMessage(), ex);
     }
     return null;
   }
diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/composites/DependencyDetailComposite.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/composites/DependencyDetailComposite.java
index 4600db72..ad5f5c94 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/composites/DependencyDetailComposite.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/composites/DependencyDetailComposite.java
@@ -12,7 +12,6 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.m2e.core.core.MavenLogger;
 import org.eclipse.m2e.core.ui.internal.actions.OpenPomAction;
 import org.eclipse.m2e.core.ui.internal.search.util.Packaging;
 import org.eclipse.m2e.core.ui.internal.util.M2EUIUtils;
@@ -37,9 +36,12 @@ import org.eclipse.ui.forms.events.HyperlinkAdapter;
 import org.eclipse.ui.forms.events.HyperlinkEvent;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.Hyperlink;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 public class DependencyDetailComposite extends Composite {
+  private static final Logger log = LoggerFactory.getLogger(DependencyDetailComposite.class);
 
   protected static PomPackage POM_PACKAGE = PomPackage.eINSTANCE;
 
@@ -102,7 +104,7 @@ public class DependencyDetailComposite extends Composite {
         return a.getBaseVersion();
       }
     } catch(CoreException ex) {
-      MavenLogger.log(ex);
+      log.error(ex.getMessage(), ex);
     }
     return null;
   }
diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/composites/DependencyLabelProvider.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/composites/DependencyLabelProvider.java
index 7d72d2a7..005dd0b2 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/composites/DependencyLabelProvider.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/composites/DependencyLabelProvider.java
@@ -17,6 +17,7 @@ import org.apache.maven.artifact.Artifact;
 import org.apache.maven.model.DependencyManagement;
 import org.apache.maven.model.InputLocation;
 import org.apache.maven.project.MavenProject;
+import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider;
 import org.eclipse.jface.viewers.IColorProvider;
 import org.eclipse.jface.viewers.IDecoration;
 import org.eclipse.jface.viewers.LabelProvider;
@@ -37,7 +38,6 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider;
 
 
 /**
diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/composites/PluginsComposite.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/composites/PluginsComposite.java
index 2ddc4ecf..9ef13b52 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/composites/PluginsComposite.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/composites/PluginsComposite.java
@@ -59,7 +59,6 @@ import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.jface.window.Window;
-import org.eclipse.m2e.core.core.MavenLogger;
 import org.eclipse.m2e.core.index.IndexedArtifactFile;
 import org.eclipse.m2e.core.ui.internal.M2EUIPluginActivator;
 import org.eclipse.m2e.core.ui.internal.actions.OpenPomAction;
@@ -114,11 +113,14 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 import org.eclipse.ui.forms.widgets.Section;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author Eugene Kuleshov
  */
 public class PluginsComposite extends Composite{
+  private static final Logger log = LoggerFactory.getLogger(PluginsComposite.class);
 
   protected static PomPackage POM_PACKAGE = PomPackage.eINSTANCE;
   public static final String EXTENSION_CONFIGURATION_EDITOR = "org.eclipse.m2e.editor.plugins.configurationEditorContribution"; //$NON-NLS-1$
@@ -1336,7 +1338,7 @@ public class PluginsComposite extends Composite{
             }
           } catch(CoreException e) {
             // TODO Auto-generated catch block
-            MavenLogger.log("Error retrieving available versions for " + groupId + ':' + artifactId, e); //$NON-NLS-1$
+            log.error("Error retrieving available versions for " + groupId + ':' + artifactId, e); //$NON-NLS-1$
           }
           
           createPlugin(editor, provider, pomPackage, groupId, artifactId, version);
diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/composites/ReportingComposite.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/composites/ReportingComposite.java
index cd141751..6081cf01 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/composites/ReportingComposite.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/composites/ReportingComposite.java
@@ -41,8 +41,6 @@ import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.jface.window.Window;
-import org.eclipse.m2e.core.embedder.ArtifactKey;
-import org.eclipse.m2e.core.index.IIndex;
 import org.eclipse.m2e.core.index.IndexedArtifactFile;
 import org.eclipse.m2e.core.ui.internal.actions.OpenPomAction;
 import org.eclipse.m2e.core.ui.internal.actions.OpenUrlAction;
diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/composites/RepositoriesComposite.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/composites/RepositoriesComposite.java
index ea310147..736cf576 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/composites/RepositoriesComposite.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/composites/RepositoriesComposite.java
@@ -12,9 +12,9 @@
 package org.eclipse.m2e.editor.composites;
 
 import static org.eclipse.m2e.editor.pom.FormUtils.isEmpty;
+import static org.eclipse.m2e.editor.pom.FormUtils.nvl;
 import static org.eclipse.m2e.editor.pom.FormUtils.setButton;
 import static org.eclipse.m2e.editor.pom.FormUtils.setText;
-import static org.eclipse.m2e.editor.pom.FormUtils.nvl;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/dialogs/ManageDependenciesDialog.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/dialogs/ManageDependenciesDialog.java
index 7b93be6f..aae3cab4 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/dialogs/ManageDependenciesDialog.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/dialogs/ManageDependenciesDialog.java
@@ -43,7 +43,6 @@ import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
 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.ui.internal.dialogs.AbstractMavenDialog;
 import org.eclipse.m2e.editor.MavenEditorPlugin;
@@ -77,6 +76,8 @@ import org.eclipse.ui.IEditorReference;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -86,6 +87,7 @@ import org.eclipse.ui.PlatformUI;
  * @author rgould
  */
 public class ManageDependenciesDialog extends AbstractMavenDialog {
+  private static final Logger log = LoggerFactory.getLogger(ManageDependenciesDialog.class);
 
   protected static final String DIALOG_SETTINGS = ManageDependenciesDialog.class.getName();
 
@@ -389,7 +391,7 @@ public class ManageDependenciesDialog extends AbstractMavenDialog {
       resource.load(Collections.EMPTY_MAP);
       return resource.getModel();
     } catch(Exception e) {
-      MavenLogger.log("Can't load model " + facade.getPomFile().getPath(), e); //$NON-NLS-1$
+      log.error("Can't load model " + facade.getPomFile().getPath(), e); //$NON-NLS-1$
       return null;
     }
   }
diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/plugins/PluginExtensionDescriptor.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/plugins/PluginExtensionDescriptor.java
index 3520034b..e285675d 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/plugins/PluginExtensionDescriptor.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/plugins/PluginExtensionDescriptor.java
@@ -13,10 +13,13 @@ package org.eclipse.m2e.editor.plugins;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.m2e.core.core.MavenLogger;
 import org.eclipse.m2e.core.project.configurator.AbstractProjectConfigurator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PluginExtensionDescriptor {
+  private static final Logger log = LoggerFactory.getLogger(PluginExtensionDescriptor.class);
+
   public static final String ARTIFACT_ID = "artifactId"; //$NON-NLS-1$
   public static final String GROUP_ID = "groupId"; //$NON-NLS-1$
   public static final String NAME = "name"; //$NON-NLS-1$
@@ -38,7 +41,7 @@ public class PluginExtensionDescriptor {
       extension = (IPluginConfigurationExtension) o;
     } catch(CoreException e) {
       // TODO Auto-generated catch block
-      MavenLogger.log(e);
+      log.error(e.getMessage(), e);
     }
   }
   
diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/BuildPage.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/BuildPage.java
index 30165b41..4b3cc219 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/BuildPage.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/BuildPage.java
@@ -16,7 +16,6 @@ import static org.eclipse.m2e.editor.pom.FormUtils.setText;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.Set;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -37,8 +36,6 @@ import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.window.Window;
 import org.eclipse.m2e.core.core.IMavenConstants;
-import org.eclipse.m2e.core.embedder.ArtifactKey;
-import org.eclipse.m2e.core.index.IIndex;
 import org.eclipse.m2e.core.index.IndexedArtifactFile;
 import org.eclipse.m2e.core.ui.internal.actions.OpenPomAction;
 import org.eclipse.m2e.core.ui.internal.actions.OpenUrlAction;
diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/DependencyTreePage.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/DependencyTreePage.java
index b9a2461c..79ad43a6 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/DependencyTreePage.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/DependencyTreePage.java
@@ -51,7 +51,6 @@ import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.jface.viewers.ViewerFilter;
 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.ArtifactKey;
 import org.eclipse.m2e.core.project.IMavenProjectChangedListener;
 import org.eclipse.m2e.core.project.IMavenProjectFacade;
@@ -87,6 +86,8 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.forms.widgets.Section;
 import org.eclipse.ui.progress.UIJob;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.sonatype.aether.graph.DependencyNode;
 import org.sonatype.aether.graph.DependencyVisitor;
 
@@ -96,6 +97,7 @@ import org.sonatype.aether.graph.DependencyVisitor;
  * @author Benjamin Bentmann
  */
 public class DependencyTreePage extends FormPage implements IMavenProjectChangedListener, IPomFileChangedListener {
+  private static final Logger log = LoggerFactory.getLogger(DependencyTreePage.class);
 
   protected static final Object[] EMPTY = new Object[0];
 
@@ -199,7 +201,7 @@ public class DependencyTreePage extends FormPage implements IMavenProjectChanged
         try {
           mavenProject = pomEditor.readMavenProject(force, monitor);
           if(mavenProject == null){
-            MavenLogger.log("Unable to read maven project. Dependencies not updated.", null); //$NON-NLS-1$
+            log.error("Unable to read maven project. Dependencies not updated."); //$NON-NLS-1$
             return Status.CANCEL_STATUS;
           }
 
@@ -229,7 +231,7 @@ public class DependencyTreePage extends FormPage implements IMavenProjectChanged
             }
           });
         } catch(final CoreException ex) {
-          MavenLogger.log(ex);
+          log.error(ex.getMessage(), ex);
           getPartControl().getDisplay().asyncExec(new Runnable() {
             public void run() {
               FormUtils.setMessage(getManagedForm().getForm(), ex.getMessage(), IMessageProvider.ERROR);
diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/FormUtils.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/FormUtils.java
index a4778044..b811f621 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/FormUtils.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/FormUtils.java
@@ -23,12 +23,10 @@ import org.codehaus.plexus.interpolation.PropertiesBasedValueSource;
 import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.m2e.core.core.MavenLogger;
 import org.eclipse.m2e.core.ui.internal.dialogs.MavenMessageDialog;
 import org.eclipse.m2e.core.ui.internal.util.Util;
 import org.eclipse.m2e.editor.internal.Messages;
 import org.eclipse.m2e.editor.xml.internal.FormHoverProvider;
-import org.eclipse.m2e.editor.xml.internal.FormHoverProvider.Execute;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CCombo;
@@ -52,12 +50,15 @@ import org.eclipse.ui.forms.widgets.Form;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
  * @author Eugene Kuleshov
  */
 public abstract class FormUtils {
+  private static final Logger log = LoggerFactory.getLogger(FormUtils.class);
   public static final int MAX_MSG_LENGTH = 80;
 
   /**
@@ -162,9 +163,9 @@ public abstract class FormUtils {
             | IWorkbenchBrowserSupport.LOCATION_BAR, url, url, url);
         browser.openURL(new URL(url));
       } catch(PartInitException ex) {
-        MavenLogger.log(ex);
+        log.error(ex.getMessage(), ex);
       } catch(MalformedURLException ex) {
-        MavenLogger.log("Malformed url " + url, ex); //$NON-NLS-1$
+        log.error("Malformed url " + url, ex); //$NON-NLS-1$
       }
     }
   }
diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditor.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditor.java
index 59af1915..b8cdf170 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditor.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditor.java
@@ -74,7 +74,6 @@ import org.eclipse.jface.text.source.IOverviewRuler;
 import org.eclipse.jface.text.source.IVerticalRuler;
 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.ArtifactKey;
 import org.eclipse.m2e.core.embedder.MavenModelManager;
 import org.eclipse.m2e.core.project.IMavenProjectChangedListener;
@@ -82,9 +81,9 @@ import org.eclipse.m2e.core.project.IMavenProjectFacade;
 import org.eclipse.m2e.core.project.MavenProjectChangedEvent;
 import org.eclipse.m2e.core.project.MavenProjectManager;
 import org.eclipse.m2e.core.ui.internal.M2EUIPluginActivator;
-import org.eclipse.m2e.core.ui.internal.actions.SelectionUtil;
 import org.eclipse.m2e.core.ui.internal.actions.OpenPomAction.MavenPathStorageEditorInput;
 import org.eclipse.m2e.core.ui.internal.actions.OpenPomAction.MavenStorageEditorInput;
+import org.eclipse.m2e.core.ui.internal.actions.SelectionUtil;
 import org.eclipse.m2e.core.ui.internal.util.Util;
 import org.eclipse.m2e.core.ui.internal.util.Util.FileStoreEditorInputStub;
 import org.eclipse.m2e.editor.MavenEditorImages;
@@ -128,6 +127,8 @@ import org.eclipse.wst.sse.ui.StructuredTextEditor;
 import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
 import org.eclipse.wst.xml.core.internal.emf2xml.EMF2DOMSSEAdapter;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -140,6 +141,7 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
 @SuppressWarnings("restriction")
 public class MavenPomEditor extends FormEditor implements IResourceChangeListener, IShowEditorInput, IGotoMarker,
     ISearchEditorAccess, IEditingDomainProvider, IMavenProjectChangedListener {
+  private static final Logger log = LoggerFactory.getLogger(MavenPomEditor.class);
 
   private static final String POM_XML = "pom.xml";
 
@@ -259,7 +261,7 @@ public class MavenPomEditor extends FormEditor implements IResourceChangeListene
         });
       }
     } catch(CoreException ex) {
-      MavenLogger.log(ex);
+      log.error(ex.getMessage(), ex);
     }
 
     // Reload model if pom file was changed externally.
@@ -309,9 +311,9 @@ public class MavenPomEditor extends FormEditor implements IResourceChangeListene
 //              structuredModel.reload(pomFile.getContents());
               reload();
 //            } catch(CoreException e) {
-//              MavenLogger.log(e);
+//              log.error(e.getMessage(), e);
 //            } catch(Exception e) {
-//              MavenLogger.log("Error loading pom editor model.", e);
+//              log.error("Error loading pom editor model.", e);
 //            }
             }
           });
@@ -334,7 +336,7 @@ public class MavenPomEditor extends FormEditor implements IResourceChangeListene
           }
         });
         } catch (CoreException ex ) {
-          MavenLogger.log("Error updating pom file markers.", ex); //$NON-NLS-1$
+          log.error("Error updating pom file markers.", ex); //$NON-NLS-1$
         }
       }
     };
@@ -343,7 +345,7 @@ public class MavenPomEditor extends FormEditor implements IResourceChangeListene
       ChangedResourceDeltaVisitor visitor = new ChangedResourceDeltaVisitor();
       event.getDelta().accept(visitor);
     } catch(CoreException ex) {
-      MavenLogger.log(ex);
+      log.error(ex.getMessage(), ex);
     }
 
   }
@@ -358,7 +360,7 @@ public class MavenPomEditor extends FormEditor implements IResourceChangeListene
       //fix for resetting the pom document after an external change
 //      sourcePage.getDocumentProvider().resetDocument(sourcePage.getEditorInput());
     } catch(CoreException e) {
-      MavenLogger.log(e);
+      log.error(e.getMessage(), e);
     }
     for(MavenPomEditorPage page : pages) {
       page.reload();
@@ -499,7 +501,7 @@ public class MavenPomEditor extends FormEditor implements IResourceChangeListene
               factory = (MavenPomEditorPageFactory) element.createExecutableExtension("class"); //$NON-NLS-1$
               factory.addPages(this);
             } catch(CoreException ex) {
-              MavenLogger.log(ex);
+              log.error(ex.getMessage(), ex);
             }
           }
         }
@@ -548,7 +550,7 @@ public class MavenPomEditor extends FormEditor implements IResourceChangeListene
               effectivePomSourcePage.setInput(editorInput);
               effectivePomSourcePage.update();
             }catch(IOException ie){
-              MavenLogger.log(new Status(IStatus.ERROR, MavenEditorPlugin.PLUGIN_ID, -1, Messages.MavenPomEditor_error_failed_effective, ie));
+              log.error(Messages.MavenPomEditor_error_failed_effective, ie);
             }
           }
         });
@@ -734,7 +736,7 @@ public class MavenPomEditor extends FormEditor implements IResourceChangeListene
       try {
         readProjectDocument();
       } catch(CoreException e) {
-        MavenLogger.log(e);
+        log.error(e.getMessage(), e);
       }
 
       // TODO activate xml source page if model is empty or have errors
@@ -751,7 +753,7 @@ public class MavenPomEditor extends FormEditor implements IResourceChangeListene
             commandStack, new HashMap<Resource, Boolean>());
       }
     } catch(PartInitException ex) {
-      MavenLogger.log(ex);
+      log.error(ex.getMessage(), ex);
     }
   }
 
@@ -769,7 +771,7 @@ public class MavenPomEditor extends FormEditor implements IResourceChangeListene
       }
       return addPage(page);
     } catch(PartInitException ex) {
-      MavenLogger.log(ex);
+      log.error(ex.getMessage(), ex);
       return -1;
     }
   }
@@ -806,7 +808,7 @@ public class MavenPomEditor extends FormEditor implements IResourceChangeListene
             IOUtil.copy(is, os);
             projectDocument = loadModel(tempPomFile.getAbsolutePath());
           } catch(IOException ex) {
-            MavenLogger.log("Can't close stream", ex); //$NON-NLS-1$
+            log.error("Can't close stream", ex); //$NON-NLS-1$
           } finally {
             IOUtil.close(is);
             IOUtil.close(os);
@@ -836,7 +838,7 @@ public class MavenPomEditor extends FormEditor implements IResourceChangeListene
       return (Model)resource.getContents().get(0);
 
     } catch(Exception ex) {
-      MavenLogger.log("Can't load model " + path, ex); //$NON-NLS-1$
+      log.error("Can't load model " + path, ex); //$NON-NLS-1$
       return null;
 
     }
@@ -849,7 +851,7 @@ public class MavenPomEditor extends FormEditor implements IResourceChangeListene
       //mkleint: I'm wondering if the force parameter on dependencyTree is also applicable to the pom project method.
       MavenProject mavenProject = readMavenProject(force, monitor);
       if(mavenProject == null){
-        MavenLogger.log("Unable to read maven project. Dependencies not updated.", null); //$NON-NLS-1$
+        log.error("Unable to read maven project. Dependencies not updated."); //$NON-NLS-1$
         return null;
       }
 
@@ -1164,7 +1166,7 @@ public class MavenPomEditor extends FormEditor implements IResourceChangeListene
             try {
               pomFile.refreshLocal(IResource.DEPTH_INFINITE, null);
             } catch(CoreException e) {
-              MavenLogger.log(e);
+              log.error(e.getMessage(), e);
             } 
           }
           
@@ -1214,7 +1216,7 @@ public class MavenPomEditor extends FormEditor implements IResourceChangeListene
           //we're not interested in the result, just want to get the MP instance cached.
           readMavenProject(true, monitor);
         } catch(CoreException e) {
-          MavenLogger.log("failed to load maven project for " + getEditorInput(), e);
+          log.error("failed to load maven project for " + getEditorInput(), e);
         }
         return Status.OK_STATUS;
       }
diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditorPage.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditorPage.java
index 8546ce8e..6b0a5a59 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditorPage.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditorPage.java
@@ -52,7 +52,6 @@ import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
 import org.eclipse.jface.viewers.Viewer;
 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.ui.internal.actions.OpenPomAction;
@@ -82,6 +81,8 @@ import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.forms.IManagedForm;
 import org.eclipse.ui.forms.editor.FormPage;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -91,6 +92,7 @@ import org.eclipse.ui.forms.widgets.ScrolledForm;
  * @author Eugene Kuleshov
  */
 public abstract class MavenPomEditorPage extends FormPage implements Adapter {
+  private static final Logger log = LoggerFactory.getLogger(MavenPomEditorPage.class);
 
   // parent editor
   protected final MavenPomEditor pomEditor;
@@ -198,7 +200,7 @@ public abstract class MavenPomEditorPage extends FormPage implements Adapter {
                   updateParentAction();
                   registerListeners();
                 } catch(Throwable e) {
-                  MavenLogger.log("Error loading data", e); //$NON-NLS-1$
+                  log.error("Error loading data", e); //$NON-NLS-1$
                 } finally {
                   updatingModel = false;
                 }
@@ -284,7 +286,7 @@ public abstract class MavenPomEditorPage extends FormPage implements Adapter {
         }
       }
     } catch(final CoreException ex) {
-      MavenLogger.log(ex);
+      log.error(ex.getMessage(), ex);
       final String msg = ex.getMessage();
       setErrorMessageForMarkers(msg, msg, IMessageProvider.ERROR, new IMarker[0]);
     }
@@ -379,7 +381,7 @@ public abstract class MavenPomEditorPage extends FormPage implements Adapter {
       }
 
     } catch(Exception ex) {
-      MavenLogger.log("Can't update view", ex); //$NON-NLS-1$
+      log.error("Can't update view", ex); //$NON-NLS-1$
     } finally {
       updatingModel = false;
     }
diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/OverviewPage.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/OverviewPage.java
index 9e31167f..f5fa16c7 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/OverviewPage.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/OverviewPage.java
@@ -15,7 +15,6 @@ import static org.eclipse.m2e.editor.pom.FormUtils.isEmpty;
 import static org.eclipse.m2e.editor.pom.FormUtils.nvl;
 import static org.eclipse.m2e.editor.pom.FormUtils.setText;
 
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -49,7 +48,6 @@ import org.eclipse.m2e.core.MavenPlugin;
 import org.eclipse.m2e.core.core.IMavenConstants;
 import org.eclipse.m2e.core.embedder.ArtifactKey;
 import org.eclipse.m2e.core.embedder.ProjectUpdater;
-import org.eclipse.m2e.core.index.IIndex;
 import org.eclipse.m2e.core.index.IndexedArtifactFile;
 import org.eclipse.m2e.core.project.IMavenProjectFacade;
 import org.eclipse.m2e.core.ui.internal.MavenImages;