You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2023/03/24 11:45:55 UTC
[tomee] branch tomee-9.x updated: TOMEE-4189
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch tomee-9.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-9.x by this push:
new 05683a69a3 TOMEE-4189
05683a69a3 is described below
commit 05683a69a3092be4d819727fe6148845646b8cf6
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Fri Feb 24 20:44:23 2023 +0100
TOMEE-4189
---
.../main/java/org/apache/tomee/installer/Installer.java | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 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 dad2f9bb59..965abf53e5 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
@@ -631,7 +631,7 @@ public class Installer implements InstallerInterface {
// add our magic bits to the catalina sh file
String openejbJavaagentPath = paths.getCatalinaHomeDir().toURI().relativize(javaagentJar.toURI()).getPath();
- final String newCatalinaSh = catalinaShOriginal.replace("# ----- Execute The Requested Command",
+ String newCatalinaSh = catalinaShOriginal.replace("# ----- Execute The Requested Command",
"# Add OpenEJB javaagent\n" +
"if [ -r \"$CATALINA_HOME\"/" + openejbJavaagentPath + " ]; then\n" +
" JAVA_OPTS=\"\\\"-javaagent:$CATALINA_HOME/" + openejbJavaagentPath + "\\\" $JAVA_OPTS\"\n" +
@@ -639,6 +639,13 @@ public class Installer implements InstallerInterface {
"\n" +
"# ----- Execute The Requested Command");
+ 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");
+
// overwrite the catalina.sh file
if (Installers.writeAll(paths.getCatalinaShFile(), newCatalinaSh, alerts)) {
alerts.addInfo("Add OpenEJB JavaAgent to catalina.sh");
@@ -681,7 +688,7 @@ public class Installer implements InstallerInterface {
// add our magic bits to the catalina bat file
openejbJavaagentPath = openejbJavaagentPath.replace('/', '\\');
- final String newCatalinaBat = catalinaBatOriginal.replace("rem ----- Execute The Requested Command",
+ String newCatalinaBat = catalinaBatOriginal.replace("rem ----- Execute The Requested Command",
"rem Add OpenEJB javaagent\r\n" +
"if not exist \"%CATALINA_HOME%\\" + openejbJavaagentPath + "\" goto noOpenEJBJavaagent\r\n" +
"set JAVA_OPTS=\"-javaagent:%CATALINA_HOME%\\" + openejbJavaagentPath + "\" %JAVA_OPTS%\r\n" +
@@ -689,6 +696,11 @@ 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");
// overwrite the catalina.bat file
if (Installers.writeAll(paths.getCatalinaBatFile(), newCatalinaBat, alerts)) {
alerts.addInfo("Add OpenEJB JavaAgent to catalina.bat");