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 edf14494d4366435b7fb0d5231da6bffdff9ac13..1285156c3404bdaf384f8dcc266d36ca381dadef 100755 (executable)
--- 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 2ddf7481d3d452e741752b96bc08412a571f69f6..a8bc27a062f53bbc055577f7670e9d4d44a140b3 100755 (executable)
--- 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 213ff9fddefb782070c2c87c0dc7047522460ade..8a5c96f1dd7297e41bcd0089a1e545cd4eabb8f1 100755 (executable)
--- 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 2f2194614993066b0e1b82818dec8c16efe706cc..bf4b3ef4d38f6c2c9286d27758fc9f61b9b6b9ad 100755 (executable)
--- 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 75c8ad33361c8a2e8ffd767f2e0443d71fdc9f1e..fd872824e962342a4ce5d18a0df77a6a0dd1d099 100755 (executable)
--- 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 edf14494d4366435b7fb0d5231da6bffdff9ac13..1285156c3404bdaf384f8dcc266d36ca381dadef 100755 (executable)
--- 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 2ddf7481d3d452e741752b96bc08412a571f69f6..a8bc27a062f53bbc055577f7670e9d4d44a140b3 100755 (executable)
--- 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 213ff9fddefb782070c2c87c0dc7047522460ade..8a5c96f1dd7297e41bcd0089a1e545cd4eabb8f1 100755 (executable)
--- 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 2f2194614993066b0e1b82818dec8c16efe706cc..bf4b3ef4d38f6c2c9286d27758fc9f61b9b6b9ad 100755 (executable)
--- 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 75c8ad33361c8a2e8ffd767f2e0443d71fdc9f1e..fd872824e962342a4ce5d18a0df77a6a0dd1d099 100755 (executable)
--- 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.