SONAR-8703 Remove internal setting "sonar.web.dev.sources"

diff --git a/server/sonar-server/src/main/java/org/sonar/server/app/TomcatContexts.java b/server/sonar-server/src/main/java/org/sonar/server/app/TomcatContexts.java
index f514c28cc091dff2902a4b47e686fff8b390c4d5..281bbf6fee2e07fbc523925e84f4860de189ba0a 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/app/TomcatContexts.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/app/TomcatContexts.java
@@ -28,12 +28,10 @@ import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.commons.io.FileUtils;
 import org.sonar.api.utils.MessageException;
-import org.sonar.api.utils.log.Loggers;
 import org.sonar.process.ProcessProperties;
 import org.sonar.process.Props;
 
 import static java.lang.String.format;
-import static org.apache.commons.lang.StringUtils.isEmpty;
 
 /**
  * Configures Tomcat contexts:
@@ -114,16 +112,8 @@ public class TomcatContexts {
     }
   }
 
-  static File webappDir(Props props) {
-    String devDir = props.value("sonar.web.dev.sources");
-    File dir;
-    if (isEmpty(devDir)) {
-      dir = new File(props.value(ProcessProperties.PATH_HOME), "web");
-    } else {
-      dir = new File(devDir);
-    }
-    Loggers.get(TomcatContexts.class).info("Webapp directory: {}", dir);
-    return dir;
+  private static File webappDir(Props props) {
+    return new File(props.value(ProcessProperties.PATH_HOME), "web");
   }
 
   static class Fs {

diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index 2ad69eff9b05487a14c164af890bb9b426853154..58be1973b885ecccb2a83e7be14fe08483fc9eba 100644 (file)
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -348,10 +348,6 @@
 # of plugins are deployed.
 #sonar.web.dev=false
 
-# Path to webapp sources for hot-reloading of Ruby on Rails, JS and CSS (only core,
-# plugins not supported).
-#sonar.web.dev.sources=/path/to/server/sonar-web/src/main/webapp
-
 # Elasticsearch HTTP connector, for example for KOPF:
 # http://lmenezes.com/elasticsearch-kopf/?location=http://localhost:9010
 #sonar.search.httpPort=-1