From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Tue, 1 Oct 2013 15:51:39 +0000 (+0200)
Subject: SONAR-4675 temporarily fix integration tests
X-Git-Tag: 4.0~262
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=98c5f3e51ce74a98fd70b7c6855b637371e7371d;p=sonarqube.git

SONAR-4675 temporarily fix integration tests
---

diff --git a/sonar-application/src/main/assembly/conf/wrapper.conf b/sonar-application/src/main/assembly/conf/wrapper.conf
index b12d3701bc7..e771ed6c5d4 100644
--- a/sonar-application/src/main/assembly/conf/wrapper.conf
+++ b/sonar-application/src/main/assembly/conf/wrapper.conf
@@ -33,10 +33,15 @@ wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
 #  needed starting from 1
 wrapper.java.classpath.1=../../lib/*.jar
 wrapper.java.classpath.2=../../conf
-wrapper.java.classpath.3=../../extensions/jdbc-driver/mysql/*.jar
-wrapper.java.classpath.4=../../extensions/jdbc-driver/oracle/*.jar
-wrapper.java.classpath.5=../../extensions/jdbc-driver/postgresql/*.jar
-wrapper.java.classpath.6=../../extensions/jdbc-driver/mssql/*.jar
+wrapper.java.classpath.3=../../extensions/jdbc-driver/h2/*.jar
+wrapper.java.classpath.4=../../extensions/jdbc-driver/mysql/*.jar
+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 53f25a9b8d7..01028014afd 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("/sonar.properties").toURI()));
+    this(new File(Env.class.getResource("/conf/sonar.properties").toURI()));
   }
 
   File rootDir() {