diff options
42 files changed, 59 insertions, 59 deletions
diff --git a/plugins/sonar-core-plugin/pom.xml b/plugins/sonar-core-plugin/pom.xml index f816e1134da..dd2ef0d56cd 100644 --- a/plugins/sonar-core-plugin/pom.xml +++ b/plugins/sonar-core-plugin/pom.xml @@ -10,7 +10,7 @@ <groupId>org.codehaus.sonar.plugins</groupId> <artifactId>sonar-core-plugin</artifactId> <packaging>sonar-plugin</packaging> - <name>Sonar :: Plugins :: Core</name> + <name>SonarQube :: Plugins :: Core</name> <dependencies> <dependency> 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 97122719cca..84d6b162235 100644 --- 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 @@ -57,7 +57,7 @@ import java.util.List; key = CoreProperties.SERVER_BASE_URL, defaultValue = CoreProperties.SERVER_BASE_URL_DEFAULT_VALUE, name = "Server base URL", - description = "HTTP URL of this Sonar server, such as <i>http://yourhost.yourdomain/sonar</i>. This value is used i.e. to create links in emails.", + description = "HTTP URL of this SonarQube server, such as <i>http://yourhost.yourdomain/sonar</i>. This value is used i.e. to create links in emails.", project = false, global = true, category = CoreProperties.CATEGORY_GENERAL), @@ -170,7 +170,7 @@ import java.util.List; key = CoreProperties.CORE_FORCE_AUTHENTICATION_PROPERTY, defaultValue = "" + CoreProperties.CORE_FORCE_AUTHENTICATION_DEFAULT_VALUE, name = "Force user authentication", - description = "Forcing user authentication stops un-logged users to access Sonar.", + description = "Forcing user authentication stops un-logged users to access SonarQube.", project = false, global = true, category = CoreProperties.CATEGORY_SECURITY, diff --git a/plugins/sonar-cpd-plugin/pom.xml b/plugins/sonar-cpd-plugin/pom.xml index 2527d3d7bcc..3085f5fb135 100644 --- a/plugins/sonar-cpd-plugin/pom.xml +++ b/plugins/sonar-cpd-plugin/pom.xml @@ -9,7 +9,7 @@ </parent> <groupId>org.codehaus.sonar.plugins</groupId> <artifactId>sonar-cpd-plugin</artifactId> - <name>Sonar :: Plugins :: CPD</name> + <name>SonarQube :: Plugins :: CPD</name> <packaging>sonar-plugin</packaging> <description>Find duplicated source code within project.</description> diff --git a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdPlugin.java b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdPlugin.java index ba79993d593..72d474afbf0 100644 --- a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdPlugin.java +++ b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdPlugin.java @@ -38,7 +38,7 @@ public final class CpdPlugin extends SonarPlugin { PropertyDefinition.builder(CoreProperties.CPD_CROSS_RPOJECT) .defaultValue(CoreProperties.CPD_CROSS_RPOJECT_DEFAULT_VALUE + "") .name("Cross project duplication detection") - .description("SonarQube supports the detection of cross project duplications. Activating this property will slightly increase each Sonar analysis time.") + .description("SonarQube supports the detection of cross project duplications. Activating this property will slightly increase each SonarQube analysis time.") .onQualifiers(Qualifiers.PROJECT, Qualifiers.MODULE) .category(CoreProperties.CATEGORY_DUPLICATIONS) .type(PropertyType.BOOLEAN) diff --git a/plugins/sonar-dbcleaner-plugin/pom.xml b/plugins/sonar-dbcleaner-plugin/pom.xml index 10be5ff686c..ce80897a12b 100644 --- a/plugins/sonar-dbcleaner-plugin/pom.xml +++ b/plugins/sonar-dbcleaner-plugin/pom.xml @@ -11,7 +11,7 @@ <artifactId>sonar-dbcleaner-plugin</artifactId> <packaging>sonar-plugin</packaging> - <name>Sonar :: Plugins :: Database Cleaner</name> + <name>SonarQube :: Plugins :: Database Cleaner</name> <description>Optimizes database performances by removing old and useless data.</description> <dependencies> diff --git a/plugins/sonar-design-plugin/pom.xml b/plugins/sonar-design-plugin/pom.xml index 06ca7411bb3..fa7e98d3d26 100644 --- a/plugins/sonar-design-plugin/pom.xml +++ b/plugins/sonar-design-plugin/pom.xml @@ -10,7 +10,7 @@ <groupId>org.codehaus.sonar.plugins</groupId> <artifactId>sonar-design-plugin</artifactId> <packaging>sonar-plugin</packaging> - <name>Sonar :: Plugins :: Design</name> + <name>SonarQube :: Plugins :: Design</name> <dependencies> <dependency> diff --git a/plugins/sonar-email-notifications-plugin/pom.xml b/plugins/sonar-email-notifications-plugin/pom.xml index b1f26668844..74f2115333d 100644 --- a/plugins/sonar-email-notifications-plugin/pom.xml +++ b/plugins/sonar-email-notifications-plugin/pom.xml @@ -13,7 +13,7 @@ <artifactId>sonar-email-notifications-plugin</artifactId> <packaging>sonar-plugin</packaging> - <name>Sonar :: Plugins :: Email Notifications</name> + <name>SonarQube :: Plugins :: Email Notifications</name> <description>Email Notifications</description> <dependencies> diff --git a/plugins/sonar-l10n-en-plugin/pom.xml b/plugins/sonar-l10n-en-plugin/pom.xml index 94f1c299b5f..04eaf6fabb4 100644 --- a/plugins/sonar-l10n-en-plugin/pom.xml +++ b/plugins/sonar-l10n-en-plugin/pom.xml @@ -12,7 +12,7 @@ <groupId>org.codehaus.sonar.plugins</groupId> <artifactId>sonar-l10n-en-plugin</artifactId> <packaging>sonar-plugin</packaging> - <name>Sonar :: Plugins :: English Pack</name> + <name>SonarQube :: Plugins :: English Pack</name> <dependencies> <dependency> diff --git a/plugins/sonar-maven-batch-plugin/pom.xml b/plugins/sonar-maven-batch-plugin/pom.xml index 878b6a53c81..d467aa243f9 100644 --- a/plugins/sonar-maven-batch-plugin/pom.xml +++ b/plugins/sonar-maven-batch-plugin/pom.xml @@ -7,12 +7,12 @@ <version>3.7-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> - + <groupId>org.codehaus.sonar.plugins</groupId> <artifactId>sonar-maven-batch-plugin</artifactId> <packaging>sonar-plugin</packaging> - <name>Sonar :: Maven Batch Plugin</name> - + <name>SonarQube :: Maven Batch Plugin</name> + <properties> <maven.version>3.0</maven.version> </properties> @@ -41,7 +41,7 @@ <version>${maven.version}</version> <scope>provided</scope> </dependency> - + <!-- unit tests --> <dependency> <groupId>org.codehaus.sonar</groupId> @@ -49,7 +49,7 @@ <scope>test</scope> </dependency> </dependencies> - + <build> <plugins> diff --git a/plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/MavenProjectConverter.java b/plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/MavenProjectConverter.java index e950325095e..ad7ad3bb664 100644 --- a/plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/MavenProjectConverter.java +++ b/plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/MavenProjectConverter.java @@ -48,7 +48,7 @@ import java.util.Map; public class MavenProjectConverter implements TaskExtension { private static final String UNABLE_TO_DETERMINE_PROJECT_STRUCTURE_EXCEPTION_MESSAGE = "Unable to determine structure of project." + - " Probably you use Maven Advanced Reactor Options, which is not supported by Sonar and should not be used."; + " Probably you use Maven Advanced Reactor Options, which is not supported by SonarQube and should not be used."; public ProjectDefinition configure(List<MavenProject> poms, MavenProject root) { // projects by canonical path to pom.xml @@ -6,7 +6,7 @@ <artifactId>sonar</artifactId> <packaging>pom</packaging> <version>3.7-SNAPSHOT</version> - <name>Sonar</name> + <name>SonarQube</name> <url>http://www.sonarsource.org/</url> <description>Open source platform for continuous inspection of code quality</description> diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml index 78c0870946e..75ef4857f85 100644 --- a/sonar-application/pom.xml +++ b/sonar-application/pom.xml @@ -11,7 +11,7 @@ <artifactId>sonar-application</artifactId> <packaging>jar</packaging> - <name>Sonar :: Application</name> + <name>SonarQube :: Application</name> <description>Package the standalone distribution</description> <dependencies> diff --git a/sonar-batch-maven-compat/pom.xml b/sonar-batch-maven-compat/pom.xml index 3454afe8aae..2526b90d8fc 100644 --- a/sonar-batch-maven-compat/pom.xml +++ b/sonar-batch-maven-compat/pom.xml @@ -9,7 +9,7 @@ </parent> <artifactId>sonar-batch-maven-compat</artifactId> - <name>Sonar :: Batch Maven Compat</name> + <name>SonarQube :: Batch Maven Compat</name> <description>Compatibility layer, which provides MavenProject for non-Maven environments.</description> <dependencies> @@ -43,7 +43,7 @@ </plugin> </plugins> </build> - + <profiles> <profile> <id>release</id> diff --git a/sonar-batch/pom.xml b/sonar-batch/pom.xml index ece068c843c..51dfdfed270 100644 --- a/sonar-batch/pom.xml +++ b/sonar-batch/pom.xml @@ -9,7 +9,7 @@ <groupId>org.codehaus.sonar</groupId> <artifactId>sonar-batch</artifactId> - <name>Sonar :: Batch</name> + <name>SonarQube :: Batch</name> <dependencies> <dependency> diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/DatabaseCompatibility.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/DatabaseCompatibility.java index 34b6f60d9bf..6b373735b2a 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/DatabaseCompatibility.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/DatabaseCompatibility.java @@ -66,7 +66,7 @@ public class DatabaseCompatibility implements BatchComponent { private void checkDatabaseStatus() { DatabaseVersion.Status status = version.getStatus(); if (status == DatabaseVersion.Status.REQUIRES_DOWNGRADE) { - throw new BadDatabaseVersion("Database relates to a more recent version of Sonar. Please check your settings (JDBC settings, version of Maven plugin)"); + throw new BadDatabaseVersion("Database relates to a more recent version of SonarQube. Please check your settings (JDBC settings, version of Maven plugin)"); } if (status == DatabaseVersion.Status.REQUIRES_UPGRADE) { throw new BadDatabaseVersion("Database must be upgraded. Please browse " + server.getURL() + "/setup"); diff --git a/sonar-batch/src/main/java/org/sonar/batch/index/DefaultIndex.java b/sonar-batch/src/main/java/org/sonar/batch/index/DefaultIndex.java index 650462ca6ba..40a2b99c773 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/index/DefaultIndex.java +++ b/sonar-batch/src/main/java/org/sonar/batch/index/DefaultIndex.java @@ -557,12 +557,12 @@ public class DefaultIndex extends SonarIndex { if (lock.isFailWhenLocked()) { throw new ResourceNotIndexedException(resource); } - LOG.warn("Resource will be ignored in next Sonar versions, index is locked: " + resource); + LOG.warn("Resource will be ignored in next SonarQube versions, index is locked: " + resource); } if (Scopes.isDirectory(resource) || Scopes.isFile(resource)) { bucket = doIndex(resource); } else if (!lock.isLocked()) { - LOG.warn("Resource will be ignored in next Sonar versions, it must be indexed before adding data: " + resource); + LOG.warn("Resource will be ignored in next SonarQube versions, it must be indexed before adding data: " + resource); } } return bucket; diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/DatabaseCompatibilityTest.java b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/DatabaseCompatibilityTest.java index 1fabd1cf856..43677fa9ce4 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/DatabaseCompatibilityTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/DatabaseCompatibilityTest.java @@ -61,7 +61,7 @@ public class DatabaseCompatibilityTest { when(databaseVersion.getStatus()).thenReturn(DatabaseVersion.Status.REQUIRES_DOWNGRADE); thrown.expect(BadDatabaseVersion.class); - thrown.expectMessage("Database relates to a more recent version of Sonar. Please check your settings (JDBC settings, version of Maven plugin)"); + thrown.expectMessage("Database relates to a more recent version of SonarQube. Please check your settings (JDBC settings, version of Maven plugin)"); new DatabaseCompatibility(databaseVersion, server, settings).start(); } diff --git a/sonar-channel/pom.xml b/sonar-channel/pom.xml index 1323297d8dd..c3e7b427b4e 100644 --- a/sonar-channel/pom.xml +++ b/sonar-channel/pom.xml @@ -11,7 +11,7 @@ <artifactId>sonar-channel</artifactId> - <name>Sonar :: Channel</name> + <name>SonarQube :: Channel</name> <description>Code Channel</description> <dependencies> diff --git a/sonar-check-api/pom.xml b/sonar-check-api/pom.xml index 77c9d917908..a560fb73c4b 100644 --- a/sonar-check-api/pom.xml +++ b/sonar-check-api/pom.xml @@ -8,7 +8,7 @@ <relativePath>..</relativePath> </parent> <artifactId>sonar-check-api</artifactId> - <name>Sonar :: Check API</name> + <name>SonarQube :: Check API</name> <description>Check API</description> <dependencies> diff --git a/sonar-colorizer/pom.xml b/sonar-colorizer/pom.xml index 4e61dc7e2c5..665b86b09e7 100644 --- a/sonar-colorizer/pom.xml +++ b/sonar-colorizer/pom.xml @@ -11,7 +11,7 @@ <artifactId>sonar-colorizer</artifactId> - <name>Sonar :: Code Colorizer</name> + <name>SonarQube :: Code Colorizer</name> <description>Code syntax highlighter</description> <dependencies> diff --git a/sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlDecorator.java b/sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlDecorator.java index 60939b34f16..1090700f6a8 100644 --- a/sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlDecorator.java +++ b/sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlDecorator.java @@ -95,7 +95,7 @@ public class HtmlDecorator extends Tokenizer { return new String(ByteStreams.toByteArray(input)); } catch (IOException e) { - throw new SynhtaxHighlightingException("Sonar Colorizer CSS file not found: " + CSS_PATH, e); + throw new SynhtaxHighlightingException("SonarQube Colorizer CSS file not found: " + CSS_PATH, e); } finally { Closeables.closeQuietly(input); diff --git a/sonar-core/pom.xml b/sonar-core/pom.xml index 43f57d21bbe..de760e01b12 100644 --- a/sonar-core/pom.xml +++ b/sonar-core/pom.xml @@ -10,7 +10,7 @@ <artifactId>sonar-core</artifactId> - <name>Sonar :: Core</name> + <name>SonarQube :: Core</name> <description>Core components shared to batch and server</description> <dependencies> @@ -147,7 +147,7 @@ <!-- JDBC drivers for MyBatis integration tests. - They can't be moved to the profile run-mybatis-its because + They can't be moved to the profile run-mybatis-its because --> <dependency> <groupId>mysql</groupId> diff --git a/sonar-deprecated/pom.xml b/sonar-deprecated/pom.xml index 2ea6182a26e..79797b29eb8 100644 --- a/sonar-deprecated/pom.xml +++ b/sonar-deprecated/pom.xml @@ -7,7 +7,7 @@ <version>3.7-SNAPSHOT</version> </parent> <artifactId>sonar-deprecated</artifactId> - <name>Sonar :: Deprecated</name> + <name>SonarQube :: Deprecated</name> <dependencies> <dependency> diff --git a/sonar-duplications/pom.xml b/sonar-duplications/pom.xml index 7ccbbc19962..5f1e1b09cf5 100644 --- a/sonar-duplications/pom.xml +++ b/sonar-duplications/pom.xml @@ -9,7 +9,7 @@ <artifactId>sonar-duplications</artifactId> - <name>Sonar :: Duplications</name> + <name>SonarQube :: Duplications</name> <description>Detect duplicated code</description> <properties> diff --git a/sonar-graph/pom.xml b/sonar-graph/pom.xml index f93bea38037..84594f0c540 100644 --- a/sonar-graph/pom.xml +++ b/sonar-graph/pom.xml @@ -10,7 +10,7 @@ <groupId>org.codehaus.sonar</groupId> <artifactId>sonar-graph</artifactId> <packaging>jar</packaging> - <name>Sonar :: Graph</name> + <name>SonarQube :: Graph</name> <dependencies> <dependency> @@ -37,4 +37,4 @@ <scope>test</scope> </dependency> </dependencies> -</project>
\ No newline at end of file +</project> diff --git a/sonar-home/pom.xml b/sonar-home/pom.xml index 32d2528f92c..6772e786cd6 100644 --- a/sonar-home/pom.xml +++ b/sonar-home/pom.xml @@ -10,7 +10,7 @@ <artifactId>sonar-home</artifactId> - <name>Sonar :: Home</name> + <name>SonarQube :: Home</name> <description>Access the user home directory that contains cache of files</description> <dependencies> diff --git a/sonar-java-api/pom.xml b/sonar-java-api/pom.xml index 060ef6845e8..05a7cf938d1 100644 --- a/sonar-java-api/pom.xml +++ b/sonar-java-api/pom.xml @@ -7,7 +7,7 @@ <version>3.7-SNAPSHOT</version> </parent> <artifactId>sonar-java-api</artifactId> - <name>Sonar :: Java API</name> + <name>SonarQube :: Java API</name> <dependencies> <dependency> <groupId>org.codehaus.sonar</groupId> diff --git a/sonar-markdown/pom.xml b/sonar-markdown/pom.xml index 72ae9989f82..a026d2999e6 100644 --- a/sonar-markdown/pom.xml +++ b/sonar-markdown/pom.xml @@ -10,7 +10,7 @@ </parent> <artifactId>sonar-markdown</artifactId> - <name>Sonar :: Markdown</name> + <name>SonarQube :: Markdown</name> <dependencies> <dependency> diff --git a/sonar-maven-plugin/pom.xml b/sonar-maven-plugin/pom.xml index e6136ee79d8..f4cdd7cd1a1 100644 --- a/sonar-maven-plugin/pom.xml +++ b/sonar-maven-plugin/pom.xml @@ -8,7 +8,7 @@ </parent> <artifactId>sonar-maven-plugin</artifactId> <packaging>maven-plugin</packaging> - <name>Sonar :: Maven2 Plugin</name> + <name>SonarQube :: Maven2 Plugin</name> <dependencies> <dependency> diff --git a/sonar-maven3-plugin/pom.xml b/sonar-maven3-plugin/pom.xml index 18dd0a9c87e..260d14786ba 100644 --- a/sonar-maven3-plugin/pom.xml +++ b/sonar-maven3-plugin/pom.xml @@ -8,12 +8,12 @@ </parent> <artifactId>sonar-maven3-plugin</artifactId> <packaging>pom</packaging> - <name>Sonar :: Maven3 Plugin</name> + <name>SonarQube :: Maven3 Plugin</name> <!-- Since Sonar 3.7 there is no more difference between Maven 2 and Maven 3 so relocate to Maven 2 plugin to avoid duplication --> <distributionManagement> <relocation> <artifactId>sonar-maven-plugin</artifactId> </relocation> </distributionManagement> - + </project> diff --git a/sonar-plugin-api/pom.xml b/sonar-plugin-api/pom.xml index 24b72034824..2e1222b217a 100644 --- a/sonar-plugin-api/pom.xml +++ b/sonar-plugin-api/pom.xml @@ -11,7 +11,7 @@ <artifactId>sonar-plugin-api</artifactId> <packaging>jar</packaging> - <name>Sonar :: Plugin API</name> + <name>SonarQube :: Plugin API</name> <dependencies> <dependency> <groupId>org.codehaus.sonar</groupId> diff --git a/sonar-server/pom.xml b/sonar-server/pom.xml index bd83907bd0c..da94022292c 100644 --- a/sonar-server/pom.xml +++ b/sonar-server/pom.xml @@ -8,7 +8,7 @@ </parent> <artifactId>sonar-server</artifactId> <packaging>war</packaging> - <name>Sonar :: Server</name> + <name>SonarQube :: Server</name> <dependencies> <dependency> diff --git a/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerFileSystem.java b/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerFileSystem.java index c9eca01a0f6..7d2aa83476a 100644 --- a/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerFileSystem.java +++ b/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerFileSystem.java @@ -69,9 +69,9 @@ public class DefaultServerFileSystem implements ServerFileSystem { } public void start() { - LOGGER.info("Sonar home: " + homeDir.getAbsolutePath()); + LOGGER.info("SonarQube home: " + homeDir.getAbsolutePath()); if (!homeDir.isDirectory() || !homeDir.exists()) { - throw new IllegalStateException("Sonar home directory does not exist"); + throw new IllegalStateException("SonarQube home directory does not exist"); } if (deployDir == null) { diff --git a/sonar-server/src/main/java/org/sonar/server/platform/Platform.java b/sonar-server/src/main/java/org/sonar/server/platform/Platform.java index be04a975fb3..32a395d99eb 100644 --- a/sonar-server/src/main/java/org/sonar/server/platform/Platform.java +++ b/sonar-server/src/main/java/org/sonar/server/platform/Platform.java @@ -352,7 +352,7 @@ public final class Platform { started = false; profiler.stop(); } catch (Exception e) { - LoggerFactory.getLogger(getClass()).debug("Fail to stop Sonar - ignored", e); + LoggerFactory.getLogger(getClass()).debug("Fail to stop SonarQube - ignored", e); } } } diff --git a/sonar-server/src/main/java/org/sonar/server/platform/ServerImpl.java b/sonar-server/src/main/java/org/sonar/server/platform/ServerImpl.java index 5b8385e7eb6..cad0aa6aa19 100644 --- a/sonar-server/src/main/java/org/sonar/server/platform/ServerImpl.java +++ b/sonar-server/src/main/java/org/sonar/server/platform/ServerImpl.java @@ -66,10 +66,10 @@ public final class ServerImpl extends Server { implementationBuild = read(buildProperties).getProperty("Implementation-Build"); if (StringUtils.isBlank(version)) { - throw new IllegalStateException("Unknown Sonar version"); + throw new IllegalStateException("Unknown SonarQube version"); } - LOG.info("Sonar {}", Joiner.on(" / ").skipNulls().join("Server", version, implementationBuild)); + LOG.info("SonarQube {}", Joiner.on(" / ").skipNulls().join("Server", version, implementationBuild)); } catch (IOException e) { throw new IllegalStateException("Can not load metadata", e); diff --git a/sonar-server/src/main/java/org/sonar/server/platform/SonarHome.java b/sonar-server/src/main/java/org/sonar/server/platform/SonarHome.java index a6472e9d819..4d1b9de91bb 100644 --- a/sonar-server/src/main/java/org/sonar/server/platform/SonarHome.java +++ b/sonar-server/src/main/java/org/sonar/server/platform/SonarHome.java @@ -36,7 +36,7 @@ import java.util.Properties; * <li>environment variable SONAR_HOME</li> * <li>property SONAR_HOME in the file WEB-INF/classes/sonar-war.properties</li> * </ol> - * + * * @since 2.12 */ final class SonarHome { @@ -68,7 +68,7 @@ final class SonarHome { } if (StringUtils.isBlank(value)) { - throw new IllegalStateException("Sonar value is not defined. " + + throw new IllegalStateException("SonarQube value is not defined. " + "Please set the environment variable/system property " + PROPERTY + " or edit the file WEB-INF/classes/sonar-war.properties"); } diff --git a/sonar-server/src/main/java/org/sonar/server/plugins/PluginDeployer.java b/sonar-server/src/main/java/org/sonar/server/plugins/PluginDeployer.java index be8670d75fe..7a0f57f3d21 100644 --- a/sonar-server/src/main/java/org/sonar/server/plugins/PluginDeployer.java +++ b/sonar-server/src/main/java/org/sonar/server/plugins/PluginDeployer.java @@ -200,7 +200,7 @@ public class PluginDeployer implements ServerComponent { LOG.info("Deploy plugin {}", Joiner.on(" / ").skipNulls().join(plugin.getName(), plugin.getVersion(), plugin.getImplementationBuild())); Preconditions.checkState(plugin.isCompatibleWith(server.getVersion()), - "Plugin %s needs a more recent version of Sonar than %s. At least %s is expected", + "Plugin %s needs a more recent version of SonarQube than %s. At least %s is expected", plugin.getKey(), server.getVersion(), plugin.getSonarVersion()); try { diff --git a/sonar-server/src/test/java/org/sonar/server/platform/ServerImplTest.java b/sonar-server/src/test/java/org/sonar/server/platform/ServerImplTest.java index 5672dff78a3..8ce966eea36 100644 --- a/sonar-server/src/test/java/org/sonar/server/platform/ServerImplTest.java +++ b/sonar-server/src/test/java/org/sonar/server/platform/ServerImplTest.java @@ -69,7 +69,7 @@ public class ServerImplTest { @Test public void testFileWithNoVersion() { exception.expect(IllegalStateException.class); - exception.expectMessage("Unknown Sonar version"); + exception.expectMessage("Unknown SonarQube version"); ServerImpl server = new ServerImpl(new Settings(), "", "/org/sonar/server/platform/ServerImplTest/pom-without-version.properties"); server.start(); @@ -78,7 +78,7 @@ public class ServerImplTest { @Test public void testFileWithEmptyVersionParameter() { exception.expect(IllegalStateException.class); - exception.expectMessage("Unknown Sonar version"); + exception.expectMessage("Unknown SonarQube version"); ServerImpl server = new ServerImpl(new Settings(), "", "/org/sonar/server/platform/ServerImplTest/pom-with-empty-version.properties"); server.start(); @@ -87,7 +87,7 @@ public class ServerImplTest { @Test public void shouldFailIfFileNotFound() { exception.expect(IllegalStateException.class); - exception.expectMessage("Unknown Sonar version"); + exception.expectMessage("Unknown SonarQube version"); ServerImpl server = new ServerImpl(new Settings(), "", "/org/sonar/server/platform/ServerImplTest/unknown-file.properties"); server.start(); diff --git a/sonar-server/src/test/java/org/sonar/server/plugins/PluginDeployerTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/PluginDeployerTest.java index 4b7d9438071..956d0409c7b 100644 --- a/sonar-server/src/test/java/org/sonar/server/plugins/PluginDeployerTest.java +++ b/sonar-server/src/test/java/org/sonar/server/plugins/PluginDeployerTest.java @@ -109,7 +109,7 @@ public class PluginDeployerTest { when(server.getVersion()).thenReturn("2.0"); exception.expect(IllegalStateException.class); - exception.expectMessage("Plugin switchoffviolations needs a more recent version of Sonar than 2.0. At least 2.5 is expected"); + exception.expectMessage("Plugin switchoffviolations needs a more recent version of SonarQube than 2.0. At least 2.5 is expected"); deployer.start(); } diff --git a/sonar-squid/pom.xml b/sonar-squid/pom.xml index 8187b4121c7..cd4af5ab95e 100644 --- a/sonar-squid/pom.xml +++ b/sonar-squid/pom.xml @@ -10,7 +10,7 @@ <groupId>org.codehaus.sonar</groupId> <artifactId>sonar-squid</artifactId> <packaging>jar</packaging> - <name>Sonar :: Squid</name> + <name>SonarQube :: Squid</name> <dependencies> <dependency> @@ -74,4 +74,4 @@ </testResource> </testResources> </build> -</project>
\ No newline at end of file +</project> diff --git a/sonar-testing-harness/pom.xml b/sonar-testing-harness/pom.xml index da927026759..b1379db16c6 100644 --- a/sonar-testing-harness/pom.xml +++ b/sonar-testing-harness/pom.xml @@ -8,7 +8,7 @@ </parent> <artifactId>sonar-testing-harness</artifactId> <packaging>jar</packaging> - <name>Sonar :: Testing Harness</name> + <name>SonarQube :: Testing Harness</name> <dependencies> <dependency> @@ -30,7 +30,7 @@ <dependency> <groupId>xmlunit</groupId> <artifactId>xmlunit</artifactId> - </dependency> + </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> diff --git a/sonar-ws-client/pom.xml b/sonar-ws-client/pom.xml index 74640c69423..8731b6e0600 100644 --- a/sonar-ws-client/pom.xml +++ b/sonar-ws-client/pom.xml @@ -9,7 +9,7 @@ </parent> <artifactId>sonar-ws-client</artifactId> <packaging>jar</packaging> - <name>Sonar :: Web Service Client</name> + <name>SonarQube :: Web Service Client</name> <description>Java Client Library for Sonar Web Services</description> <properties> |