SONAR-17224 Fix WinSW not reading environment variable

diff --git a/server/sonar-docs/src/pages/setup/operate-server.md b/server/sonar-docs/src/pages/setup/operate-server.md
index 68b50ea8f7ab9d0069a923032fdf1f6d1b38cdaf..9accf9d85db241f702f30810bc91d0e21bbfdd35 100644 (file)
--- a/server/sonar-docs/src/pages/setup/operate-server.md
+++ b/server/sonar-docs/src/pages/setup/operate-server.md
@@ -4,7 +4,6 @@ url: /setup/operate-server/
 ---
 
 ## Running SonarQube as a Service on Windows
-
 ### Install or Uninstall SonarQube as a Service
 
 ```

diff --git a/sonar-application/build.gradle b/sonar-application/build.gradle
index e2e6e4e40b785ea3051b2921254526f207818e0d..9dcb231115140c43f41941faa76f524140a3a446 100644 (file)
--- a/sonar-application/build.gradle
+++ b/sonar-application/build.gradle
@@ -140,7 +140,7 @@ task zip(type: Zip, dependsOn: [configurations.compileClasspath, tasks.downloadL
     }
     from(file('src/main/assembly')) {
       exclude 'conf/sonar.properties'
-      exclude 'bin/windows-x86-64/lib/SonarServiceWrapper.xml'
+      exclude 'bin/windows-x86-64/lib/SonarServiceWrapperTemplate.xml'
       exclude 'bin/windows-x86-64/StartSonar.bat'
       exclude 'elasticsearch-patch'
       exclude 'bin/linux-x86-64/sonar.sh'
@@ -246,7 +246,7 @@ task zip(type: Zip, dependsOn: [configurations.compileClasspath, tasks.downloadL
   }
 
   into("${archiveDir}/bin/windows-x86-64/lib/") {
-    from file('src/main/assembly/bin/windows-x86-64/lib/SonarServiceWrapper.xml')
+    from file('src/main/assembly/bin/windows-x86-64/lib/SonarServiceWrapperTemplate.xml')
     filter(ReplaceTokens, tokens: [
             'sqversion': version
     ])

diff --git a/sonar-application/src/main/assembly/bin/windows-x86-64/SonarService.bat b/sonar-application/src/main/assembly/bin/windows-x86-64/SonarService.bat
index 1df5e2cf027f5f3b79f1a7d3b1ec068b0e2334b6..ae7fb2672d6c98a3438b99d6ade3f51bb9c4aae1 100644 (file)
--- a/sonar-application/src/main/assembly/bin/windows-x86-64/SonarService.bat
+++ b/sonar-application/src/main/assembly/bin/windows-x86-64/SonarService.bat
@@ -25,6 +25,8 @@ set REALPATH=%~dp0
 rem check if Java is found
 set JAVA_EXE=
 call "%REALPATH%lib\find_java.bat" set_java_exe FAIL || goto:eof
+rem replace JAVA_EXE with the Java path in configuration file
+powershell -Command "(Get-Content %REALPATH%lib\SonarServiceWrapperTemplate.xml) -replace 'JAVA_EXE', '%JAVA_EXE%' | Out-File -encoding ASCII %REALPATH%lib\SonarServiceWrapper.xml"
 
 rem call the SonarServiceWrapper.exe passing all the parameters
 "%REALPATH%lib\SonarServiceWrapper.exe" %*

diff --git a/sonar-application/src/main/assembly/bin/windows-x86-64/lib/SonarServiceWrapper.xml b/sonar-application/src/main/assembly/bin/windows-x86-64/lib/SonarServiceWrapper.xml
deleted file mode 100644 (file)
index ec836f3..0000000
--- a/sonar-application/src/main/assembly/bin/windows-x86-64/lib/SonarServiceWrapper.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-  ~ SonarQube
-  ~ Copyright (C) 2009-2022 SonarSource SA
-  ~ mailto:info AT sonarsource DOT com
-  ~
-  ~ This program is free software; you can redistribute it and/or
-  ~ modify it under the terms of the GNU Lesser General Public
-  ~ License as published by the Free Software Foundation; either
-  ~ version 3 of the License, or (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public License
-  ~ along with this program; if not, write to the Free Software Foundation,
-  ~ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-  -->
-
-<service>
-  <!-- Path to the Java executable -->
-  <executable>%JAVA_EXE%</executable>
-
-  <!-- DO NOT EDIT THE FOLLOWING SECTIONS -->
-  <arguments>
-    -Xms8m -Xmx32m
-    -Djava.awt.headless=true
-    --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED
-    --add-opens=java.base/java.lang=ALL-UNNAMED
-    --add-opens=java.base/java.nio=ALL-UNNAMED
-    --add-opens=java.base/sun.nio.ch=ALL-UNNAMED
-    --add-opens=java.management/sun.management=ALL-UNNAMED
-    --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED
-    -cp "..\..\..\lib\sonar-application-@sqversion@.jar" "org.sonar.application.App"
-  </arguments>
-
-  <id>SonarQube</id>
-  <name>SonarQube</name>
-  <description>SonarQube</description>
-
-  <logpath>../../../logs</logpath>
-  <log mode="none"/>
-
-</service>
\ No newline at end of file

diff --git a/sonar-application/src/main/assembly/bin/windows-x86-64/lib/SonarServiceWrapperTemplate.xml b/sonar-application/src/main/assembly/bin/windows-x86-64/lib/SonarServiceWrapperTemplate.xml
new file mode 100644 (file)
index 0000000..4393007
--- /dev/null
+++ b/sonar-application/src/main/assembly/bin/windows-x86-64/lib/SonarServiceWrapperTemplate.xml
@@ -0,0 +1,45 @@
+<!--
+  ~ SonarQube
+  ~ Copyright (C) 2009-2022 SonarSource SA
+  ~ mailto:info AT sonarsource DOT com
+  ~
+  ~ This program is free software; you can redistribute it and/or
+  ~ modify it under the terms of the GNU Lesser General Public
+  ~ License as published by the Free Software Foundation; either
+  ~ version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public License
+  ~ along with this program; if not, write to the Free Software Foundation,
+  ~ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+  -->
+
+<service>
+  <!-- Path to the Java executable. To be replaced by SonarService.bat script -->
+  <executable>JAVA_EXE</executable>
+
+  <!-- DO NOT EDIT THE FOLLOWING SECTIONS -->
+  <arguments>
+    -Xms8m -Xmx32m
+    -Djava.awt.headless=true
+    --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED
+    --add-opens=java.base/java.lang=ALL-UNNAMED
+    --add-opens=java.base/java.nio=ALL-UNNAMED
+    --add-opens=java.base/sun.nio.ch=ALL-UNNAMED
+    --add-opens=java.management/sun.management=ALL-UNNAMED
+    --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED
+    -cp "..\..\..\lib\sonar-application-@sqversion@.jar" "org.sonar.application.App"
+  </arguments>
+
+  <id>SonarQube</id>
+  <name>SonarQube</name>
+  <description>SonarQube</description>
+
+  <logpath>../../../logs</logpath>
+  <log mode="none"/>
+
+</service>
\ No newline at end of file