SONAR-4898 revert move of wrapper.conf

8 files changed, 22 insertions, 39 deletions

diff --git a/sonar-application/src/main/assembly/bin/linux-ppc-64/sonar.sh b/sonar-application/src/main/assembly/bin/linux-ppc-64/sonar.sh
index a9b8ce48677..9bb17e6cf3f 100755
--- a/sonar-application/src/main/assembly/bin/linux-ppc-64/sonar.sh
+++ b/sonar-application/src/main/assembly/bin/linux-ppc-64/sonar.sh
@@ -23,7 +23,7 @@ APP_LONG_NAME="${DEF_APP_LONG_NAME}"
 
 # Wrapper
 WRAPPER_CMD="./wrapper"
-WRAPPER_CONF="../../lib/jsw/wrapper.conf"
+WRAPPER_CONF="../../conf/wrapper.conf"
 
 # Priority at which to run the wrapper.  See "man nice" for valid priorities.
 #  nice is only used if a priority is specified.
diff --git a/sonar-application/src/main/assembly/bin/linux-x86-32/sonar.sh b/sonar-application/src/main/assembly/bin/linux-x86-32/sonar.sh
index a9b8ce48677..9bb17e6cf3f 100755
--- a/sonar-application/src/main/assembly/bin/linux-x86-32/sonar.sh
+++ b/sonar-application/src/main/assembly/bin/linux-x86-32/sonar.sh
@@ -23,7 +23,7 @@ APP_LONG_NAME="${DEF_APP_LONG_NAME}"
 
 # Wrapper
 WRAPPER_CMD="./wrapper"
-WRAPPER_CONF="../../lib/jsw/wrapper.conf"
+WRAPPER_CONF="../../conf/wrapper.conf"
 
 # Priority at which to run the wrapper.  See "man nice" for valid priorities.
 #  nice is only used if a priority is specified.
diff --git a/sonar-application/src/main/assembly/bin/linux-x86-64/sonar.sh b/sonar-application/src/main/assembly/bin/linux-x86-64/sonar.sh
index a9b8ce48677..9bb17e6cf3f 100755
--- a/sonar-application/src/main/assembly/bin/linux-x86-64/sonar.sh
+++ b/sonar-application/src/main/assembly/bin/linux-x86-64/sonar.sh
@@ -23,7 +23,7 @@ APP_LONG_NAME="${DEF_APP_LONG_NAME}"
 
 # Wrapper
 WRAPPER_CMD="./wrapper"
-WRAPPER_CONF="../../lib/jsw/wrapper.conf"
+WRAPPER_CONF="../../conf/wrapper.conf"
 
 # Priority at which to run the wrapper.  See "man nice" for valid priorities.
 #  nice is only used if a priority is specified.
diff --git a/sonar-application/src/main/assembly/bin/macosx-universal-64/sonar.sh b/sonar-application/src/main/assembly/bin/macosx-universal-64/sonar.sh
index 3c359368b67..a22b20aa2da 100755
--- a/sonar-application/src/main/assembly/bin/macosx-universal-64/sonar.sh
+++ b/sonar-application/src/main/assembly/bin/macosx-universal-64/sonar.sh
@@ -23,7 +23,7 @@ APP_LONG_NAME="${DEF_APP_LONG_NAME}"
 
 # Wrapper
 WRAPPER_CMD="./wrapper"
-WRAPPER_CONF="../../lib/jsw/wrapper.conf"
+WRAPPER_CONF="../../conf/wrapper.conf"
 
 # Priority at which to run the wrapper.  See "man nice" for valid priorities.
 #  nice is only used if a priority is specified.
diff --git a/sonar-application/src/main/assembly/bin/solaris-sparc-32/sonar.sh b/sonar-application/src/main/assembly/bin/solaris-sparc-32/sonar.sh
index 26a290eeef9..a9ca30e4837 100755
--- a/sonar-application/src/main/assembly/bin/solaris-sparc-32/sonar.sh
+++ b/sonar-application/src/main/assembly/bin/solaris-sparc-32/sonar.sh
@@ -23,7 +23,7 @@ APP_LONG_NAME="${DEF_APP_LONG_NAME}"
 
 # Wrapper
 WRAPPER_CMD="./wrapper"
-WRAPPER_CONF="../../lib/jsw/wrapper.conf"
+WRAPPER_CONF="../../conf/wrapper.conf"
 
 # Priority at which to run the wrapper.  See "man nice" for valid priorities.
 #  nice is only used if a priority is specified.
