From 2570830f0b10b1bcdb15e12a44501a3c7c405055 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Mon, 14 Nov 2011 10:01:55 +0100 Subject: [PATCH] Remove 2 commented-out lines + add a DEBUG log when excluding plugin --- .../src/main/java/org/sonar/application/JettyEmbedder.java | 1 - .../java/org/sonar/batch/bootstrap/BatchPluginRepository.java | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sonar-application/src/main/java/org/sonar/application/JettyEmbedder.java b/sonar-application/src/main/java/org/sonar/application/JettyEmbedder.java index 309e3a40bcf..1fbb211c2a3 100644 --- a/sonar-application/src/main/java/org/sonar/application/JettyEmbedder.java +++ b/sonar-application/src/main/java/org/sonar/application/JettyEmbedder.java @@ -89,7 +89,6 @@ public class JettyEmbedder { } } }); -// LoggerFactory.getLogger("org.sonar.INFO").info("Sonar started: " + toString()); } private Server configureProgrammatically() throws URISyntaxException, IOException { diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java index 27061aadc67..a6ed92b427a 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java @@ -61,7 +61,6 @@ public class BatchPluginRepository implements PluginRepository { blackList = Sets.newTreeSet(Arrays.asList(settings.getStringArray(CoreProperties.BATCH_EXCLUDE_PLUGINS))); LOG.info("Exclude plugins: " + Joiner.on(", ").join(blackList)); } - // TODO reactivate somewhere else: LOG.info("Execution environment: {} {}", environment.getKey(), environment.getVersion()); } public void start() { @@ -77,7 +76,7 @@ public class BatchPluginRepository implements PluginRepository { List extensionFiles = pluginFiles.subList(1, pluginFiles.size()); PluginMetadata metadata = extractor.installInSameLocation(pluginFiles.get(0), remote.isCore(), extensionFiles); if (StringUtils.isBlank(metadata.getBasePlugin()) || isAccepted(metadata.getBasePlugin())) { - // TODO log when excluding plugin + LOG.debug("Excluded plugin: " + metadata.getKey()); metadataByKey.put(metadata.getKey(), metadata); } } -- 2.39.5