Working the assembly for packaging.

4 files changed, 26 insertions, 6 deletions

diff --git a/sonar-application/assembly.xml b/sonar-application/assembly.xml
index 9769089b39b..bc4eed0b655 100644
--- a/sonar-application/assembly.xml
+++ b/sonar-application/assembly.xml
@@ -14,20 +14,35 @@
         <exclude>mysql:mysql-connector-java</exclude>
         <exclude>org.postgresql:postgresql</exclude>
         <exclude>net.sourceforge.jtds:jtds</exclude>
+        <exclude>tanukisoft:wrapper</exclude>
         <exclude>org.codehaus.sonar:sonar-search</exclude>
+        <exclude>org.codehaus.sonar:sonar-process</exclude>
         <exclude>org.codehaus.sonar:sonar-web</exclude>
         <exclude>org.codehaus.sonar.plugins:*</exclude>
         <exclude>org.codehaus.sonar-plugins.java:*</exclude>
         <exclude>org.codehaus.sonar:sonar-batch-maven-compat</exclude>
       </excludes>
     </dependencySet>
+
+
     <dependencySet>
       <outputDirectory>lib/search</outputDirectory>
-      <useTransitiveDependencies>true</useTransitiveDependencies>
-      <useTransitiveFiltering>false</useTransitiveFiltering>
-      <includes>
-        <include>org.codehaus.sonar:sonar-search</include>
-      </includes>
+      <useTransitiveFiltering>true</useTransitiveFiltering>
+      <outputDirectory>lib</outputDirectory>
+      <useTransitiveFiltering>true</useTransitiveFiltering>
+      <excludes>
+        <exclude>mysql:mysql-connector-java</exclude>
+        <exclude>org.postgresql:postgresql</exclude>
+        <exclude>net.sourceforge.jtds:jtds</exclude>
+        <exclude>tanukisoft:wrapper</exclude>
+        <exclude>org.codehaus.sonar:sonar-search</exclude>
+        <exclude>org.codehaus.sonar:sonar-process</exclude>
+        <exclude>org.codehaus.sonar:sonar-web</exclude>
+        <exclude>org.codehaus.sonar.plugins:*</exclude>
+        <exclude>org.codehaus.sonar-plugins.java:*</exclude>
+        <exclude>org.codehaus.sonar:sonar-batch-maven-compat</exclude>
+      </excludes>
+
     </dependencySet>
     <dependencySet>
       <outputDirectory>lib/batch</outputDirectory>
diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml
index 465c9b5902f..85255196142 100644
--- a/sonar-application/pom.xml
+++ b/sonar-application/pom.xml
@@ -91,6 +91,7 @@
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
+
     <dependency>
       <groupId>org.codehaus.sonar</groupId>
       <artifactId>sonar-web</artifactId>
diff --git a/sonar-application/src/main/assembly/conf/wrapper.conf b/sonar-application/src/main/assembly/conf/wrapper.conf
index 043748ead08..0bd63d41d28 100644
--- a/sonar-application/src/main/assembly/conf/wrapper.conf
+++ b/sonar-application/src/main/assembly/conf/wrapper.conf
@@ -31,7 +31,9 @@ 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/*.jar
+wrapper.java.classpath.1=../../lib/proc/*.jar
+wrapper.java.classpath.2=../../lib/jsw/*.jar
+wrapper.java.classpath.3=../../lib/*.jar
 
 
 # Java Library Path (location of Wrapper.DLL or libwrapper.so)
diff --git a/sonar-application/src/main/java/org/sonar/application/ForkProcesses.java b/sonar-application/src/main/java/org/sonar/application/ForkProcesses.java
index de46a32c8fe..9329dfffbf4 100644
--- a/sonar-application/src/main/java/org/sonar/application/ForkProcesses.java
+++ b/sonar-application/src/main/java/org/sonar/application/ForkProcesses.java
@@ -64,6 +64,7 @@ public class ForkProcesses {
       "org.sonar.search.ElasticSearch",
       installation.props(),
       "ES",
+      installation.starPath("lib/proc"),
       installation.starPath("lib/search"));
     monitor.registerProcess(elasticsearch);
 
@@ -74,6 +75,7 @@ public class ForkProcesses {
       "org.sonar.server.app.ServerProcess",
       installation.props(),
       "SQ",
+      installation.starPath("lib/proc"),
       installation.starPath("lib"));
     monitor.registerProcess(server);