Working the assembly for packaging.

9 files changed, 33 insertions, 27 deletions

diff --git a/fork.sh b/fork.sh
index f2ee7459a96..e5a9237af30 100755
--- a/fork.sh
+++ b/fork.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-mvn clean install -DskipTests -Denforcer.skip=true $*
+mvn clean install -DskipTests -Denforcer.skip=true -pl server/sonar-process,sonar-application
 
 if [[ "$OSTYPE" == "darwin"* ]]; then
   OS='macosx-universal-64'
diff --git a/server/sonar-process/src/main/java/org/sonar/process/Process.java b/server/sonar-process/src/main/java/org/sonar/process/Process.java
index 045a5dcd0b9..d003bf153b9 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/Process.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/Process.java
@@ -188,6 +188,7 @@ public abstract class Process implements ProcessMXBean {
       }
     }
     LOGGER.trace("Process[{}]::terminate() END", name);
+    System.exit(1);
   }
 
   public final void terminate() {
diff --git a/server/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java b/server/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java
index 0f0f8ff2fd0..d2640f827b7 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java
@@ -157,7 +157,9 @@ public class ProcessWrapper extends Thread {
   private List<String> getClassPath() {
     // java specification : "multiple path entries are separated by semi-colons", not by
     // system file separator,
-    return ImmutableList.of("-cp", StringUtils.join(classPath, ";"));
+    String separator = System.getProperty("file.separator");
+
+    return ImmutableList.of("-cp", StringUtils.join(classPath, ":"));
   }
 
   private String getPropertyFile() {
diff --git a/server/sonar-search/pom.xml b/server/sonar-search/pom.xml
index f9803aa76a9..d57bfd61bd6 100644
--- a/server/sonar-search/pom.xml
+++ b/server/sonar-search/pom.xml
@@ -53,23 +53,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <finalName>${pom.artifactId}-${pom.version}</finalName>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/platform/logback.xml b/server/sonar-server/src/main/resources/org/sonar/server/platform/logback.xml
index a4a640e59b1..ddd8285d181 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/platform/logback.xml
+++ b/server/sonar-server/src/main/resources/org/sonar/server/platform/logback.xml
@@ -52,6 +52,8 @@
   <logger name="org.hibernate">
     <level value="WARN"/>
   </logger>
+    <level value="WARN"/>
+  </logger>
 
   <!-- Display SQL requests and results by setting the following loggers to level DEBUG -->
   <logger name="org.hibernate.SQL">
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);