aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-application/src
diff options
context:
space:
mode:
Diffstat (limited to 'sonar-application/src')
-rw-r--r--sonar-application/src/main/assembly/conf/sonar.properties7
-rw-r--r--sonar-application/src/main/java/org/sonar/application/Connectors.java2
-rw-r--r--sonar-application/src/main/java/org/sonar/application/EmbeddedTomcat.java2
-rw-r--r--sonar-application/src/main/java/org/sonar/application/Env.java2
-rw-r--r--sonar-application/src/main/java/org/sonar/application/Logging.java2
-rw-r--r--sonar-application/src/main/java/org/sonar/application/NullJarScanner.java2
-rw-r--r--sonar-application/src/main/java/org/sonar/application/Props.java2
-rw-r--r--sonar-application/src/main/java/org/sonar/application/StartServer.java2
-rw-r--r--sonar-application/src/main/java/org/sonar/application/Webapp.java6
-rw-r--r--sonar-application/src/main/java/org/sonar/application/package-info.java2
-rw-r--r--sonar-application/src/test/java/org/sonar/application/ConnectorsTest.java2
-rw-r--r--sonar-application/src/test/java/org/sonar/application/EnvTest.java2
-rw-r--r--sonar-application/src/test/java/org/sonar/application/LoggingTest.java2
-rw-r--r--sonar-application/src/test/java/org/sonar/application/NullJarScannerTest.java2
-rw-r--r--sonar-application/src/test/java/org/sonar/application/PropsTest.java2
-rw-r--r--sonar-application/src/test/java/org/sonar/application/StartServerTest.java2
-rw-r--r--sonar-application/src/test/java/org/sonar/application/WebappTest.java6
17 files changed, 26 insertions, 21 deletions
diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index c9de3398980..07fb50c7c18 100644
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -187,7 +187,6 @@ sonar.jdbc.timeBetweenEvictionRunsMillis=30000
#http.proxyPassword=
-
#--------------------------------------------------------------------------------------------------
# NOTIFICATIONS
@@ -200,3 +199,9 @@ sonar.notifications.delay=60
#sonar.log.profilingLevel=NONE
+#--------------------------------------------------------------------------------------------------
+# DEVELOPMENT MODE
+# Only for debugging
+
+# Set to true to apply Ruby on Rails code changes on the fly
+#sonar.rails.dev=false
diff --git a/sonar-application/src/main/java/org/sonar/application/Connectors.java b/sonar-application/src/main/java/org/sonar/application/Connectors.java
index a6cfd1f0bb0..3011fc00f80 100644
--- a/sonar-application/src/main/java/org/sonar/application/Connectors.java
+++ b/sonar-application/src/main/java/org/sonar/application/Connectors.java
@@ -1,6 +1,6 @@
/*
* SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2013 SonarSource
+ * Copyright (C) 2008-2014 SonarSource
* mailto:contact AT sonarsource DOT com
*
* SonarQube is free software; you can redistribute it and/or
diff --git a/sonar-application/src/main/java/org/sonar/application/EmbeddedTomcat.java b/sonar-application/src/main/java/org/sonar/application/EmbeddedTomcat.java
index f20e6a3f8ad..ddb1efad898 100644
--- a/sonar-application/src/main/java/org/sonar/application/EmbeddedTomcat.java
+++ b/sonar-application/src/main/java/org/sonar/application/EmbeddedTomcat.java
@@ -1,6 +1,6 @@
/*
* SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2013 SonarSource
+ * Copyright (C) 2008-2014 SonarSource
* mailto:contact AT sonarsource DOT com
*
* SonarQube is free software; you can redistribute it and/or
diff --git a/sonar-application/src/main/java/org/sonar/application/Env.java b/sonar-application/src/main/java/org/sonar/application/Env.java
index 168664f0d0a..19861c7a1c5 100644
--- a/sonar-application/src/main/java/org/sonar/application/Env.java
+++ b/sonar-application/src/main/java/org/sonar/application/Env.java
@@ -1,6 +1,6 @@
/*
* SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2013 SonarSource
+ * Copyright (C) 2008-2014 SonarSource
* mailto:contact AT sonarsource DOT com
*
* SonarQube is free software; you can redistribute it and/or
diff --git a/sonar-application/src/main/java/org/sonar/application/Logging.java b/sonar-application/src/main/java/org/sonar/application/Logging.java
index 6cad075b6f5..1de67e61d77 100644
--- a/sonar-application/src/main/java/org/sonar/application/Logging.java
+++ b/sonar-application/src/main/java/org/sonar/application/Logging.java
@@ -1,6 +1,6 @@
/*
* SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2013 SonarSource
+ * Copyright (C) 2008-2014 SonarSource
* mailto:contact AT sonarsource DOT com
*
* SonarQube is free software; you can redistribute it and/or
diff --git a/sonar-application/src/main/java/org/sonar/application/NullJarScanner.java b/sonar-application/src/main/java/org/sonar/application/NullJarScanner.java
index 2f243649853..36c9f4c9597 100644
--- a/sonar-application/src/main/java/org/sonar/application/NullJarScanner.java
+++ b/sonar-application/src/main/java/org/sonar/application/NullJarScanner.java
@@ -1,6 +1,6 @@
/*
* SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2013 SonarSource
+ * Copyright (C) 2008-2014 SonarSource
* mailto:contact AT sonarsource DOT com
*
* SonarQube is free software; you can redistribute it and/or
diff --git a/sonar-application/src/main/java/org/sonar/application/Props.java b/sonar-application/src/main/java/org/sonar/application/Props.java
index 4e0bb6c3d20..7b33d918cc6 100644
--- a/sonar-application/src/main/java/org/sonar/application/Props.java
+++ b/sonar-application/src/main/java/org/sonar/application/Props.java
@@ -1,6 +1,6 @@
/*
* SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2013 SonarSource
+ * Copyright (C) 2008-2014 SonarSource
* mailto:contact AT sonarsource DOT com
*
* SonarQube is free software; you can redistribute it and/or
diff --git a/sonar-application/src/main/java/org/sonar/application/StartServer.java b/sonar-application/src/main/java/org/sonar/application/StartServer.java
index 98854426f88..0d1c8ef5093 100644
--- a/sonar-application/src/main/java/org/sonar/application/StartServer.java
+++ b/sonar-application/src/main/java/org/sonar/application/StartServer.java
@@ -1,6 +1,6 @@
/*
* SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2013 SonarSource
+ * Copyright (C) 2008-2014 SonarSource
* mailto:contact AT sonarsource DOT com
*
* SonarQube is free software; you can redistribute it and/or
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 387d79dbb3a..cda49acd69e 100644
--- a/sonar-application/src/main/java/org/sonar/application/Webapp.java
+++ b/sonar-application/src/main/java/org/sonar/application/Webapp.java
@@ -1,6 +1,6 @@
/*
* SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2013 SonarSource
+ * Copyright (C) 2008-2014 SonarSource
* mailto:contact AT sonarsource DOT com
*
* SonarQube is free software; you can redistribute it and/or
@@ -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/main/java/org/sonar/application/package-info.java b/sonar-application/src/main/java/org/sonar/application/package-info.java
index 009b187eda5..c9d7d130a4a 100644
--- a/sonar-application/src/main/java/org/sonar/application/package-info.java
+++ b/sonar-application/src/main/java/org/sonar/application/package-info.java
@@ -1,6 +1,6 @@
/*
* SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2013 SonarSource
+ * Copyright (C) 2008-2014 SonarSource
* mailto:contact AT sonarsource DOT com
*
* SonarQube is free software; you can redistribute it and/or
diff --git a/sonar-application/src/test/java/org/sonar/application/ConnectorsTest.java b/sonar-application/src/test/java/org/sonar/application/ConnectorsTest.java
index 20c2bfca4f9..c2ac054a808 100644
--- a/sonar-application/src/test/java/org/sonar/application/ConnectorsTest.java
+++ b/sonar-application/src/test/java/org/sonar/application/ConnectorsTest.java
@@ -1,6 +1,6 @@
/*
* SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2013 SonarSource
+ * Copyright (C) 2008-2014 SonarSource
* mailto:contact AT sonarsource DOT com
*
* SonarQube is free software; you can redistribute it and/or
diff --git a/sonar-application/src/test/java/org/sonar/application/EnvTest.java b/sonar-application/src/test/java/org/sonar/application/EnvTest.java
index 1400cc8f4ee..0ffc768a48d 100644
--- a/sonar-application/src/test/java/org/sonar/application/EnvTest.java
+++ b/sonar-application/src/test/java/org/sonar/application/EnvTest.java
@@ -1,6 +1,6 @@
/*
* SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2013 SonarSource
+ * Copyright (C) 2008-2014 SonarSource
* mailto:contact AT sonarsource DOT com
*
* SonarQube is free software; you can redistribute it and/or
diff --git a/sonar-application/src/test/java/org/sonar/application/LoggingTest.java b/sonar-application/src/test/java/org/sonar/application/LoggingTest.java
index fb63dff2637..1e5743daa33 100644
--- a/sonar-application/src/test/java/org/sonar/application/LoggingTest.java
+++ b/sonar-application/src/test/java/org/sonar/application/LoggingTest.java
@@ -1,6 +1,6 @@
/*
* SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2013 SonarSource
+ * Copyright (C) 2008-2014 SonarSource
* mailto:contact AT sonarsource DOT com
*
* SonarQube is free software; you can redistribute it and/or
diff --git a/sonar-application/src/test/java/org/sonar/application/NullJarScannerTest.java b/sonar-application/src/test/java/org/sonar/application/NullJarScannerTest.java
index 50e3a9a60d0..4654152b639 100644
--- a/sonar-application/src/test/java/org/sonar/application/NullJarScannerTest.java
+++ b/sonar-application/src/test/java/org/sonar/application/NullJarScannerTest.java
@@ -1,6 +1,6 @@
/*
* SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2013 SonarSource
+ * Copyright (C) 2008-2014 SonarSource
* mailto:contact AT sonarsource DOT com
*
* SonarQube is free software; you can redistribute it and/or
diff --git a/sonar-application/src/test/java/org/sonar/application/PropsTest.java b/sonar-application/src/test/java/org/sonar/application/PropsTest.java
index 20ca51e5161..92091740301 100644
--- a/sonar-application/src/test/java/org/sonar/application/PropsTest.java
+++ b/sonar-application/src/test/java/org/sonar/application/PropsTest.java
@@ -1,6 +1,6 @@
/*
* SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2013 SonarSource
+ * Copyright (C) 2008-2014 SonarSource
* mailto:contact AT sonarsource DOT com
*
* SonarQube is free software; you can redistribute it and/or
diff --git a/sonar-application/src/test/java/org/sonar/application/StartServerTest.java b/sonar-application/src/test/java/org/sonar/application/StartServerTest.java
index 590385d939a..56de4ab9a3d 100644
--- a/sonar-application/src/test/java/org/sonar/application/StartServerTest.java
+++ b/sonar-application/src/test/java/org/sonar/application/StartServerTest.java
@@ -1,6 +1,6 @@
/*
* SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2013 SonarSource
+ * Copyright (C) 2008-2014 SonarSource
* mailto:contact AT sonarsource DOT com
*
* SonarQube is free software; you can redistribute it and/or
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 1c57ed714dc..2ddb47b5460 100644
--- a/sonar-application/src/test/java/org/sonar/application/WebappTest.java
+++ b/sonar-application/src/test/java/org/sonar/application/WebappTest.java
@@ -1,6 +1,6 @@
/*
* SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2013 SonarSource
+ * Copyright (C) 2008-2014 SonarSource
* mailto:contact AT sonarsource DOT com
*
* SonarQube is free software; you can redistribute it and/or
@@ -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);