diff options
31 files changed, 107 insertions, 175 deletions
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/UpdateConfigurationJob.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/UpdateConfigurationJob.java index 7aca5382..2511668e 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/UpdateConfigurationJob.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/UpdateConfigurationJob.java @@ -23,21 +23,21 @@ import org.eclipse.core.runtime.MultiStatus; import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.SubProgressMonitor; -import org.eclipse.osgi.util.NLS; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.progress.IProgressConstants; - 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.ui.internal.Messages; import org.eclipse.m2e.core.project.IMavenProjectFacade; import org.eclipse.m2e.core.ui.internal.actions.OpenMavenConsoleAction; import org.eclipse.m2e.core.ui.internal.util.M2EUIUtils; +import org.eclipse.osgi.util.NLS; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.progress.IProgressConstants; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class UpdateConfigurationJob extends WorkspaceJob { + private static final Logger log = LoggerFactory.getLogger(UpdateConfigurationJob.class); private IProject[] projects; @@ -68,10 +68,8 @@ public class UpdateConfigurationJob extends WorkspaceJob { setProperty(IProgressConstants.ACTION_PROPERTY, new OpenMavenConsoleAction()); monitor.beginTask(getName(), projects.length); - MavenConsole console = plugin.getConsole(); - long l1 = System.currentTimeMillis(); - console.logMessage("Update started"); + log.info("Update started"); MultiStatus status = null; //project names to the errors encountered when updating them @@ -106,7 +104,7 @@ public class UpdateConfigurationJob extends WorkspaceJob { handleErrors(updateErrors); } long l2 = System.currentTimeMillis(); - console.logMessage(NLS.bind("Update completed: {0} sec", ((l2 - l1) / 1000))); + log.info(NLS.bind("Update completed: {0} sec", ((l2 - l1) / 1000))); return status != null ? status : Status.OK_STATUS; } diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/MavenActionSupport.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/MavenActionSupport.java index 7b351e81..2a155842 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/MavenActionSupport.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/MavenActionSupport.java @@ -62,9 +62,8 @@ public abstract class MavenActionSupport implements IObjectActionDelegate { return ArtifactRef.toArtifactKey(projectFacade.getMavenProjectArtifacts()); } } catch(Exception ex) { - String msg = "Can't read Maven project"; + String msg = "Can't read Maven project: " + ex.getMessage(); log.error(msg, ex); - plugin.getConsole().logError(msg + "; " + ex.toString()); } return Collections.emptySet(); } diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenInstallationsPreferencePage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenInstallationsPreferencePage.java index 6d0310ad..7d899966 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenInstallationsPreferencePage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenInstallationsPreferencePage.java @@ -120,7 +120,6 @@ public class MavenInstallationsPreferencePage extends PreferencePage implements this.runtimeManager = mavenPlugin.getMavenRuntimeManager(); this.mavenConfiguration = MavenPlugin.getDefault().getMavenConfiguration(); this.maven = MavenPlugin.getDefault().getMaven(); - } public void init(IWorkbench workbench) { @@ -606,7 +605,7 @@ public class MavenInstallationsPreferencePage extends PreferencePage implements editor.addPropertyListener(new IPropertyListener() { public void propertyChanged(Object source, int propId) { if(!editor.isDirty()) { - mavenPlugin.getConsole().logMessage("Refreshing settings " + fileName); + log.info("Refreshing settings " + fileName); invalidateMavenSettings(false); } } diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenSettingsPreferencePage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenSettingsPreferencePage.java index be54ecd7..dfa3b19b 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenSettingsPreferencePage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenSettingsPreferencePage.java @@ -395,7 +395,7 @@ public class MavenSettingsPreferencePage extends PreferencePage implements IWork editor.addPropertyListener(new IPropertyListener() { public void propertyChanged(Object source, int propId) { if(!editor.isDirty()) { - mavenPlugin.getConsole().logMessage("Refreshing settings " + fileName); + log.info("Refreshing settings " + fileName); } } }); @@ -408,6 +408,4 @@ public class MavenSettingsPreferencePage extends PreferencePage implements IWork String getUserSettings() { return userSettingsText.getText().trim(); } - - } diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizardPage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizardPage.java index ae90f559..63ab7f3f 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizardPage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizardPage.java @@ -334,13 +334,11 @@ public class MavenImportWizardPage extends AbstractMavenWizardPage { log.error(msg, e); } else { msg = "Scanning error " + projectScanner.getDescription() + "; " + e.toString(); //$NON-NLS-2$ - MavenPlugin.getDefault().getConsole().logError(msg); log.error(msg, e); } projectTreeViewer.setInput(null); setPageComplete(false); setErrorMessage(msg); - } } diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenInstallFileWizard.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenInstallFileWizard.java index a833d979..13ae8c07 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenInstallFileWizard.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenInstallFileWizard.java @@ -111,16 +111,14 @@ public class MavenInstallFileWizard extends Wizard implements IImportWizard { if(!exceptions.isEmpty()) { for(Throwable exception : exceptions) { String msg = Messages.MavenInstallFileWizard_error; - plugin.getConsole().logError(msg + "; " + exception.toString()); //$NON-NLS-1$ + msg += "; " + exception.toString(); //$NON-NLS-1$ log.error(msg, exception); } } // TODO update index for local maven repository - } catch (CoreException ex) { - log.error(ex.getMessage(), ex); - plugin.getConsole().logError("Failed to install artifact"); + log.error("Failed to install artifact:" + ex.getMessage(), ex); } return Status.OK_STATUS; } diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/ProjectsImportPage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/ProjectsImportPage.java index 834bc837..a733e8de 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/ProjectsImportPage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/ProjectsImportPage.java @@ -48,9 +48,7 @@ import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerComparator; import org.eclipse.jface.wizard.WizardPage; -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.ui.internal.Messages; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; @@ -426,12 +424,10 @@ public class ProjectsImportPage extends WizardPage implements IOverwriteQuery { @SuppressWarnings("deprecation") IPath projectPath = record.description.getLocation(); if(projectPath!=null) { - MavenConsole console = MavenPlugin.getDefault().getConsole(); - IWorkspaceRoot root = workspace.getRoot(); if(projectPath.toFile().equals(root.getLocation().toFile())) { - console.logError("Can't create project " + projectName + " at Workspace folder"); + log.error("Can't create project " + projectName + " at Workspace folder"); return false; } diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/builder/MavenBuilder.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/builder/MavenBuilder.java index 3c0aaa94..480f06d1 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/builder/MavenBuilder.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/builder/MavenBuilder.java @@ -50,7 +50,6 @@ import org.eclipse.m2e.core.builder.AbstractEclipseBuildContext.Message; import org.eclipse.m2e.core.builder.EclipseBuildContext; import org.eclipse.m2e.core.builder.EclipseIncrementalBuildContext; import org.eclipse.m2e.core.core.IMavenConstants; -import org.eclipse.m2e.core.core.MavenConsole; import org.eclipse.m2e.core.embedder.IMaven; import org.eclipse.m2e.core.embedder.IMavenConfiguration; import org.eclipse.m2e.core.internal.M2EUtils; @@ -91,7 +90,6 @@ public class MavenBuilder extends IncrementalProjectBuilder { @SuppressWarnings("unchecked") protected IProject[] build(int kind, Map args, IProgressMonitor monitor) throws CoreException { MavenPlugin plugin = MavenPlugin.getDefault(); - MavenConsole console = plugin.getConsole(); MavenProjectManager projectManager = plugin.getMavenProjectManager(); IProjectConfigurationManager configurationManager = plugin.getProjectConfigurationManager(); IMavenConfiguration mavenConfiguration = MavenPlugin.getDefault().getMavenConfiguration(); @@ -106,7 +104,7 @@ public class MavenBuilder extends IncrementalProjectBuilder { IFile pomResource = project.getFile(IMavenConstants.POM_FILE_NAME); if(pomResource == null) { - console.logError("Project " + project.getName() + " does not have pom.xml"); + log.error("Project " + project.getName() + " does not have pom.xml"); return null; } diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/AbstractTransferListenerAdapter.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/AbstractTransferListenerAdapter.java index 09b9fea3..8da15a24 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/AbstractTransferListenerAdapter.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/AbstractTransferListenerAdapter.java @@ -11,6 +11,9 @@ package org.eclipse.m2e.core.internal.embedder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.OperationCanceledException; @@ -18,7 +21,6 @@ import org.eclipse.osgi.util.NLS; import org.apache.maven.wagon.WagonConstants; -import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.internal.Messages; @@ -28,6 +30,7 @@ import org.eclipse.m2e.core.internal.Messages; * @author igor */ abstract class AbstractTransferListenerAdapter { + private static final Logger log = LoggerFactory.getLogger(AbstractTransferListenerAdapter.class); protected final MavenImpl maven; @@ -60,7 +63,7 @@ abstract class AbstractTransferListenerAdapter { } protected void transferStarted(String artifactUrl) { - MavenPlugin.getDefault().getConsole().logMessage(NLS.bind("Downloading {0}", artifactUrl)); + log.info(NLS.bind("Downloading {0}", artifactUrl)); // monitor.beginTask("0% "+e.getWagon().getRepository()+"/"+e.getResource().getName(), IProgressMonitor.UNKNOWN); monitor.subTask(Messages.AbstractTransferListenerAdapter_4 + artifactUrl); } @@ -90,14 +93,14 @@ abstract class AbstractTransferListenerAdapter { } protected void transferCompleted(String artifactUrl) { - MavenPlugin.getDefault().getConsole().logMessage(NLS.bind("Downloaded {0}", artifactUrl)); + log.info(NLS.bind("Downloaded {0}", artifactUrl)); // monitor.subTask("100% "+e.getWagon().getRepository()+"/"+e.getResource().getName()); monitor.subTask(""); //$NON-NLS-1$ } protected void transferError(String artifactUrl, Exception exception) { - MavenPlugin.getDefault().getConsole().logMessage(NLS.bind("Unable to download {0} : {1}", artifactUrl, exception)); + log.error(NLS.bind("Unable to download {0} : {1}", artifactUrl, exception)); monitor.subTask(NLS.bind(Messages.AbstractTransferListenerAdapter_subtask, artifactUrl)); } diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/EclipseLogger.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/EclipseLogger.java index 97c0c5f5..881177d4 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/EclipseLogger.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/EclipseLogger.java @@ -11,15 +11,18 @@ package org.eclipse.m2e.core.internal.embedder; +import org.slf4j.LoggerFactory; + import org.eclipse.osgi.util.NLS; import org.codehaus.plexus.logging.Logger; -import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.embedder.IMavenConfiguration; import org.eclipse.m2e.core.internal.Messages; class EclipseLogger implements Logger { + private static final org.slf4j.Logger log = LoggerFactory.getLogger(EclipseLogger.class); + private final IMavenConfiguration mavenConfiguration; public EclipseLogger(IMavenConfiguration mavenConfiguration) { @@ -27,11 +30,11 @@ class EclipseLogger implements Logger { } private void out(String s) { - MavenPlugin.getDefault().getConsole().logMessage(s); + log.info(s); } private void outError(String s) { - MavenPlugin.getDefault().getConsole().logError(s); + log.error(s); } public void debug( String msg ) { diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenImpl.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenImpl.java index 4b7d2fd2..49330479 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenImpl.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenImpl.java @@ -356,7 +356,6 @@ public class MavenImpl implements IMaven, IMavenConfigurationChangeListener { return lookup(SettingsBuilder.class).build(request).getEffectiveSettings(); } catch(SettingsBuildingException ex) { String msg = "Could not read settings.xml, assuming default values"; - MavenPlugin.getDefault().getConsole().logError(msg); log.error(msg, ex); /* * NOTE: This method provides input for various other core functions, just bailing out would make m2e highly diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/ArtifactScanningMonitor.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/ArtifactScanningMonitor.java index b20e363a..a4c9b0c5 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/ArtifactScanningMonitor.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/ArtifactScanningMonitor.java @@ -13,6 +13,9 @@ package org.eclipse.m2e.core.internal.index; import java.io.File; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.eclipse.core.runtime.IProgressMonitor; import org.apache.maven.index.ArtifactContext; @@ -20,9 +23,8 @@ import org.apache.maven.index.ArtifactScanningListener; import org.apache.maven.index.ScanningResult; import org.apache.maven.index.context.IndexingContext; -import org.eclipse.m2e.core.MavenPlugin; - class ArtifactScanningMonitor implements ArtifactScanningListener { + private static final Logger log = LoggerFactory.getLogger(ArtifactScanningMonitor.class); private static final long THRESHOLD = 1 * 1000L; @@ -59,6 +61,6 @@ class ArtifactScanningMonitor implements ArtifactScanningListener { public void artifactError(ArtifactContext ac, Exception e) { String id = ac.getPom().getAbsolutePath().substring(repositoryDir.getAbsolutePath().length()); - MavenPlugin.getDefault().getConsole().logError(id + " " + e.getMessage()); //$NON-NLS-1$ + log.error(id + " " + e.getMessage()); //$NON-NLS-1$ } }
\ No newline at end of file diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/NexusIndexManager.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/NexusIndexManager.java index 45f92706..7ba8c8cb 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/NexusIndexManager.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/NexusIndexManager.java @@ -533,7 +533,7 @@ public class NexusIndexManager implements IndexManager, IMavenProjectChangedList if(context.getRepository().isDirectory()) { getIndexer().scan(context, new ArtifactScanningMonitor(context.getRepository(), monitor), false); } - MavenPlugin.getDefault().getConsole().logMessage("Updated local repository index"); + log.info("Updated local repository index"); } catch(Exception ex) { log.error("Unable to re-index " + repository.toString(), ex); throw new CoreException(new Status(IStatus.ERROR, IMavenConstants.PLUGIN_ID, -1, @@ -1095,7 +1095,7 @@ public class NexusIndexManager implements IndexManager, IMavenProjectChangedList if(monitor != null) { monitor.setTaskName(NLS.bind(Messages.NexusIndexManager_task_updating, repository.toString())); } - MavenPlugin.getDefault().getConsole().logMessage("Updating index " + repository.toString()); + log.info("Updating index " + repository.toString()); try { fireIndexUpdating(repository); @@ -1142,22 +1142,20 @@ public class NexusIndexManager implements IndexManager, IMavenProjectChangedList } if(updated) { - MavenPlugin.getDefault().getConsole().logMessage("Updated index for " + repository.toString()); + log.info("Updated index for " + repository.toString()); } else { - MavenPlugin.getDefault().getConsole().logMessage("No index update available for " + repository.toString()); + log.info("No index update available for " + repository.toString()); } - } finally { cacheLock.release(); } } } catch(FileNotFoundException e) { String msg = "Unable to update index for " + repository.toString() + ": " + e.getMessage(); //$NON-NLS-2$ - MavenPlugin.getDefault().getConsole().logError(msg); + log.error(msg, e); } catch(Exception ie) { String msg = "Unable to update index for " + repository.toString(); log.error(msg, ie); - MavenPlugin.getDefault().getConsole().logError(msg); } finally { fireIndexChanged(repository); } diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/LifecycleMappingFactory.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/LifecycleMappingFactory.java index 7f9178a7..7db0989c 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/LifecycleMappingFactory.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecycle/LifecycleMappingFactory.java @@ -545,7 +545,6 @@ public class LifecycleMappingFactory { configurator.setProjectManager(plugin.getMavenProjectManager()); configurator.setMavenConfiguration(plugin.getMavenConfiguration()); configurator.setMarkerManager(plugin.getMavenMarkerManager()); - configurator.setConsole(plugin.getConsole()); return configurator; } catch(CoreException ex) { diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/markers/MavenMarkerManager.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/markers/MavenMarkerManager.java index 86191f60..843b9fb3 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/markers/MavenMarkerManager.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/markers/MavenMarkerManager.java @@ -34,7 +34,6 @@ import org.apache.maven.project.DependencyResolutionResult; import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuildingException; -import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.core.Messages; import org.eclipse.m2e.core.embedder.IMavenConfiguration; @@ -265,7 +264,7 @@ public class MavenMarkerManager implements IMavenMarkerManager { } addMarker(pomFile, type, errorMessage, 1, IMarker.SEVERITY_ERROR); - MavenPlugin.getDefault().getConsole().logError(errorMessage); + log.error(errorMessage); } } } diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectConfigurationManager.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectConfigurationManager.java index da2fc15e..eb7f676d 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectConfigurationManager.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectConfigurationManager.java @@ -151,7 +151,7 @@ public class ProjectConfigurationManager implements IProjectConfigurationManager configureNewMavenProject(projects, progress.newChild(90)); long t2 = System.currentTimeMillis(); - MavenPlugin.getDefault().getConsole().logMessage("Project import completed " + ((t2 - t1) / 1000) + " sec"); + log.info("Project import completed " + ((t2 - t1) / 1000) + " sec"); return result; } @@ -562,14 +562,13 @@ public class ProjectConfigurationManager implements IProjectConfigurationManager } public Set<MavenProjectInfo> collectProjects(Collection<MavenProjectInfo> projects) { - // TODO what does this do? return new LinkedHashSet<MavenProjectInfo>() { private static final long serialVersionUID = 1L; public Set<MavenProjectInfo> collectProjects(Collection<MavenProjectInfo> projects) { for(MavenProjectInfo projectInfo : projects) { - MavenPlugin.getDefault().getConsole().logMessage("Collecting project info " + projectInfo); + log.info("Collecting project info " + projectInfo); add(projectInfo); collectProjects(projectInfo.getProjects()); } @@ -624,12 +623,12 @@ public class ProjectConfigurationManager implements IProjectConfigurationManager IProject project = root.getProject(projectName); if(project.exists()) { - MavenPlugin.getDefault().getConsole().logError("Project " + projectName + " already exists"); + log.error("Project " + projectName + " already exists"); return null; } if(projectDir.equals(root.getLocation().toFile())) { - MavenPlugin.getDefault().getConsole().logError("Can't create project " + projectName + " at Workspace folder"); + log.error("Can't create project " + projectName + " at Workspace folder"); return null; } diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryManager.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryManager.java index ff886360..10c79940 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryManager.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryManager.java @@ -64,7 +64,6 @@ import org.apache.maven.repository.DelegatingLocalArtifactRepository; 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.embedder.ArtifactKey; import org.eclipse.m2e.core.embedder.IMaven; import org.eclipse.m2e.core.embedder.IMavenConfiguration; @@ -181,11 +180,8 @@ public class ProjectRegistryManager { } else { List<Throwable> exceptions = executionResult.getExceptions(); if (exceptions != null) { - MavenConsole console = MavenPlugin.getDefault().getConsole(); for(Throwable ex : exceptions) { - String msg = "Failed to read Maven project"; - console.logError(msg); - console.logError(ex.toString()); + String msg = "Failed to read Maven project: " + ex.getMessage(); log.error(msg, ex); } } diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryRefreshJob.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryRefreshJob.java index c2847b29..35f97bc0 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryRefreshJob.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryRefreshJob.java @@ -38,7 +38,6 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener; import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent; -import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.core.IMavenConstants; import org.eclipse.m2e.core.embedder.IMavenConfiguration; import org.eclipse.m2e.core.internal.Messages; @@ -104,7 +103,7 @@ public class ProjectRegistryRefreshJob extends Job implements IResourceChangeLis } catch(CoreException ex) { log.error(ex.getMessage(), ex); } catch(OperationCanceledException ex) { - MavenPlugin.getDefault().getConsole().logMessage("Refreshing Maven model is canceled"); + log.info("Refreshing Maven model is canceled"); } catch (StaleMutableProjectRegistryException e) { synchronized(this.queue) { this.queue.addAll(0, requests); @@ -153,14 +152,14 @@ public class ProjectRegistryRefreshJob extends Job implements IResourceChangeLis MavenUpdateRequest updateRequest = new MavenUpdateRequest(projects, offline, updateSnapshots); updateRequest.setForce(false); queue(updateRequest); - MavenPlugin.getDefault().getConsole().logMessage("Refreshing " + updateRequest.toString()); + log.info("Refreshing " + updateRequest.toString()); } if(!refreshProjects.isEmpty()) { IProject[] projects = refreshProjects.toArray(new IProject[refreshProjects.size()]); MavenUpdateRequest updateRequest = new MavenUpdateRequest(projects, offline, updateSnapshots); updateRequest.setForce(false); queue(updateRequest); - MavenPlugin.getDefault().getConsole().logMessage("Refreshing " + updateRequest.toString()); + log.info("Refreshing " + updateRequest.toString()); } } diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/configurator/AbstractProjectConfigurator.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/configurator/AbstractProjectConfigurator.java index e9510e24..f140e382 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/configurator/AbstractProjectConfigurator.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/configurator/AbstractProjectConfigurator.java @@ -38,7 +38,6 @@ import org.apache.maven.plugin.MojoExecution; 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.embedder.IMaven; import org.eclipse.m2e.core.embedder.IMavenConfiguration; import org.eclipse.m2e.core.internal.Messages; @@ -76,8 +75,6 @@ public abstract class AbstractProjectConfigurator implements IExecutableExtensio protected IMavenMarkerManager markerManager; - protected MavenConsole console; - protected IMaven maven = MavenPlugin.getDefault().getMaven(); public void setProjectManager(MavenProjectManager projectManager) { @@ -92,10 +89,6 @@ public abstract class AbstractProjectConfigurator implements IExecutableExtensio this.markerManager = markerManager; } - public void setConsole(MavenConsole console) { - this.console = console; - } - /** * Configures Eclipse project passed in ProjectConfigurationRequest, using information from Maven project and other * configuration request parameters diff --git a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/PomTemplateContextUtil.java b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/PomTemplateContextUtil.java index e1cd677d..384b7b17 100644 --- a/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/PomTemplateContextUtil.java +++ b/org.eclipse.m2e.editor.xml/src/main/java/org/eclipse/m2e/editor/xml/PomTemplateContextUtil.java @@ -33,7 +33,6 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.m2e.core.MavenPlugin; -import org.eclipse.m2e.core.core.MavenConsole; import org.eclipse.m2e.core.embedder.IMaven; class PomTemplateContextUtil { @@ -51,7 +50,6 @@ class PomTemplateContextUtil { } MavenPlugin plugin = MavenPlugin.getDefault(); - MavenConsole console = plugin.getConsole(); try { IMaven embedder = MavenPlugin.getDefault().getMaven(); @@ -62,7 +60,7 @@ class PomTemplateContextUtil { File file = artifact.getFile(); if(file == null) { String msg = "Can't resolve plugin " + name; //$NON-NLS-1$ - console.logError(msg); + log.error(msg); } else { InputStream is = null; ZipFile zf = null; @@ -76,12 +74,9 @@ class PomTemplateContextUtil { descriptors.put(name, descriptor); return descriptor; } - } catch(Exception ex) { String msg = "Can't read configuration for " + name; //$NON-NLS-1$ - console.logError(msg); log.error(msg, ex); - } finally { IOUtil.close(is); try { @@ -94,14 +89,12 @@ class PomTemplateContextUtil { } catch(CoreException ex) { IStatus status = ex.getStatus(); + String msg = status.getMessage(); if(status.getException() != null) { - console.logError(status.getMessage() + "; " + status.getException().getMessage()); - } else { - console.logError(status.getMessage()); + msg += "; " + status.getException().getMessage(); } - log.error(ex.getMessage(), ex); + log.error(msg, ex); } return null; } - } diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/MavenJdtPlugin.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/MavenJdtPlugin.java index 51b2c409..29f07876 100644 --- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/MavenJdtPlugin.java +++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/MavenJdtPlugin.java @@ -37,7 +37,6 @@ import org.eclipse.debug.core.DebugPlugin; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.eclipse.m2e.core.MavenPlugin; -import org.eclipse.m2e.core.core.MavenConsole; import org.eclipse.m2e.core.embedder.AbstractMavenConfigurationChangeListener; import org.eclipse.m2e.core.embedder.IMavenConfiguration; import org.eclipse.m2e.core.embedder.MavenConfigurationChangeEvent; @@ -79,13 +78,12 @@ public class MavenJdtPlugin extends AbstractUIPlugin { MavenPlugin mavenPlugin = MavenPlugin.getDefault(); MavenProjectManager projectManager = mavenPlugin.getMavenProjectManager(); - MavenConsole console = mavenPlugin.getConsole(); IndexManager indexManager = mavenPlugin.getIndexManager(); IMavenConfiguration mavenConfiguration = MavenPlugin.getDefault().getMavenConfiguration(); File stateLocationDir = getStateLocation().toFile(); - this.buildpathManager = new BuildPathManager(console, projectManager, indexManager, bundleContext, stateLocationDir); + this.buildpathManager = new BuildPathManager(projectManager, indexManager, bundleContext, stateLocationDir); workspace.addResourceChangeListener(buildpathManager, IResourceChangeEvent.PRE_DELETE); projectManager.addMavenProjectChangedListener(this.buildpathManager); diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java index 52182a9d..d69fd391 100644 --- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java +++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java @@ -239,14 +239,12 @@ public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon try { inclusion = toPaths(maven.getMojoParameterValue(request.getMavenSession(), compile, "includes", String[].class)); //$NON-NLS-1$ } catch(CoreException ex) { - log.error(ex.getMessage(), ex); - console.logError("Failed to determine compiler inclusions, assuming defaults"); + log.error("Failed to determine compiler inclusions, assuming defaults", ex); } try { exclusion = toPaths(maven.getMojoParameterValue(request.getMavenSession(), compile, "excludes", String[].class)); //$NON-NLS-1$ } catch(CoreException ex) { - log.error(ex.getMessage(), ex); - console.logError("Failed to determine compiler exclusions, assuming defaults"); + log.error("Failed to determine compiler exclusions, assuming defaults", ex); } } @@ -256,15 +254,13 @@ public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon inclusionTest = toPaths(maven.getMojoParameterValue(request.getMavenSession(), compile, "testIncludes", String[].class)); //$NON-NLS-1$ } catch(CoreException ex) { - log.error(ex.getMessage(), ex); - console.logError("Failed to determine compiler test inclusions, assuming defaults"); + log.error("Failed to determine compiler test inclusions, assuming defaults", ex); } try { exclusionTest = toPaths(maven.getMojoParameterValue(request.getMavenSession(), compile, "testExcludes", String[].class)); //$NON-NLS-1$ } catch(CoreException ex) { - log.error(ex.getMessage(), ex); - console.logError("Failed to determine compiler test exclusions, assuming defaults"); + log.error("Failed to determine compiler test exclusions, assuming defaults", ex); } } @@ -295,13 +291,12 @@ public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon if(sourceFolder != null && sourceFolder.exists() && sourceFolder.getProject().equals(project)) { IClasspathEntryDescriptor cped = getEnclosingEntryDescriptor(classpath, sourceFolder.getFullPath()); if(cped == null) { - console.logMessage("Adding source folder " + sourceFolder.getFullPath()); + log.info("Adding source folder " + sourceFolder.getFullPath()); classpath.addSourceEntry(sourceFolder.getFullPath(), outputPath, inclusion, exclusion, false); } else { - console.logMessage("Not adding source folder " + sourceFolder.getFullPath() + " because it overlaps with " + log.info("Not adding source folder " + sourceFolder.getFullPath() + " because it overlaps with " + cped.getPath()); } - } else { if(sourceFolder != null) { classpath.removeEntry(sourceFolder.getFullPath()); @@ -343,21 +338,21 @@ public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon * </includes> * </resource> */ - console.logError("Skipping resource folder " + r.getFullPath()); + log.error("Skipping resource folder " + r.getFullPath()); } else if(r != null && r.getProject().equals(project)) { IClasspathEntryDescriptor cped = getEnclosingEntryDescriptor(classpath, r.getFullPath()); if(cped == null) { - console.logMessage("Adding resource folder " + r.getFullPath()); + log.info("Adding resource folder " + r.getFullPath()); classpath.addSourceEntry(r.getFullPath(), outputPath, new IPath[0] /*inclusions*/, new IPath[] {new Path( "**")} /*exclusion*/, false /*optional*/); } else { // resources and sources folders overlap. make sure JDT only processes java sources. - console.logMessage("Resources folder " + r.getFullPath() + " overlaps with sources folder " + log.info("Resources folder " + r.getFullPath() + " overlaps with sources folder " + cped.getPath()); cped.addInclusionPattern(new Path("**/*.java")); } } else { - console.logMessage("Not adding resources folder " + resourceDirectory.getAbsolutePath()); + log.info("Not adding resources folder " + resourceDirectory.getAbsolutePath()); } } } @@ -379,12 +374,12 @@ public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon if(source == null) { source = DEFAULT_COMPILER_LEVEL; - console.logMessage("Could not determine source level, using default " + source); + log.warn("Could not determine source level, using default " + source); } if(target == null) { target = DEFAULT_COMPILER_LEVEL; - console.logMessage("Could not determine target level, using default " + target); + log.warn("Could not determine target level, using default " + target); } options.put(JavaCore.COMPILER_SOURCE, source); @@ -395,14 +390,12 @@ public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon private String getCompilerLevel(MavenSession session, MojoExecution execution, String parameter, String source, List<String> levels) { - int levelIdx = getLevelIndex(source, levels); try { source = maven.getMojoParameterValue(session, execution, parameter, String.class); } catch(CoreException ex) { - log.error(ex.getMessage(), ex); - console.logError("Failed to determine compiler " + parameter + " setting, assuming default"); + log.error("Failed to determine compiler " + parameter + " setting, assuming default", ex); } int newLevelIdx = getLevelIndex(source, levels); diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/BuildPathManager.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/BuildPathManager.java index dfc292ed..c45ef894 100644 --- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/BuildPathManager.java +++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/BuildPathManager.java @@ -67,7 +67,6 @@ import org.apache.maven.project.MavenProject; 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.embedder.ArtifactKey; import org.eclipse.m2e.core.embedder.IMaven; import org.eclipse.m2e.core.embedder.IMavenConfiguration; @@ -111,8 +110,6 @@ public class BuildPathManager implements IMavenProjectChangedListener, IResource public static final ArtifactFilter SCOPE_FILTER_TEST = new ScopeArtifactFilter(Artifact.SCOPE_TEST); - final MavenConsole console; - final MavenProjectManager projectManager; final IMavenConfiguration mavenConfiguration; @@ -131,9 +128,8 @@ public class BuildPathManager implements IMavenProjectChangedListener, IResource private final DefaultClasspathManagerDelegate defaultDelegate; - public BuildPathManager(MavenConsole console, MavenProjectManager projectManager, IndexManager indexManager, + public BuildPathManager(MavenProjectManager projectManager, IndexManager indexManager, BundleContext bundleContext, File stateLocationDir) { - this.console = console; this.projectManager = projectManager; this.indexManager = indexManager; this.mavenConfiguration = MavenPlugin.getDefault().getMavenConfiguration(); diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/DownloadSourcesJob.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/DownloadSourcesJob.java index cfcc2fdb..eccac357 100644 --- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/DownloadSourcesJob.java +++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/DownloadSourcesJob.java @@ -39,7 +39,6 @@ import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.project.MavenProject; import org.eclipse.m2e.core.MavenPlugin; -import org.eclipse.m2e.core.core.MavenConsole; import org.eclipse.m2e.core.embedder.ArtifactKey; import org.eclipse.m2e.core.embedder.IMaven; import org.eclipse.m2e.core.jobs.IBackgroundProcessingQueue; @@ -108,8 +107,6 @@ class DownloadSourcesJob extends Job implements IBackgroundProcessingQueue { private final BuildPathManager manager; - private final MavenConsole console; - private final MavenProjectManager projectManager; private final ArrayList<DownloadRequest> queue = new ArrayList<DownloadRequest>(); @@ -122,7 +119,6 @@ class DownloadSourcesJob extends Job implements IBackgroundProcessingQueue { MavenPlugin plugin = MavenPlugin.getDefault(); this.projectManager = plugin.getMavenProjectManager(); - this.console = plugin.getConsole(); } public IStatus run(IProgressMonitor monitor) { @@ -213,18 +209,18 @@ class DownloadSourcesJob extends Job implements IBackgroundProcessingQueue { if (attached[0] != null) { try { files[0] = download(attached[0], repositories, monitor); - console.logMessage("Downloaded sources for " + artifact.toString()); + log.info("Downloaded sources for " + artifact.toString()); } catch (CoreException e) { - logMessage("Could not download sources for " + artifact.toString(), e); //$NON-NLS-1$ + log.error("Could not download sources for " + artifact.toString(), e); //$NON-NLS-1$ } } if (attached[1] != null) { try { files[1] = download(attached[1], repositories, monitor); - console.logMessage("Downloaded javadoc for " + artifact.toString()); + log.info("Downloaded javadoc for " + artifact.toString()); } catch (CoreException e) { - logMessage("Could not download sources for " + artifact.toString(), e); //$NON-NLS-1$ + log.error("Could not download sources for " + artifact.toString(), e); //$NON-NLS-1$ } } @@ -242,11 +238,6 @@ class DownloadSourcesJob extends Job implements IBackgroundProcessingQueue { return resolved.getFile(); } - private void logMessage(String msg, CoreException e) { - log.error(msg, e); - console.logMessage(msg); - } - private void scheduleDownload(IProject project, IPackageFragmentRoot fragment, ArtifactKey artifact, boolean downloadSources, boolean downloadJavadoc) { if (project == null || !project.isAccessible()) { return; diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/JavaElementsAdapterFactory.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/JavaElementsAdapterFactory.java index a93684d6..c19a375e 100644 --- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/JavaElementsAdapterFactory.java +++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/JavaElementsAdapterFactory.java @@ -58,8 +58,7 @@ public class JavaElementsAdapterFactory implements IAdapterFactory { try { return getBuildPathManager().findArtifact(project, fragment.getPath()); } catch(CoreException ex) { - log.error(ex.getMessage(), ex); - MavenPlugin.getDefault().getConsole().logError("Can't find artifact for " + fragment); + log.error("Can't find artifact for " + fragment, ex); return null; } } 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 78796491..329ad91c 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 @@ -295,7 +295,7 @@ public class ExecutePomAction implements ILaunchShortcut, IExecutableExtension { } if(matchingConfigs.size()==1) { - MavenPlugin.getDefault().getConsole().logMessage("Using existing launch configuration"); + log.info("Using existing launch configuration"); return matchingConfigs.get(0); } else if(matchingConfigs.size()>1) { final IDebugModelPresentation labelProvider = DebugUITools.newDebugModelPresentation(); @@ -352,7 +352,7 @@ public class ExecutePomAction implements ILaunchShortcut, IExecutableExtension { } } - MavenPlugin.getDefault().getConsole().logMessage("Creating new launch configuration"); + log.info("Creating new launch configuration"); String newName = launchManager.generateUniqueLaunchConfigurationNameFrom(basedirLocation.lastSegment()); try { 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 9ac8550d..7fdb2c1d 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 @@ -37,7 +37,6 @@ import org.eclipse.jdt.launching.VMRunnerConfiguration; 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.embedder.IMavenConfiguration; import org.eclipse.m2e.core.embedder.IMavenLauncherConfiguration; import org.slf4j.Logger; @@ -57,9 +56,8 @@ public class MavenLaunchDelegate extends JavaLaunchDelegate implements MavenLaun public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { - MavenConsole console = MavenPlugin.getDefault().getConsole(); - console.logMessage("" + getWorkingDirectory(configuration)); //$NON-NLS-1$ - console.logMessage(" mvn" + getProgramArguments(configuration)); //$NON-NLS-1$ + log.info("" + getWorkingDirectory(configuration)); //$NON-NLS-1$ + log.info(" mvn" + getProgramArguments(configuration)); //$NON-NLS-1$ runtime = MavenLaunchUtils.getMavenRuntime(configuration); diff --git a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/MavenCheckoutOperation.java b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/MavenCheckoutOperation.java index 3da9102e..26af0f5e 100644 --- a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/MavenCheckoutOperation.java +++ b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/MavenCheckoutOperation.java @@ -19,11 +19,12 @@ import java.util.List; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.m2e.core.core.MavenConsole; import org.eclipse.m2e.scm.internal.Messages; import org.eclipse.m2e.scm.internal.ScmHandlerFactory; import org.eclipse.m2e.scm.spi.ScmHandler; import org.eclipse.osgi.util.NLS; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** @@ -32,19 +33,17 @@ import org.eclipse.osgi.util.NLS; * @author Eugene Kuleshov */ public class MavenCheckoutOperation { + private static final Logger log = LoggerFactory.getLogger(MavenCheckoutOperation.class); - private final MavenConsole console; - private final File location; private final Collection<MavenProjectScmInfo> mavenProjects; private final List<String> locations = new ArrayList<String>(); - public MavenCheckoutOperation(File location, Collection<MavenProjectScmInfo> mavenProjects, MavenConsole console) { + public MavenCheckoutOperation(File location, Collection<MavenProjectScmInfo> mavenProjects) { this.location = location; this.mavenProjects = mavenProjects; - this.console = console; } public void run(IProgressMonitor monitor) throws InterruptedException, CoreException { @@ -90,14 +89,12 @@ public class MavenCheckoutOperation { ScmHandler handler = ScmHandlerFactory.getHandler(info.getFolderUrl()); if(handler == null) { String msg = "SCM provider is not available for " + info.getFolderUrl(); - console.logError(msg); + log.error(msg); } else { handler.checkoutProject(info, location, monitor); locations.add(location.getAbsolutePath()); } - } - } protected File getUniqueDir(File baseDir) { diff --git a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/MavenProjectPomScanner.java b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/MavenProjectPomScanner.java index d8508e28..a1785a42 100644 --- a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/MavenProjectPomScanner.java +++ b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/MavenProjectPomScanner.java @@ -31,7 +31,6 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; 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.embedder.IMaven; import org.eclipse.m2e.core.embedder.MavenModelManager; import org.eclipse.m2e.core.internal.Messages; @@ -51,16 +50,13 @@ public class MavenProjectPomScanner<T> extends AbstractProjectScanner<MavenProje private final boolean developer; private final Dependency[] dependencies; - - private MavenConsole console; private IMaven maven; public MavenProjectPomScanner(boolean developer, Dependency[] dependencies, // - MavenModelManager modelManager, MavenConsole console) { + MavenModelManager modelManager) { this.developer = developer; this.dependencies = dependencies; - this.console = console; this.maven = MavenPlugin.getDefault().getMaven(); } @@ -84,42 +80,46 @@ public class MavenProjectPomScanner<T> extends AbstractProjectScanner<MavenProje Model model = resolveModel(d.getGroupId(), d.getArtifactId(), d.getVersion(), monitor); if(model==null) { String msg = "Can't resolve " + d.getArtifactId(); - console.logError(msg); - addError(new Exception(msg)); + Exception error = new Exception(msg); + log.error(msg, error); + addError(error); continue; } Scm scm = resolveScm(model, monitor); if(scm==null) { String msg = "No SCM info for " + d.getArtifactId(); - console.logError(msg); - addError(new Exception(msg)); + Exception error = new Exception(msg); + log.error(msg, error); + addError(error); continue; } String tag = scm.getTag(); - console.logMessage(d.getArtifactId()); - console.logMessage("Connection: " + scm.getConnection()); - console.logMessage(" dev: " + scm.getDeveloperConnection()); - console.logMessage(" url: " + scm.getUrl()); - console.logMessage(" tag: " + tag); + log.info(d.getArtifactId()); + log.info("Connection: " + scm.getConnection()); + log.info(" dev: " + scm.getDeveloperConnection()); + log.info(" url: " + scm.getUrl()); + log.info(" tag: " + tag); String connection; if(developer) { connection = scm.getDeveloperConnection(); if(connection==null) { String msg = d.getArtifactId() + " doesn't specify developer SCM connection"; - console.logError(msg); - addError(new Exception(msg)); + Exception error = new Exception(msg); + log.error(msg, error); + addError(error); continue; } } else { connection = scm.getConnection(); if(connection==null) { String msg = d.getArtifactId() + " doesn't specify SCM connection"; - console.logError(msg); - addError(new Exception(msg)); + Exception error = new Exception(msg); + log.error(msg, error); + addError(error); continue; } } @@ -143,7 +143,6 @@ public class MavenProjectPomScanner<T> extends AbstractProjectScanner<MavenProje } catch(Exception ex) { addError(ex); String msg = "Error reading " + d.getArtifactId(); - console.logError(msg); log.error(msg, ex); } } diff --git a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/wizards/MavenMaterializePomWizard.java b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/wizards/MavenMaterializePomWizard.java index ddfd234f..dfbc9986 100644 --- a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/wizards/MavenMaterializePomWizard.java +++ b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/wizards/MavenMaterializePomWizard.java @@ -20,7 +20,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.embedder.ArtifactKey; -import org.eclipse.m2e.scm.internal.Messages; import org.eclipse.m2e.core.project.ProjectImportConfiguration; import org.eclipse.m2e.core.ui.internal.actions.SelectionUtil; import org.eclipse.m2e.core.ui.internal.wizards.AbstractMavenProjectWizard; @@ -28,6 +27,7 @@ import org.eclipse.m2e.core.ui.internal.wizards.MavenDependenciesWizardPage; import org.eclipse.m2e.core.ui.internal.wizards.MavenProjectWizardLocationPage; import org.eclipse.m2e.scm.MavenProjectPomScanner; import org.eclipse.m2e.scm.MavenProjectScmInfo; +import org.eclipse.m2e.scm.internal.Messages; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Button; @@ -134,9 +134,9 @@ public class MavenMaterializePomWizard extends AbstractMavenProjectWizard implem MavenProjectCheckoutJob job = new MavenProjectCheckoutJob(importConfiguration, checkoutAllProjects, workingSets) { protected List<MavenProjectScmInfo> getProjects(IProgressMonitor monitor) throws InterruptedException { MavenPlugin plugin = MavenPlugin.getDefault(); - MavenProjectPomScanner<MavenProjectScmInfo> scanner = new MavenProjectPomScanner<MavenProjectScmInfo>(developer, dependencies, // - plugin.getMavenModelManager(), // - plugin.getConsole()); + MavenProjectPomScanner<MavenProjectScmInfo> scanner = new MavenProjectPomScanner<MavenProjectScmInfo>( + developer, dependencies, // + plugin.getMavenModelManager()); scanner.run(monitor); // XXX handle errors/warnings @@ -152,5 +152,4 @@ public class MavenMaterializePomWizard extends AbstractMavenProjectWizard implem return true; } - } diff --git a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/wizards/MavenProjectCheckoutJob.java b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/wizards/MavenProjectCheckoutJob.java index 6be6cccd..ea9a745d 100644 --- a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/wizards/MavenProjectCheckoutJob.java +++ b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/wizards/MavenProjectCheckoutJob.java @@ -37,7 +37,6 @@ import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.m2e.core.MavenPlugin; -import org.eclipse.m2e.core.core.MavenConsole; import org.eclipse.m2e.core.embedder.MavenModelManager; import org.eclipse.m2e.core.project.IMavenProjectImportResult; import org.eclipse.m2e.core.project.LocalProjectScanner; @@ -104,15 +103,13 @@ public abstract class MavenProjectCheckoutJob extends WorkspaceJob { public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException { try { - MavenPlugin plugin = MavenPlugin.getDefault(); - MavenConsole console = plugin.getConsole(); - - MavenCheckoutOperation operation = new MavenCheckoutOperation(location, getProjects(monitor), console); + MavenCheckoutOperation operation = new MavenCheckoutOperation(location, getProjects(monitor)); operation.run(monitor); collectedLocations.addAll(operation.getLocations()); IWorkspaceRoot workspace = ResourcesPlugin.getWorkspace().getRoot(); + MavenPlugin plugin = MavenPlugin.getDefault(); MavenModelManager modelManager = plugin.getMavenModelManager(); LocalProjectScanner scanner = new LocalProjectScanner(workspace.getLocation().toFile(), operation.getLocations(), @@ -161,7 +158,7 @@ public abstract class MavenProjectCheckoutJob extends WorkspaceJob { } if(projects.isEmpty()) { - MavenPlugin.getDefault().getConsole().logMessage("No Maven projects to import"); + log.info("No Maven projects to import"); if(collectedLocations.size()==1) { final String location = collectedLocations.get(0); @@ -245,13 +242,11 @@ public abstract class MavenProjectCheckoutJob extends WorkspaceJob { } protected void cleanup(List<String> locations) { - MavenConsole console = MavenPlugin.getDefault().getConsole(); for(String location : locations) { try { FileUtils.deleteDirectory(location); } catch(IOException ex) { - String msg = "Can't delete " + location; - console.logError(msg + "; " + (ex.getMessage()==null ? ex.toString() : ex.getMessage())); //$NON-NLS-1$ + String msg = "Can't delete " + location + "; " + (ex.getMessage() == null ? ex.toString() : ex.getMessage()); //$NON-NLS-1$ log.error(msg, ex); } } |