aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-application
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@gmail.com>2014-03-15 22:57:10 +0100
committerSimon Brandhof <simon.brandhof@gmail.com>2014-03-15 22:57:10 +0100
commit533233be6eac1836cd367585bf5839154a998de2 (patch)
tree911625b6132bcd5b1c3db726d16106cb2de08f4c /sonar-application
parent14750560eb9581bce0c610f320256e1c08695341 (diff)
downloadsonarqube-533233be6eac1836cd367585bf5839154a998de2.tar.gz
sonarqube-533233be6eac1836cd367585bf5839154a998de2.zip
SONAR-4843 Rename the property sonar.web.dev to sonar.rails.dev
Diffstat (limited to 'sonar-application')
-rw-r--r--sonar-application/src/main/java/org/sonar/application/Webapp.java4
-rw-r--r--sonar-application/src/test/java/org/sonar/application/WebappTest.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/sonar-application/src/main/java/org/sonar/application/Webapp.java b/sonar-application/src/main/java/org/sonar/application/Webapp.java
index 223de97c025..cda49acd69e 100644
--- a/sonar-application/src/main/java/org/sonar/application/Webapp.java
+++ b/sonar-application/src/main/java/org/sonar/application/Webapp.java
@@ -57,10 +57,10 @@ class Webapp {
}
static void configureRailsMode(Props props, Context context) {
- if (props.booleanOf("sonar.web.dev")) {
+ if (props.booleanOf("sonar.rails.dev")) {
context.addParameter(RAILS_ENV, "development");
context.addParameter(JRUBY_MAX_RUNTIMES, "3");
- LoggerFactory.getLogger(Webapp.class).warn("\n\n\n------ DEVELOPMENT MODE IS ENABLED ------\n\n\n");
+ LoggerFactory.getLogger(Webapp.class).warn("\n\n\n------ RAILS DEVELOPMENT MODE IS ENABLED ------\n\n\n");
} else {
context.addParameter(RAILS_ENV, "production");
context.addParameter(JRUBY_MAX_RUNTIMES, "1");
diff --git a/sonar-application/src/test/java/org/sonar/application/WebappTest.java b/sonar-application/src/test/java/org/sonar/application/WebappTest.java
index 82fdd5405d4..2ddb47b5460 100644
--- a/sonar-application/src/test/java/org/sonar/application/WebappTest.java
+++ b/sonar-application/src/test/java/org/sonar/application/WebappTest.java
@@ -70,7 +70,7 @@ public class WebappTest {
@Test
public void configure_dev_mode() throws Exception {
Props props = mock(Props.class);
- when(props.booleanOf("sonar.web.dev")).thenReturn(true);
+ when(props.booleanOf("sonar.rails.dev")).thenReturn(true);
Context context = mock(Context.class);
Webapp.configureRailsMode(props, context);
@@ -82,7 +82,7 @@ public class WebappTest {
@Test
public void configure_production_mode() throws Exception {
Props props = mock(Props.class);
- when(props.booleanOf("sonar.web.dev")).thenReturn(false);
+ when(props.booleanOf("sonar.rails.dev")).thenReturn(false);
Context context = mock(Context.class);
Webapp.configureRailsMode(props, context);