From 5932476ce437e867b0d295c9ebd522219d76b924 Mon Sep 17 00:00:00 2001
From: Stephane Gamard <stephane.gamard@searchbox.com>
Date: Wed, 23 Jul 2014 14:31:31 +0200
Subject: [PATCH] SONAR-4898 - Moved JSW to lib/jsw (including conf)

---
 sonar-application/assembly.xml                | 10 +++++++-
 .../main/assembly/bin/linux-ppc-64/sonar.sh   |  2 +-
 .../main/assembly/bin/linux-x86-32/sonar.sh   |  2 +-
 .../main/assembly/bin/linux-x86-64/sonar.sh   |  2 +-
 .../assembly/bin/macosx-universal-64/sonar.sh |  2 +-
 .../assembly/bin/solaris-sparc-32/sonar.sh    |  2 +-
 .../assembly/bin/solaris-sparc-64/sonar.sh    |  2 +-
 .../main/assembly/bin/solaris-x86-32/sonar.sh |  2 +-
 .../bin/windows-x86-32/InstallNTService.bat   |  2 +-
 .../bin/windows-x86-32/StartNTService.bat     |  2 +-
 .../bin/windows-x86-32/StartSonar.bat         |  2 +-
 .../bin/windows-x86-32/StopNTService.bat      |  2 +-
 .../bin/windows-x86-32/UninstallNTService.bat |  2 +-
 .../bin/windows-x86-64/InstallNTService.bat   |  2 +-
 .../bin/windows-x86-64/StartNTService.bat     |  2 +-
 .../bin/windows-x86-64/StartSonar.bat         |  2 +-
 .../bin/windows-x86-64/StopNTService.bat      |  2 +-
 .../bin/windows-x86-64/UninstallNTService.bat |  2 +-
 .../assembly/{conf => lib/jsw}/wrapper.conf   | 25 +++++++++----------
 19 files changed, 38 insertions(+), 31 deletions(-)
 rename sonar-application/src/main/assembly/{conf => lib/jsw}/wrapper.conf (97%)

diff --git a/sonar-application/assembly.xml b/sonar-application/assembly.xml
index c897becdee0..e0166150ec8 100644
--- a/sonar-application/assembly.xml
+++ b/sonar-application/assembly.xml
@@ -7,7 +7,6 @@
   <includeBaseDirectory>true</includeBaseDirectory>
   <dependencySets>
     <!-- Libraries -->
-
     <dependencySet>
       <outputDirectory>lib</outputDirectory>
       <useTransitiveDependencies>false</useTransitiveDependencies>
@@ -15,6 +14,15 @@
       <useProjectArtifact>true</useProjectArtifact>
       <includes>
         <include>org.codehaus.sonar:sonar-application</include>
+      </includes>
+    </dependencySet>
+
+    <dependencySet>
+      <outputDirectory>lib/jsw</outputDirectory>
+      <useTransitiveDependencies>false</useTransitiveDependencies>
+      <useTransitiveFiltering>false</useTransitiveFiltering>
+      <useProjectArtifact>false</useProjectArtifact>
+      <includes>
         <include>tanukisoft:wrapper</include>
       </includes>
     </dependencySet>
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 9bb17e6cf3f..a9b8ce48677 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="../../conf/wrapper.conf"
+WRAPPER_CONF="../../lib/jsw/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 9bb17e6cf3f..a9b8ce48677 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="../../conf/wrapper.conf"
+WRAPPER_CONF="../../lib/jsw/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 9bb17e6cf3f..a9b8ce48677 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="../../conf/wrapper.conf"
+WRAPPER_CONF="../../lib/jsw/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 a22b20aa2da..3c359368b67 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="../../conf/wrapper.conf"
+WRAPPER_CONF="../../lib/jsw/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 a9ca30e4837..26a290eeef9 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="../../conf/wrapper.conf"
+WRAPPER_CONF="../../lib/jsw/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 a9ca30e4837..26a290eeef9 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="../../conf/wrapper.conf"
+WRAPPER_CONF="../../lib/jsw/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 9eaf20a1e0e..51dbc895756 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="../../conf/wrapper.conf"
+WRAPPER_CONF="../../lib/jsw/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/windows-x86-32/InstallNTService.bat b/sonar-application/src/main/assembly/bin/windows-x86-32/InstallNTService.bat
index 1285156c340..edf14494d43 100755
--- a/sonar-application/src/main/assembly/bin/windows-x86-32/InstallNTService.bat
+++ b/sonar-application/src/main/assembly/bin/windows-x86-32/InstallNTService.bat
@@ -38,7 +38,7 @@ rem
 :conf
 set _WRAPPER_CONF="%~f1"
 if not %_WRAPPER_CONF%=="" goto startup
-set _WRAPPER_CONF="%_REALPATH%..\..\conf\wrapper.conf"
+set _WRAPPER_CONF="%_REALPATH%..\..\lib\jsw\wrapper.conf"
 
 rem
 rem Install the Wrapper as an NT service.
