Fix location of sonar-application.jar

diff --git a/sonar-application/assembly.xml b/sonar-application/assembly.xml
index 07c014cb7ad90505d56b002dcdca1549062dfd34..bed1ebb79b4a75c21101faf7b6b07adacdd981dd 100644 (file)
--- a/sonar-application/assembly.xml
+++ b/sonar-application/assembly.xml
@@ -8,7 +8,7 @@
   <dependencySets>
     <!-- Libraries -->
     <dependencySet>
-      <outputDirectory>lib/server</outputDirectory>
+      <outputDirectory>lib</outputDirectory>
       <useTransitiveFiltering>true</useTransitiveFiltering>
       <excludes>
         <exclude>mysql:mysql-connector-java</exclude>

diff --git a/sonar-application/src/main/assembly/conf/wrapper.conf b/sonar-application/src/main/assembly/conf/wrapper.conf
index b1c547f16e4149625c6eeb99eb4a03051c7d1cac..19be89188ed94e5d96bc7b975aeb082350d748b8 100644 (file)
--- a/sonar-application/src/main/assembly/conf/wrapper.conf
+++ b/sonar-application/src/main/assembly/conf/wrapper.conf
@@ -31,7 +31,7 @@ wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
 
 # Java Classpath (include wrapper.jar)  Add class path elements as
 #  needed starting from 1
-wrapper.java.classpath.1=../../lib/server/*.jar
+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