From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Wed, 6 Aug 2014 10:04:10 +0000 (+0200)
Subject: SONAR-4898 revert move of wrapper.conf - forgot MSWindows and its backslashes...
X-Git-Tag: 4.5-RC1~239
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5f83fff8d7517983b04f6f3b0ae8e5828fdb4fe7;p=sonarqube.git

SONAR-4898 revert move of wrapper.conf - forgot MSWindows and its backslashes...
---

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 edf14494d43..1285156c340 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%..\..\lib\jsw\wrapper.conf"
+set _WRAPPER_CONF="%_REALPATH%..\..\conf\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 2ddf7481d3d..a8bc27a062f 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%..\..\lib\jsw\wrapper.conf"
+set _WRAPPER_CONF="%_REALPATH%..\..\conf\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 213ff9fddef..8a5c96f1dd7 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%..\..\lib\jsw\wrapper.conf"
+set _WRAPPER_CONF="%_REALPATH%..\..\conf\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 2f219461499..bf4b3ef4d38 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%..\..\lib\jsw\wrapper.conf"
+set _WRAPPER_CONF="%_REALPATH%..\..\conf\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 75c8ad33361..fd872824e96 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%..\..\lib\jsw\wrapper.conf"
+set _WRAPPER_CONF="%_REALPATH%..\..\conf\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 edf14494d43..1285156c340 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%..\..\lib\jsw\wrapper.conf"
+set _WRAPPER_CONF="%_REALPATH%..\..\conf\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 2ddf7481d3d..a8bc27a062f 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%..\..\lib\jsw\wrapper.conf"
+set _WRAPPER_CONF="%_REALPATH%..\..\conf\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 213ff9fddef..8a5c96f1dd7 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%..\..\lib\jsw\wrapper.conf"
+set _WRAPPER_CONF="%_REALPATH%..\..\conf\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 2f219461499..bf4b3ef4d38 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%..\..\lib\jsw\wrapper.conf"
+set _WRAPPER_CONF="%_REALPATH%..\..\conf\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 75c8ad33361..fd872824e96 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%..\..\lib\jsw\wrapper.conf"
+set _WRAPPER_CONF="%_REALPATH%..\..\conf\wrapper.conf"
 
 rem
 rem Uninstall the Wrapper as an NT service.