diff --git a/sonar-application/src/main/assembly/bin/windows-x86-32/StartNTService.bat b/sonar-application/src/main/assembly/bin/windows-x86-32/StartNTService.bat
index a8bc27a062f..2ddf7481d3d 100755
--- a/sonar-application/src/main/assembly/bin/windows-x86-32/StartNTService.bat
+++ b/sonar-application/src/main/assembly/bin/windows-x86-32/StartNTService.bat
@@ -38,7 +38,7 @@ rem
 :conf
 set _WRAPPER_CONF="%~f1"
 if not %_WRAPPER_CONF%=="" goto startup
-set _WRAPPER_CONF="%_REALPATH%..\..\conf\wrapper.conf"
+set _WRAPPER_CONF="%_REALPATH%..\..\lib\jsw\wrapper.conf"
 
 rem
 rem Start the Wrapper NT service.
diff --git a/sonar-application/src/main/assembly/bin/windows-x86-32/StartSonar.bat b/sonar-application/src/main/assembly/bin/windows-x86-32/StartSonar.bat
index 8a5c96f1dd7..213ff9fddef 100755
--- a/sonar-application/src/main/assembly/bin/windows-x86-32/StartSonar.bat
+++ b/sonar-application/src/main/assembly/bin/windows-x86-32/StartSonar.bat
@@ -43,7 +43,7 @@ rem
 :conf
 set _WRAPPER_CONF="%~f1"
 if not %_WRAPPER_CONF%=="" goto startup
-set _WRAPPER_CONF="%_REALPATH%..\..\conf\wrapper.conf"
+set _WRAPPER_CONF="%_REALPATH%..\..\lib\jsw\wrapper.conf"
 
 rem
 rem Start the Wrapper
diff --git a/sonar-application/src/main/assembly/bin/windows-x86-32/StopNTService.bat b/sonar-application/src/main/assembly/bin/windows-x86-32/StopNTService.bat
index bf4b3ef4d38..2f219461499 100755
--- a/sonar-application/src/main/assembly/bin/windows-x86-32/StopNTService.bat
+++ b/sonar-application/src/main/assembly/bin/windows-x86-32/StopNTService.bat
@@ -38,7 +38,7 @@ rem
 :conf
 set _WRAPPER_CONF="%~f1"
 if not %_WRAPPER_CONF%=="" goto startup
-set _WRAPPER_CONF="%_REALPATH%..\..\conf\wrapper.conf"
+set _WRAPPER_CONF="%_REALPATH%..\..\lib\jsw\wrapper.conf"
 
 rem
 rem Stop the Wrapper NT service.
diff --git a/sonar-application/src/main/assembly/bin/windows-x86-32/UninstallNTService.bat b/sonar-application/src/main/assembly/bin/windows-x86-32/UninstallNTService.bat
index fd872824e96..75c8ad33361 100755
--- a/sonar-application/src/main/assembly/bin/windows-x86-32/UninstallNTService.bat
+++ b/sonar-application/src/main/assembly/bin/windows-x86-32/UninstallNTService.bat
@@ -38,7 +38,7 @@ rem
 :conf
 set _WRAPPER_CONF="%~f1"
 if not %_WRAPPER_CONF%=="" goto startup
-set _WRAPPER_CONF="%_REALPATH%..\..\conf\wrapper.conf"
+set _WRAPPER_CONF="%_REALPATH%..\..\lib\jsw\wrapper.conf"
 
 rem
 rem Uninstall the Wrapper as an NT service.
diff --git a/sonar-application/src/main/assembly/bin/windows-x86-64/InstallNTService.bat b/sonar-application/src/main/assembly/bin/windows-x86-64/InstallNTService.bat
index 1285156c340..edf14494d43 100755
--- a/sonar-application/src/main/assembly/bin/windows-x86-64/InstallNTService.bat
+++ b/sonar-application/src/main/assembly/bin/windows-x86-64/InstallNTService.bat
@@ -38,7 +38,7 @@ rem
 :conf
 set _WRAPPER_CONF="%~f1"
 if not %_WRAPPER_CONF%=="" goto startup
-set _WRAPPER_CONF="%_REALPATH%..\..\conf\wrapper.conf"
+set _WRAPPER_CONF="%_REALPATH%..\..\lib\jsw\wrapper.conf"
 
 rem
 rem Install the Wrapper as an NT service.
diff --git a/sonar-application/src/main/assembly/bin/windows-x86-64/StartNTService.bat b/sonar-application/src/main/assembly/bin/windows-x86-64/StartNTService.bat
index a8bc27a062f..2ddf7481d3d 100755
--- a/sonar-application/src/main/assembly/bin/windows-x86-64/StartNTService.bat
+++ b/sonar-application/src/main/assembly/bin/windows-x86-64/StartNTService.bat
@@ -38,7 +38,7 @@ rem
 :conf
 set _WRAPPER_CONF="%~f1"
 if not %_WRAPPER_CONF%=="" goto startup
