[tomee] branch main updated: TOMEE-4189 - Ports the fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=66507 to Tomcat 10.0.27

[rzo1]

This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/main by this push:
     new f48b820578 TOMEE-4189 - Ports the fix for 
https://bz.apache.org/bugzilla/show_bug.cgi?id=66507 to Tomcat 10.0.27
f48b820578 is described below

commit f48b8205787837ab5286e08c47a42bd9b146b8ee
Author: Richard Zowalla <r...@apache.org>
AuthorDate: Wed Apr 19 20:21:39 2023 +0200

    TOMEE-4189 - Ports the fix for 
https://bz.apache.org/bugzilla/show_bug.cgi?id=66507 to Tomcat 10.0.27
---
 .../main/java/org/apache/tomee/installer/Installer.java    | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git 
a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java 
b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
index 66f31f6116..0929928323 100644
--- a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
+++ b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
@@ -642,9 +642,9 @@ public class Installer implements InstallerInterface {
         newCatalinaSh = newCatalinaSh.replace("    \"$_RUNJAVA\"   \\\n" +
             "      -classpath \"$CATALINA_HOME/lib/catalina.jar\" \\\n" +
             "      org.apache.catalina.util.ServerInfo",
-        "    \"$_RUNJAVA\"   \\\n" +
-            "      -classpath 
\"$CATALINA_HOME/lib/catalina.jar:$CATALINA_HOME/lib/openejb-core-"+ 
properties.get("tomee.version") + ".jar\" \\\n" +
-            "      org.apache.catalina.util.ServerInfo");
+            "   eval \"\\\"$_RUNJAVA\\\"\" \"$JAVA_OPTS\" \\\n" +
+                "         -classpath 
\"\\\"$CATALINA_HOME/lib/catalina.jar:$CATALINA_HOME/lib/openejb-core-"+ 
properties.get("tomee.version") + ".jar\\\"\" \\\n" +
+                "         org.apache.catalina.util.ServerInfo");
 
         // overwrite the catalina.sh file
         if (Installers.writeAll(paths.getCatalinaShFile(), newCatalinaSh, 
alerts)) {
@@ -696,11 +696,9 @@ public class Installer implements InstallerInterface {
                         "\r\n" +
                         "rem ----- Execute The Requested Command");
 
-        newCatalinaBat.replace(":doVersion\n" +
-            "%_EXECJAVA% -classpath \"%CATALINA_HOME%\\lib\\catalina.jar\" 
org.apache.catalina.util.ServerInfo\n" +
-            "goto end", ":doVersion\n" +
-            "%_EXECJAVA% -classpath 
\"%CATALINA_HOME%\\lib\\catalina.jar;%CATALINA_HOME%\\lib\\openejb-core-" + 
properties.get("tomee.version") + ".jar\" 
org.apache.catalina.util.ServerInfo\n" +
-            "goto end");
+        newCatalinaBat = newCatalinaBat.replace("%_EXECJAVA% %JAVA_OPTS% 
-classpath \"%CATALINA_HOME%\\lib\\catalina.jar\" 
org.apache.catalina.util.ServerInfo",
+            "%_EXECJAVA% %JAVA_OPTS% -classpath 
\"%CATALINA_HOME%\\lib\\catalina.jar;%CATALINA_HOME%\\lib\\openejb-core-" + 
properties.get("tomee.version") + ".jar\" org.apache.catalina.util.ServerInfo");
+
         // overwrite the catalina.bat file
         if (Installers.writeAll(paths.getCatalinaBatFile(), newCatalinaBat, 
alerts)) {
             alerts.addInfo("Add OpenEJB JavaAgent to catalina.bat");