diff options
Diffstat (limited to 'sonar-application/src')
| -rw-r--r-- | sonar-application/src/main/assembly/conf/wrapper.conf | 4 | ||||
| -rw-r--r-- | sonar-application/src/main/java/org/sonar/application/Env.java | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/sonar-application/src/main/assembly/conf/wrapper.conf b/sonar-application/src/main/assembly/conf/wrapper.conf index e771ed6c5d4..5dcff2c83cc 100644 --- a/sonar-application/src/main/assembly/conf/wrapper.conf +++ b/sonar-application/src/main/assembly/conf/wrapper.conf @@ -39,10 +39,6 @@ wrapper.java.classpath.5=../../extensions/jdbc-driver/oracle/*.jar wrapper.java.classpath.6=../../extensions/jdbc-driver/postgresql/*.jar wrapper.java.classpath.7=../../extensions/jdbc-driver/mssql/*.jar -# TODO to be removed in 4.0 -wrapper.java.classpath.8=../.. - - # Java Library Path (location of Wrapper.DLL or libwrapper.so) wrapper.java.library.path.1=./lib 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 01028014afd..53f25a9b8d7 100644 --- a/sonar-application/src/main/java/org/sonar/application/Env.java +++ b/sonar-application/src/main/java/org/sonar/application/Env.java @@ -34,7 +34,7 @@ class Env { } Env() throws URISyntaxException { - this(new File(Env.class.getResource("/conf/sonar.properties").toURI())); + this(new File(Env.class.getResource("/sonar.properties").toURI())); } File rootDir() { |