-set _WRAPPER_CONF="%_REALPATH%..\..\conf\wrapper.conf"
+set _WRAPPER_CONF="%_REALPATH%..\..\lib\jsw\wrapper.conf"
 
 rem
 rem Start the Wrapper NT service.
diff --git a/sonar-application/src/main/assembly/bin/windows-x86-64/StartSonar.bat b/sonar-application/src/main/assembly/bin/windows-x86-64/StartSonar.bat
index 8a5c96f1dd7..213ff9fddef 100755
--- a/sonar-application/src/main/assembly/bin/windows-x86-64/StartSonar.bat
+++ b/sonar-application/src/main/assembly/bin/windows-x86-64/StartSonar.bat
@@ -43,7 +43,7 @@ rem
 :conf
 set _WRAPPER_CONF="%~f1"
 if not %_WRAPPER_CONF%=="" goto startup
-set _WRAPPER_CONF="%_REALPATH%..\..\conf\wrapper.conf"
+set _WRAPPER_CONF="%_REALPATH%..\..\lib\jsw\wrapper.conf"
 
 rem
 rem Start the Wrapper
diff --git a/sonar-application/src/main/assembly/bin/windows-x86-64/StopNTService.bat b/sonar-application/src/main/assembly/bin/windows-x86-64/StopNTService.bat
index bf4b3ef4d38..2f219461499 100755
--- a/sonar-application/src/main/assembly/bin/windows-x86-64/StopNTService.bat
+++ b/sonar-application/src/main/assembly/bin/windows-x86-64/StopNTService.bat
@@ -38,7 +38,7 @@ rem
 :conf
 set _WRAPPER_CONF="%~f1"
 if not %_WRAPPER_CONF%=="" goto startup
-set _WRAPPER_CONF="%_REALPATH%..\..\conf\wrapper.conf"
+set _WRAPPER_CONF="%_REALPATH%..\..\lib\jsw\wrapper.conf"
 
 rem
 rem Stop the Wrapper NT service.
diff --git a/sonar-application/src/main/assembly/bin/windows-x86-64/UninstallNTService.bat b/sonar-application/src/main/assembly/bin/windows-x86-64/UninstallNTService.bat
index fd872824e96..75c8ad33361 100755
--- a/sonar-application/src/main/assembly/bin/windows-x86-64/UninstallNTService.bat
+++ b/sonar-application/src/main/assembly/bin/windows-x86-64/UninstallNTService.bat
@@ -38,7 +38,7 @@ rem
 :conf
 set _WRAPPER_CONF="%~f1"
 if not %_WRAPPER_CONF%=="" goto startup
-set _WRAPPER_CONF="%_REALPATH%..\..\conf\wrapper.conf"
+set _WRAPPER_CONF="%_REALPATH%..\..\lib\jsw\wrapper.conf"
 
 rem
 rem Uninstall the Wrapper as an NT service.
diff --git a/sonar-application/src/main/assembly/conf/wrapper.conf b/sonar-application/src/main/assembly/lib/jsw/wrapper.conf
similarity index 97%
rename from sonar-application/src/main/assembly/conf/wrapper.conf
rename to sonar-application/src/main/assembly/lib/jsw/wrapper.conf
index b8e4842a9cc..922f9afec75 100644
--- a/sonar-application/src/main/assembly/conf/wrapper.conf
+++ b/sonar-application/src/main/assembly/lib/jsw/wrapper.conf
@@ -1,9 +1,10 @@
 #********************************************************************
-# Forking Properties
+# Wrapper Java Properties
 #********************************************************************
-wrapper.disable_restarts=TRUE
-wrapper.shutdown.timeout=30
-wrapper.jvm_exit.timeout=30
+# JVM
+# Can be an absolute path, for example:
+#wrapper.java.command=/path/to/my/jdk/bin/java
+wrapper.java.command=java
 
 # Java Additional Parameters
 wrapper.java.additional.1=-Xmx16m
@@ -11,14 +12,6 @@ wrapper.java.additional.1=-Xmx16m
 # Initial JVM heap size (in MB)
 wrapper.java.initmemory=16
 
-#********************************************************************
-# Wrapper Java Properties
-#********************************************************************
-# JVM
-# Can be an absolute path, for example:
-#wrapper.java.command=/path/to/my/jdk/bin/java
-wrapper.java.command=java
-
 # 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
@@ -28,7 +21,8 @@ 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/common/*.jar
-wrapper.java.classpath.2=../../lib/*.jar
+wrapper.java.classpath.2=../../lib/jsw/*.jar
+wrapper.java.classpath.3=../../lib/*.jar
 
 # Java Library Path (location of Wrapper.DLL or libwrapper.so)
 wrapper.java.library.path.1=./lib
@@ -107,4 +101,9 @@ wrapper.ntservice.starttype=AUTO_START
 wrapper.ntservice.interactive=false
 
 #********************************************************************
+# Forking Properties
+#********************************************************************
+wrapper.disable_restarts=TRUE
+wrapper.shutdown.timeout=30
+wrapper.jvm_exit.timeout=30
 wrapper.ping.timeout=0
-- 
2.39.5