SONAR-4731 Replace "Dry Run" with "Preview" in text strings

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java
index adea17180362f7d3f428318343eb7e4900b3ae67..dd967953e5373db67ad6c18ec6b0334030bc90b6 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java
@@ -192,26 +192,26 @@ import java.util.List;
   @Property(
     key = CoreProperties.DRY_RUN,
     defaultValue = "false",
-    name = "Dry Run",
+    name = "Preview",
     type = PropertyType.BOOLEAN,
     global = false, project = false,
     category = CoreProperties.CATEGORY_GENERAL),
   @Property(
     key = CoreProperties.DRY_RUN_INCLUDE_PLUGINS,
-    name = "Plugins accepted for dry run",
+    name = "Plugins accepted for Preview",
     defaultValue = CoreProperties.DRY_RUN_INCLUDE_PLUGINS_DEFAULT_VALUE,
     global = true, project = false,
     category = CoreProperties.CATEGORY_GENERAL),
   @Property(
     key = CoreProperties.DRY_RUN_EXCLUDE_PLUGINS,
-    name = "Plugins excluded for dry run",
+    name = "Plugins excluded for Preview",
     global = true, project = false,
     defaultValue = CoreProperties.DRY_RUN_EXCLUDE_PLUGINS_DEFAULT_VALUE,
     category = CoreProperties.CATEGORY_GENERAL),
   @Property(
     key = "sonar.dryRun.export.path",
     defaultValue = "dryRun.json",
-    name = "Dry Run Results Export File",
+    name = "Preview Results Export File",
     type = PropertyType.STRING,
     global = false, project = false),
   @Property(

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
index 56028bc09083e435d7d421a63247bc4b4988266d..71eaf1cb52b21b696f9e9f9be4b8f7e51de41415 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -2301,9 +2301,9 @@ global_permissions.shareDashboard=Share Dashboards And Filters
 global_permissions.shareDashboard.desc=Ability to share dashboards, issue filters and measure filters.
 global_permissions.scan=Execute Analysis
 global_permissions.scan.desc=Ability to execute analyses, and to get all settings required to perform the analysis, even the secured ones like the scm account password, the jira account password, and so on.
-global_permissions.dryRunScan=Execute Local Analysis (Dry Run)
-global_permissions.dryRunScan.desc=Ability to execute local (dry run) analyses without pushing the results to the server, and to get all settings required to perform a local analysis. This permission does not include the ability to access secured settings such as the scm account password, the jira account password, and so on.<br/>\
-This permission is <em>required</em> to execute a local analysis in Eclipse or via the Issues Report plugin.
+global_permissions.dryRunScan=Execute Preview
+global_permissions.dryRunScan.desc=Ability to execute Preview (results are not pushed to the server). This permission does not include the ability to access secured settings such as the scm account password, the jira account password, and so on.<br/>\
+This permission is <em>required</em> to execute Preview in Eclipse or via the Issues Report plugin.
 global_permissions.provisioning=Provision Resources
 global_permissions.provisioning.desc=Ability to initialize project structure before first analysis.
 

diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/DryRunDatabase.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/DryRunDatabase.java
index e8076a73bb97cb9a42165451a1b26af28900f010..f48478772476b4fd6989ecf6f0bbc462baecbeed 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/DryRunDatabase.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/DryRunDatabase.java
@@ -60,7 +60,7 @@ public class DryRunDatabase implements BatchComponent {
 
   public void start() {
     if (settings.getBoolean(CoreProperties.DRY_RUN)) {
-      LOG.info("Dry run");
+      LOG.info("Preview");
       File databaseFile = tempDirectories.getFile("", "dryrun.h2.db");
 
       // SONAR-4488 Allow to increase dryRun timeout