diff options
Diffstat (limited to 'sonar-server')
8 files changed, 13 insertions, 13 deletions
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(); } |