SONAR-4898 - updated wrapper.conf for start.jar

4 files changed, 67 insertions, 15 deletions

diff --git a/sonar-start/assembly.xml b/sonar-start/assembly.xml
index dfedd1a0959..dab0e16a623 100644
--- a/sonar-start/assembly.xml
+++ b/sonar-start/assembly.xml
@@ -36,6 +36,25 @@
       <unpack>true</unpack>
       <scope>provided</scope>
     </dependencySet>
+
+    <!-- Java Service Wrapper -->
+    <dependencySet>
+      <outputDirectory>bin</outputDirectory>
+      <includes>
+        <include>org.sonatype.jsw-binaries:jsw-binaries</include>
+      </includes>
+      <unpack>true</unpack>
+      <scope>provided</scope>
+      <unpackOptions>
+        <excludes>
+          <exclude>**/app</exclude>
+          <exclude>**/*.bat</exclude>
+          <exclude>**/sample*/**</exclude>
+          <exclude>**/macosx-universal-32/**</exclude>
+        </excludes>
+      </unpackOptions>
+      <fileMode>0755</fileMode>
+    </dependencySet>
   </dependencySets>
 
   <files>
diff --git a/sonar-start/pom.xml b/sonar-start/pom.xml
index 7ca99215740..174701a3a64 100644
--- a/sonar-start/pom.xml
+++ b/sonar-start/pom.xml
@@ -97,6 +97,22 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
+
+    <!-- JSW -->
+    <dependency>
+      <groupId>org.sonatype.jsw-binaries</groupId>
+      <artifactId>jsw-binaries</artifactId>
+      <version>3.2.3.6</version>
+      <type>tar.gz</type>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <!-- do not upgrade because of licensing change -->
+      <groupId>tanukisoft</groupId>
+      <artifactId>wrapper</artifactId>
+      <version>3.2.3</version>
+      <scope>runtime</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/sonar-start/src/main/assembly/conf/wrapper.conf b/sonar-start/src/main/assembly/conf/wrapper.conf
index 40c7d27729c..ece93aab890 100644
--- a/sonar-start/src/main/assembly/conf/wrapper.conf
+++ b/sonar-start/src/main/assembly/conf/wrapper.conf
@@ -1,19 +1,17 @@
+wrapper.working.dir=../../
+
 # Java Additional Parameters
 wrapper.java.additional.1=-Djava.awt.headless=true
-wrapper.java.additional.2=-XX:MaxPermSize=160m
-wrapper.java.additional.3=-XX:+HeapDumpOnOutOfMemoryError
-wrapper.java.additional.4=-Dfile.encoding=UTF-8
-wrapper.java.additional.5=-Djruby.management.enabled=false
 
 # Maximum amount of memory of Java VM
-wrapper.java.additional.6=-Xmx1024M
+wrapper.java.additional.6=-Xmx16M
 
 # RECOMMENDED : uncomment if Java Virtual Machine is a JDK but not a JRE. To know which JVM you use, execute
 # 'java -version'. JDK displays 'Server VM'.
 #wrapper.java.additional.7=-server
 
 # Initial JVM heap size (in MB)
-wrapper.java.initmemory=256
+wrapper.java.initmemory=16
 
 #********************************************************************
 # Wrapper Java Properties
@@ -31,15 +29,18 @@ 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.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.1=start.jar
 
 # Java Library Path (location of Wrapper.DLL or libwrapper.so)
-wrapper.java.library.path.1=./lib
+wrapper.java.library.path.1=bin/linux-ppc-64/lib
+wrapper.java.library.path.2=bin/linux-x86-64/lib
+wrapper.java.library.path.3=bin/linux-x86-32/lib
+wrapper.java.library.path.4=bin/macosx-universal-64/lib
+wrapper.java.library.path.5=bin/solaris-sparc-32/lib
+wrapper.java.library.path.6=bin/solaris-sparc-64/lib
+wrapper.java.library.path.7=bin/solaris-x86-32/lib
+wrapper.java.library.path.8=bin/windows-x86-32/lib
+wrapper.java.library.path.9=bin/windows-x86-64/lib
 
 # Application parameters.  Add parameters as needed starting from 1
 wrapper.app.parameter.1=org.sonar.start.StartServer
@@ -71,7 +72,7 @@ wrapper.console.format=PM
 wrapper.console.loglevel=INFO
 
 # Log file to use for wrapper output logging.
-wrapper.logfile=../../logs/sonar.log
+wrapper.logfile=logs/node.log
 
 # Format of output for the log file.  (See docs for formats)
 wrapper.logfile.format=M
@@ -129,4 +130,4 @@ wrapper.ntservice.interactive=false
 
 #********************************************************************
 # restart the process if CPU is heavily loaded during 240 seconds.
-wrapper.ping.timeout=240
+wrapper.ping.timeout=240
\ No newline at end of file
diff --git a/sonar-start/start.sh b/sonar-start/start.sh
new file mode 100755
index 00000000000..80bcb9094f4
--- /dev/null
+++ b/sonar-start/start.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  OS='macosx-universal-64'
+else
+  OS='linux-x86-64'
+fi
+
+cd target/
+if ! ls sonarqube-*/bin/$OS/sonar.sh &> /dev/null; then
+  unzip sonarqube-*.zip
+fi
+cd sonarqube-*
+bin/$OS/sonar.sh restart
+sleep 3
+tail -n1000 -f logs/sonar.log