diff --git a/sonar-application/src/main/assembly/bin/solaris-sparc-64/sonar.sh b/sonar-application/src/main/assembly/bin/solaris-sparc-64/sonar.sh
index 26a290eeef9..a9ca30e4837 100755
--- a/sonar-application/src/main/assembly/bin/solaris-sparc-64/sonar.sh
+++ b/sonar-application/src/main/assembly/bin/solaris-sparc-64/sonar.sh
@@ -23,7 +23,7 @@ APP_LONG_NAME="${DEF_APP_LONG_NAME}"
 
 # Wrapper
 WRAPPER_CMD="./wrapper"
-WRAPPER_CONF="../../lib/jsw/wrapper.conf"
+WRAPPER_CONF="../../conf/wrapper.conf"
 
 # Priority at which to run the wrapper.  See "man nice" for valid priorities.
 #  nice is only used if a priority is specified.
diff --git a/sonar-application/src/main/assembly/bin/solaris-x86-32/sonar.sh b/sonar-application/src/main/assembly/bin/solaris-x86-32/sonar.sh
index 51dbc895756..9eaf20a1e0e 100755
--- a/sonar-application/src/main/assembly/bin/solaris-x86-32/sonar.sh
+++ b/sonar-application/src/main/assembly/bin/solaris-x86-32/sonar.sh
@@ -23,7 +23,7 @@ APP_LONG_NAME="${DEF_APP_LONG_NAME}"
 
 # Wrapper
 WRAPPER_CMD="./wrapper"
-WRAPPER_CONF="../../lib/jsw/wrapper.conf"
+WRAPPER_CONF="../../conf/wrapper.conf"
 
 # Priority at which to run the wrapper.  See "man nice" for valid priorities.
 #  nice is only used if a priority is specified.
diff --git a/sonar-application/src/main/assembly/lib/jsw/wrapper.conf b/sonar-application/src/main/assembly/conf/wrapper.conf
index 075cd1c5878..bb200e7161b 100644
--- a/sonar-application/src/main/assembly/lib/jsw/wrapper.conf
+++ b/sonar-application/src/main/assembly/conf/wrapper.conf
@@ -1,53 +1,35 @@
-#********************************************************************
-# Wrapper Java Properties
-#********************************************************************
-# JVM
+# Path to JVM executable. By default it must be available in PATH.
 # Can be an absolute path, for example:
 #wrapper.java.command=/path/to/my/jdk/bin/java
 wrapper.java.command=java
 
-# Xmx can't be set to lower value because of compatibility with Java 6
-wrapper.java.additional.1=-Xmx32m
-wrapper.java.additional.2=-Djava.awt.headless=true
 
-# Initial JVM heap size (in MB)
-wrapper.java.initmemory=16
+#
+# DO NOT EDIT THE FOLLOWING SECTIONS
+#
 
-# Java Main class.  This class must implement the WrapperListener interface
-#  or guarantee that the WrapperManager class is initialized.  Helper
-#  classes are provided to do this for you.  See the Integration section
-#  of the documentation for details.
-wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
 
-# Java Classpath (include wrapper.jar)  Add class path elements as
-#  needed starting from 1
+#********************************************************************
+# Wrapper Java
+#********************************************************************
+wrapper.java.additional.1=-Djava.awt.headless=true
+wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
 wrapper.java.classpath.1=../../lib/jsw/*.jar
 wrapper.java.classpath.2=../../lib/*.jar
-
-# Java Library Path (location of Wrapper.DLL or libwrapper.so)
 wrapper.java.library.path.1=./lib
-
-# Application parameters.  Add parameters as needed starting from 1
 wrapper.app.parameter.1=org.sonar.application.App
-
-wrapper.java.maxmemory=0
+wrapper.java.initmemory=3
+# Xmx can't be set to a lower value because of compatibility with Java 6
+wrapper.java.maxmemory=32
 
 #********************************************************************
-# Wrapper Logging Properties
+# Wrapper Logs
 #********************************************************************
-# Format of output for the console.  (See docs for formats)
-wrapper.console.format=PM
 
-# Log Level for console output.  (See docs for log levels)
+wrapper.console.format=PM
 wrapper.console.loglevel=INFO
-
-# Log file to use for wrapper output logging.
 wrapper.logfile=../../logs/application.log
-
-# Format of output for the log file.  (See docs for formats)
 wrapper.logfile.format=M
-
-# Log Level for log file output.  (See docs for log levels)
 wrapper.logfile.loglevel=INFO
 
 # Maximum size that the log file will be allowed to grow to before
@@ -103,3 +85,4 @@ wrapper.ntservice.interactive=false
 #********************************************************************
 wrapper.disable_restarts=TRUE
 wrapper.ping.timeout=0
+wrapper.shutdown.timeout=300