diff options
Diffstat (limited to 'sonar-runner-impl/src')
4 files changed, 10 insertions, 9 deletions
diff --git a/sonar-runner-impl/src/main/java/org/sonar/runner/impl/BatchLauncher.java b/sonar-runner-impl/src/main/java/org/sonar/runner/impl/BatchLauncher.java index 93795b0..8a946d5 100644 --- a/sonar-runner-impl/src/main/java/org/sonar/runner/impl/BatchLauncher.java +++ b/sonar-runner-impl/src/main/java/org/sonar/runner/impl/BatchLauncher.java @@ -34,14 +34,14 @@ public class BatchLauncher { if (serverVersion.is35Compatible()) { jarFiles = new Jars35(fileDownloader, new JarExtractor()).download(); } else if (serverVersion.is30Compatible()) { - String workDir = properties.getProperty("sonarRunner.workDir"); + String workDir = properties.getProperty(Constants.RUNNER_WORK_DIR); jarFiles = new Jars30(fileDownloader).download(new File(workDir), new JarExtractor()); } else { throw new IllegalStateException("Sonar " + serverVersion.version() + " is not supported. Please upgrade Sonar to version 3.0 or more."); } - String unmaskedPackages = properties.getProperty(Constants.UNMASKED_PACKAGES, ""); + String unmaskedPackages = properties.getProperty(Constants.RUNNER_UNMASKED_PACKAGES, ""); IsolatedClassloader classloader = new IsolatedClassloader(getClass().getClassLoader(), unmaskedPackages.split(":")); classloader.addFiles(jarFiles); delegateExecution(classloader, properties, extensions); diff --git a/sonar-runner-impl/src/main/java/org/sonar/runner/impl/BatchLauncherMain.java b/sonar-runner-impl/src/main/java/org/sonar/runner/impl/BatchLauncherMain.java index 5e951eb..280157d 100644 --- a/sonar-runner-impl/src/main/java/org/sonar/runner/impl/BatchLauncherMain.java +++ b/sonar-runner-impl/src/main/java/org/sonar/runner/impl/BatchLauncherMain.java @@ -41,7 +41,7 @@ public class BatchLauncherMain { try { props.load(input); // just to be clean, do not forward properties that do not make sense in fork mode - props.remove(Constants.UNMASKED_PACKAGES); + props.remove(Constants.RUNNER_UNMASKED_PACKAGES); } finally { IOUtils.closeQuietly(input); diff --git a/sonar-runner-impl/src/main/java/org/sonar/runner/impl/Constants.java b/sonar-runner-impl/src/main/java/org/sonar/runner/impl/Constants.java index bf2a80a..a06ba1c 100644 --- a/sonar-runner-impl/src/main/java/org/sonar/runner/impl/Constants.java +++ b/sonar-runner-impl/src/main/java/org/sonar/runner/impl/Constants.java @@ -21,9 +21,11 @@ package org.sonar.runner.impl; public interface Constants { String HOST_URL = "sonar.host.url"; - String PROP_APP = "sonarRunner.app"; - String PROP_APP_VERSION = "sonarRunner.appVersion"; - String UNMASKED_PACKAGES = "sonarRunner.unmaskedPackages"; String TASK = "sonar.task"; String SOURCE_ENCODING = "sonar.sourceEncoding"; + + String RUNNER_APP = "sonarRunner.app"; + String RUNNER_APP_VERSION = "sonarRunner.appVersion"; + String RUNNER_UNMASKED_PACKAGES = "sonarRunner.unmaskedPackages"; + String RUNNER_WORK_DIR = "sonarRunner.workDir"; } diff --git a/sonar-runner-impl/src/main/java/org/sonar/runner/impl/FileDownloader.java b/sonar-runner-impl/src/main/java/org/sonar/runner/impl/FileDownloader.java index 2e66b50..d8d0462 100644 --- a/sonar-runner-impl/src/main/java/org/sonar/runner/impl/FileDownloader.java +++ b/sonar-runner-impl/src/main/java/org/sonar/runner/impl/FileDownloader.java @@ -32,7 +32,6 @@ import java.net.ConnectException; import java.net.HttpURLConnection; import java.net.URL; import java.net.UnknownHostException; -import java.util.Map; import java.util.Properties; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -54,8 +53,8 @@ class FileDownloader { static FileDownloader create(Properties properties) { String serverUrl = properties.getProperty(Constants.HOST_URL); - String app = properties.getProperty(Constants.PROP_APP); - String appVersion = properties.getProperty(Constants.PROP_APP_VERSION); + String app = properties.getProperty(Constants.RUNNER_APP); + String appVersion = properties.getProperty(Constants.RUNNER_APP_VERSION); return new FileDownloader(serverUrl, app, appVersion); } |