diff --git a/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/MavenRemotePullUtil.java b/plugins/maven-server-api/src/main/java/org/jetbrains/idea/maven/server/MavenRemotePullUtil.java similarity index 100% rename from plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/MavenRemotePullUtil.java rename to plugins/maven-server-api/src/main/java/org/jetbrains/idea/maven/server/MavenRemotePullUtil.java diff --git a/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/MavenServerDownloadListenerWrapper.java b/plugins/maven-server-api/src/main/java/org/jetbrains/idea/maven/server/MavenServerDownloadListenerWrapper.java similarity index 100% rename from plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/MavenServerDownloadListenerWrapper.java rename to plugins/maven-server-api/src/main/java/org/jetbrains/idea/maven/server/MavenServerDownloadListenerWrapper.java diff --git a/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/Maven3ServerGlobals.java b/plugins/maven-server-api/src/main/java/org/jetbrains/idea/maven/server/MavenServerGlobals.java similarity index 60% rename from plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/Maven3ServerGlobals.java rename to plugins/maven-server-api/src/main/java/org/jetbrains/idea/maven/server/MavenServerGlobals.java index 105540028ffd..076ff13acdeb 100644 --- a/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/Maven3ServerGlobals.java +++ b/plugins/maven-server-api/src/main/java/org/jetbrains/idea/maven/server/MavenServerGlobals.java @@ -2,9 +2,9 @@ package org.jetbrains.idea.maven.server; -public final class Maven3ServerGlobals { - private static MavenServerLoggerWrapper myLogger = new MavenServerLoggerWrapper(); - private static MavenServerDownloadListenerWrapper myDownloadListener = new MavenServerDownloadListenerWrapper(); +public final class MavenServerGlobals { + private static final MavenServerLoggerWrapper myLogger = new MavenServerLoggerWrapper(); + private static final MavenServerDownloadListenerWrapper myDownloadListener = new MavenServerDownloadListenerWrapper(); public static MavenServerLoggerWrapper getLogger() { return myLogger; diff --git a/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/MavenServerLoggerWrapper.java b/plugins/maven-server-api/src/main/java/org/jetbrains/idea/maven/server/MavenServerLoggerWrapper.java similarity index 100% rename from plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/MavenServerLoggerWrapper.java rename to plugins/maven-server-api/src/main/java/org/jetbrains/idea/maven/server/MavenServerLoggerWrapper.java diff --git a/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/Maven3ServerEmbedder.java b/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/Maven3ServerEmbedder.java index e14baa64adc0..ac2332a71a71 100644 --- a/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/Maven3ServerEmbedder.java +++ b/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/Maven3ServerEmbedder.java @@ -325,7 +325,7 @@ public abstract class Maven3ServerEmbedder extends MavenRemoteObject implements result.add(ProjectUtils.buildArtifactRepository(MavenModelConverter.toNativeRepository(each), factory, container)); } catch (InvalidRepositoryException e) { - Maven3ServerGlobals.getLogger().warn(e); + MavenServerGlobals.getLogger().warn(e); } } return result; @@ -440,7 +440,7 @@ public abstract class Maven3ServerEmbedder extends MavenRemoteObject implements throws RemoteException; protected static void warn(String message, Throwable e) { - Maven3ServerGlobals.getLogger().warn(new RuntimeException(message, e)); + MavenServerGlobals.getLogger().warn(new RuntimeException(message, e)); } @Override @@ -465,7 +465,7 @@ public abstract class Maven3ServerEmbedder extends MavenRemoteObject implements return getArchetypes(archetypeCatalog); } catch (Exception e) { - Maven3ServerGlobals.getLogger().warn(e); + MavenServerGlobals.getLogger().warn(e); } return Collections.emptyList(); } @@ -481,7 +481,7 @@ public abstract class Maven3ServerEmbedder extends MavenRemoteObject implements return getArchetypes(archetypeCatalog); } catch (Exception e) { - Maven3ServerGlobals.getLogger().warn(e); + MavenServerGlobals.getLogger().warn(e); } return Collections.emptyList(); } @@ -497,7 +497,7 @@ public abstract class Maven3ServerEmbedder extends MavenRemoteObject implements return getArchetypes(archetypeCatalog); } catch (ArchetypeDataSourceException e) { - Maven3ServerGlobals.getLogger().warn(e); + MavenServerGlobals.getLogger().warn(e); } return Collections.emptyList(); } diff --git a/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/Maven3ServerIndexFetcher.java b/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/Maven3ServerIndexFetcher.java index 8f169c1a0cb5..2cb3c43a1e56 100644 --- a/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/Maven3ServerIndexFetcher.java +++ b/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/Maven3ServerIndexFetcher.java @@ -87,7 +87,7 @@ public class Maven3ServerIndexFetcher extends AbstractResourceFetcher { myWagon.disconnect(); } catch (ConnectionException ex) { - Maven3ServerGlobals.getLogger().warn(ex); + MavenServerGlobals.getLogger().warn(ex); } } diff --git a/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/Maven3ServerIndexerImpl.java b/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/Maven3ServerIndexerImpl.java index de413e5f53cd..26f1afa2bab4 100644 --- a/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/Maven3ServerIndexerImpl.java +++ b/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/Maven3ServerIndexerImpl.java @@ -90,7 +90,7 @@ public abstract class Maven3ServerIndexerImpl extends MavenWatchdogAware impleme return IndexReader.indexExists(dir); } catch (Exception e) { - Maven3ServerGlobals.getLogger().warn(e); + MavenServerGlobals.getLogger().warn(e); } return false; } @@ -336,7 +336,7 @@ public abstract class Maven3ServerIndexerImpl extends MavenWatchdogAware impleme } } catch (ArchetypeDataSourceException e) { - Maven3ServerGlobals.getLogger().warn(e); + MavenServerGlobals.getLogger().warn(e); } } diff --git a/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/MavenLeakDetector.java b/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/MavenLeakDetector.java index 5c2d53604fdb..3da7a23ce16c 100644 --- a/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/MavenLeakDetector.java +++ b/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/MavenLeakDetector.java @@ -51,7 +51,7 @@ public class MavenLeakDetector { private static void removeHook(Thread thread) throws RemoteException { Runtime.getRuntime().removeShutdownHook(thread); - Maven3ServerGlobals.getLogger().print(String.format("ShutdownHook[%s] was removed to avoid memory leak", thread)); + MavenServerGlobals.getLogger().print(String.format("ShutdownHook[%s] was removed to avoid memory leak", thread)); } private static Map getShutdownHooks() { diff --git a/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/MavenModelConverter.java b/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/MavenModelConverter.java index e9106e64bee9..ef621da7171a 100644 --- a/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/MavenModelConverter.java +++ b/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/MavenModelConverter.java @@ -296,7 +296,7 @@ public class MavenModelConverter { result = new Element(xpp.getName()); } catch (IllegalNameException e) { - Maven3ServerGlobals.getLogger().info(e); + MavenServerGlobals.getLogger().info(e); return null; } diff --git a/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/WagonTransferListenerAdapter.java b/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/WagonTransferListenerAdapter.java index c6f7cad59178..00c79e640f1b 100644 --- a/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/WagonTransferListenerAdapter.java +++ b/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/WagonTransferListenerAdapter.java @@ -55,7 +55,7 @@ public class WagonTransferListenerAdapter implements TransferListener { @Override public void transferCompleted(TransferEvent event) { - Maven3ServerGlobals.getDownloadListener().artifactDownloaded(event.getLocalFile(), event.getResource().getName()); + MavenServerGlobals.getDownloadListener().artifactDownloaded(event.getLocalFile(), event.getResource().getName()); checkCanceled(); diff --git a/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerImpl.java b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerImpl.java index 969969ae0745..48128b2d7a10 100644 --- a/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerImpl.java +++ b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerImpl.java @@ -84,7 +84,7 @@ public class Maven3ServerImpl extends MavenWatchdogAware implements MavenServer public MavenPullServerLogger createPullLogger(MavenToken token) { MavenServerUtil.checkToken(token); try { - MavenServerLoggerWrapper result = Maven3ServerGlobals.getLogger(); + MavenServerLoggerWrapper result = MavenServerGlobals.getLogger(); UnicastRemoteObject.exportObject(result, 0); return result; } @@ -97,7 +97,7 @@ public class Maven3ServerImpl extends MavenWatchdogAware implements MavenServer public MavenPullDownloadListener createPullDownloadListener(MavenToken token) { MavenServerUtil.checkToken(token); try { - MavenServerDownloadListenerWrapper result = Maven3ServerGlobals.getDownloadListener(); + MavenServerDownloadListenerWrapper result = MavenServerGlobals.getDownloadListener(); UnicastRemoteObject.exportObject(result, 0); return result; } diff --git a/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3XProfileUtil.java b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3XProfileUtil.java index 7269a0ab1a6c..54184a0a1307 100644 --- a/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3XProfileUtil.java +++ b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3XProfileUtil.java @@ -81,7 +81,7 @@ public final class Maven3XProfileUtil { } } catch (Exception e) { - Maven3ServerGlobals.getLogger().warn(e); + MavenServerGlobals.getLogger().warn(e); } } } @@ -131,7 +131,7 @@ public final class Maven3XProfileUtil { } catch (Exception e) { // don't bother user if maven failed to build parent project - Maven3ServerGlobals.getLogger().info(e); + MavenServerGlobals.getLogger().info(e); } return collectProfilesIds(profiles); } @@ -167,10 +167,10 @@ public final class Maven3XProfileUtil { result = interpolator.interpolate(result, basedir, config, false); } catch (ModelInterpolationException e) { - Maven3ServerGlobals.getLogger().warn(e); + MavenServerGlobals.getLogger().warn(e); } catch (InitializationException e) { - Maven3ServerGlobals.getLogger().error(e); + MavenServerGlobals.getLogger().error(e); } return result; } @@ -190,7 +190,7 @@ public final class Maven3XProfileUtil { processor.invoke(interpolator, component); } catch (Exception e) { - Maven3ServerGlobals.getLogger().error(e); + MavenServerGlobals.getLogger().error(e); } } //interpolator.initialize(); @@ -234,12 +234,12 @@ public final class Maven3XProfileUtil { for (ModelProblemCollectorRequest problem : problems) { if (problem.getException() != null) { - Maven3ServerGlobals.getLogger().warn(problem.getException()); + MavenServerGlobals.getLogger().warn(problem.getException()); } } } catch (Exception e) { - Maven3ServerGlobals.getLogger().error(e); + MavenServerGlobals.getLogger().error(e); } return result; } @@ -262,7 +262,7 @@ public final class Maven3XProfileUtil { sysPropertyActivator.contextualize(context); } catch (ContextException e) { - Maven3ServerGlobals.getLogger().error(e); + MavenServerGlobals.getLogger().error(e); return new ProfileActivator[0]; } diff --git a/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3XServerEmbedder.java b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3XServerEmbedder.java index 562a0047bcbb..824d06d708e1 100644 --- a/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3XServerEmbedder.java +++ b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3XServerEmbedder.java @@ -315,7 +315,7 @@ public abstract class Maven3XServerEmbedder extends Maven3ServerEmbedder { result = builder.build(settingsRequest).getEffectiveSettings(); } catch (SettingsBuildingException e) { - Maven3ServerGlobals.getLogger().info(e); + MavenServerGlobals.getLogger().info(e); } result.setOffline(settings.isOffline()); @@ -503,7 +503,7 @@ public abstract class Maven3XServerEmbedder extends Maven3ServerEmbedder { methodSetModelVersionProcessor.invoke(interpolator, component); } catch (Exception e) { - Maven3ServerGlobals.getLogger().error(e); + MavenServerGlobals.getLogger().error(e); } } @@ -980,7 +980,7 @@ public abstract class Maven3XServerEmbedder extends Maven3ServerEmbedder { result.setMultiModuleProjectDirectory(mavenMultiModuleProjectDirectory); } catch (Exception e) { - Maven3ServerGlobals.getLogger().error(e); + MavenServerGlobals.getLogger().error(e); } } @@ -1117,7 +1117,7 @@ public abstract class Maven3XServerEmbedder extends Maven3ServerEmbedder { for (Throwable each : exceptions) { if (each == null) continue; - Maven3ServerGlobals.getLogger().print(ExceptionUtils.getFullStackTrace(each)); + MavenServerGlobals.getLogger().print(ExceptionUtils.getFullStackTrace(each)); myConsoleWrapper.info("Validation error:", each); Artifact problemTransferArtifact = getProblemTransferArtifact(each); @@ -1278,7 +1278,7 @@ public abstract class Maven3XServerEmbedder extends Maven3ServerEmbedder { return new MavenArtifactResolveResult(mavenArtifacts.get(), null); } catch (Exception e) { - Maven3ServerGlobals.getLogger().error(e); + MavenServerGlobals.getLogger().error(e); Artifact transferArtifact = getProblemTransferArtifact(e); String message = getRootMessage(e); MavenProjectProblem problem; @@ -1316,7 +1316,7 @@ public abstract class Maven3XServerEmbedder extends Maven3ServerEmbedder { return MavenModelConverter.convertArtifacts(res, new HashMap(), getLocalRepositoryFile()); } catch (Exception e) { - Maven3ServerGlobals.getLogger().info(e); + MavenServerGlobals.getLogger().info(e); throw wrapToSerializableRuntimeException(e); } } @@ -1443,7 +1443,7 @@ public abstract class Maven3XServerEmbedder extends Maven3ServerEmbedder { return new PluginResolutionResponse(mavenPluginId, true, artifacts); } catch (Exception e) { - Maven3ServerGlobals.getLogger().warn(e); + MavenServerGlobals.getLogger().warn(e); return new PluginResolutionResponse(mavenPluginId, false, artifacts); } } @@ -1468,7 +1468,7 @@ public abstract class Maven3XServerEmbedder extends Maven3ServerEmbedder { catch (ComponentLookupException ignore) { } catch (Throwable e) { - Maven3ServerGlobals.getLogger().warn(e); + MavenServerGlobals.getLogger().warn(e); } } @@ -1485,12 +1485,12 @@ public abstract class Maven3XServerEmbedder extends Maven3ServerEmbedder { return MavenModelConverter.convertModel(model, null); } catch (Exception e) { - Maven3ServerGlobals.getLogger().warn(e); + MavenServerGlobals.getLogger().warn(e); } } } catch (Exception e) { - Maven3ServerGlobals.getLogger().warn(e); + MavenServerGlobals.getLogger().warn(e); } return null; } @@ -1532,7 +1532,7 @@ public abstract class Maven3XServerEmbedder extends Maven3ServerEmbedder { return resolve(artifact, remoteRepositories); } catch (Exception e) { - Maven3ServerGlobals.getLogger().info(e); + MavenServerGlobals.getLogger().info(e); } return artifact; } diff --git a/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/TransferListenerAdapter.java b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/TransferListenerAdapter.java index d1b12930c6f2..481838253381 100644 --- a/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/TransferListenerAdapter.java +++ b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/TransferListenerAdapter.java @@ -111,7 +111,7 @@ public class TransferListenerAdapter implements TransferListener { try { myIndicator.setText2("Finished (" + StringUtilRt.formatFileSize(event.getTransferredBytes()) + ") " + formatResourceName(event)); myIndicator.setIndeterminate(true); - Maven3ServerGlobals.getDownloadListener().artifactDownloaded(event.getResource().getFile(), event.getResource().getResourceName()); + MavenServerGlobals.getDownloadListener().artifactDownloaded(event.getResource().getFile(), event.getResource().getResourceName()); } catch (RemoteException e) { throw new RuntimeRemoteException(e); diff --git a/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30ServerEmbedderImpl.java b/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30ServerEmbedderImpl.java index a718f030bf05..948031c7ab89 100644 --- a/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30ServerEmbedderImpl.java +++ b/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30ServerEmbedderImpl.java @@ -245,7 +245,7 @@ public class Maven30ServerEmbedderImpl extends Maven3ServerEmbedder { result = builder.build(settingsRequest).getEffectiveSettings(); } catch (SettingsBuildingException e) { - Maven3ServerGlobals.getLogger().info(e); + MavenServerGlobals.getLogger().info(e); } result.setOffline(settings.isOffline()); @@ -281,7 +281,7 @@ public class Maven30ServerEmbedderImpl extends Maven3ServerEmbedder { } catch (Exception e) { // don't bother user if maven failed to build parent project - Maven3ServerGlobals.getLogger().info(e); + MavenServerGlobals.getLogger().info(e); } return collectProfilesIds(profiles); } @@ -357,7 +357,7 @@ public class Maven30ServerEmbedderImpl extends Maven3ServerEmbedder { } } catch (Exception e) { - Maven3ServerGlobals.getLogger().warn(e); + MavenServerGlobals.getLogger().warn(e); } } } @@ -401,10 +401,10 @@ public class Maven30ServerEmbedderImpl extends Maven3ServerEmbedder { result = interpolator.interpolate(result, basedir, config, false); } catch (ModelInterpolationException e) { - Maven3ServerGlobals.getLogger().warn(e); + MavenServerGlobals.getLogger().warn(e); } catch (InitializationException e) { - Maven3ServerGlobals.getLogger().error(e); + MavenServerGlobals.getLogger().error(e); } return result; } @@ -427,7 +427,7 @@ public class Maven30ServerEmbedderImpl extends Maven3ServerEmbedder { sysPropertyActivator.contextualize(context); } catch (ContextException e) { - Maven3ServerGlobals.getLogger().error(e); + MavenServerGlobals.getLogger().error(e); return new ProfileActivator[0]; } @@ -950,7 +950,7 @@ public class Maven30ServerEmbedderImpl extends Maven3ServerEmbedder { for (Throwable each : exceptions) { if (each == null) continue; - Maven3ServerGlobals.getLogger().info(each); + MavenServerGlobals.getLogger().info(each); if (each instanceof IllegalStateException && each.getCause() != null) { each = each.getCause(); @@ -1005,7 +1005,7 @@ public class Maven30ServerEmbedderImpl extends Maven3ServerEmbedder { return MavenModelConverter.convertArtifacts(res, new HashMap(), getLocalRepositoryFile()); } catch (Exception e) { - Maven3ServerGlobals.getLogger().info(e); + MavenServerGlobals.getLogger().info(e); throw wrapToSerializableRuntimeException(e); } } @@ -1074,7 +1074,7 @@ public class Maven30ServerEmbedderImpl extends Maven3ServerEmbedder { return new PluginResolutionResponse(pluginId, true, artifacts); } catch (Exception e) { - Maven3ServerGlobals.getLogger().info(e); + MavenServerGlobals.getLogger().info(e); return new PluginResolutionResponse(pluginId, false, artifacts); } } @@ -1111,7 +1111,7 @@ public class Maven30ServerEmbedderImpl extends Maven3ServerEmbedder { return resolve(artifact, remoteRepositories); } catch (Exception e) { - Maven3ServerGlobals.getLogger().info(e); + MavenServerGlobals.getLogger().info(e); } return artifact; } diff --git a/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30ServerImpl.java b/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30ServerImpl.java index c91a7ef5d12f..2281573c11f8 100644 --- a/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30ServerImpl.java +++ b/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30ServerImpl.java @@ -98,7 +98,7 @@ public class Maven30ServerImpl extends MavenWatchdogAware implements MavenServer public MavenPullServerLogger createPullLogger(MavenToken token) { MavenServerUtil.checkToken(token); try { - MavenServerLoggerWrapper result = Maven3ServerGlobals.getLogger(); + MavenServerLoggerWrapper result = MavenServerGlobals.getLogger(); UnicastRemoteObject.exportObject(result, 0); return result; } @@ -111,7 +111,7 @@ public class Maven30ServerImpl extends MavenWatchdogAware implements MavenServer public MavenPullDownloadListener createPullDownloadListener(MavenToken token) { MavenServerUtil.checkToken(token); try { - MavenServerDownloadListenerWrapper result = Maven3ServerGlobals.getDownloadListener(); + MavenServerDownloadListenerWrapper result = MavenServerGlobals.getDownloadListener(); UnicastRemoteObject.exportObject(result, 0); return result; } diff --git a/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30TransferListenerAdapter.java b/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30TransferListenerAdapter.java index 8a70adc52bc3..147da49a0eed 100644 --- a/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30TransferListenerAdapter.java +++ b/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30TransferListenerAdapter.java @@ -116,7 +116,7 @@ public class Maven30TransferListenerAdapter implements TransferListener { myIndicator.setIndeterminate(true); myIndicator.completedDownload(MavenServerProgressIndicator.ResolveType.DEPENDENCY, formatResourceName(event)); - Maven3ServerGlobals.getDownloadListener().artifactDownloaded(event.getResource().getFile(), event.getResource().getResourceName()); + MavenServerGlobals.getDownloadListener().artifactDownloaded(event.getResource().getFile(), event.getResource().getResourceName()); } catch (RemoteException e) { throw new RuntimeRemoteException(e); diff --git a/plugins/maven/maven36-server-impl/src/org/jetbrains/idea/maven/server/Maven36ServerEmbedderImpl.java b/plugins/maven/maven36-server-impl/src/org/jetbrains/idea/maven/server/Maven36ServerEmbedderImpl.java index 9059a5540579..55af46d85735 100644 --- a/plugins/maven/maven36-server-impl/src/org/jetbrains/idea/maven/server/Maven36ServerEmbedderImpl.java +++ b/plugins/maven/maven36-server-impl/src/org/jetbrains/idea/maven/server/Maven36ServerEmbedderImpl.java @@ -84,7 +84,7 @@ public class Maven36ServerEmbedderImpl extends Maven3XServerEmbedder { defaultRepositorySystem.setDependencyCollector(dependencyCollector); } catch (Throwable e) { - Maven3ServerGlobals.getLogger().warn(e); + MavenServerGlobals.getLogger().warn(e); } } return repositorySystem; @@ -111,7 +111,7 @@ public class Maven36ServerEmbedderImpl extends Maven3XServerEmbedder { repoSystemField.set(defaultResolver, getRepositorySystem()); } catch (Exception e) { - Maven3ServerGlobals.getLogger().warn(e); + MavenServerGlobals.getLogger().warn(e); } } } @@ -133,7 +133,7 @@ public class Maven36ServerEmbedderImpl extends Maven3XServerEmbedder { repoSystemField.set(defaultResolver, getRepositorySystem()); } catch (Exception e) { - Maven3ServerGlobals.getLogger().warn(e); + MavenServerGlobals.getLogger().warn(e); } } } diff --git a/plugins/maven/maven36-server-impl/src/org/jetbrains/idea/maven/server/Maven36ServerImpl.java b/plugins/maven/maven36-server-impl/src/org/jetbrains/idea/maven/server/Maven36ServerImpl.java index e1904e6e61a3..295b563bc14a 100644 --- a/plugins/maven/maven36-server-impl/src/org/jetbrains/idea/maven/server/Maven36ServerImpl.java +++ b/plugins/maven/maven36-server-impl/src/org/jetbrains/idea/maven/server/Maven36ServerImpl.java @@ -88,7 +88,7 @@ public class Maven36ServerImpl extends MavenWatchdogAware implements MavenServer public MavenPullServerLogger createPullLogger(MavenToken token) { MavenServerUtil.checkToken(token); try { - MavenServerLoggerWrapper result = Maven3ServerGlobals.getLogger(); + MavenServerLoggerWrapper result = MavenServerGlobals.getLogger(); UnicastRemoteObject.exportObject(result, 0); return result; } @@ -101,7 +101,7 @@ public class Maven36ServerImpl extends MavenWatchdogAware implements MavenServer public MavenPullDownloadListener createPullDownloadListener(MavenToken token) { MavenServerUtil.checkToken(token); try { - MavenServerDownloadListenerWrapper result = Maven3ServerGlobals.getDownloadListener(); + MavenServerDownloadListenerWrapper result = MavenServerGlobals.getDownloadListener(); UnicastRemoteObject.exportObject(result, 0); return result; }