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:52 UTC
[tomee] branch revert-1029-main-patches created (now 1004f5032c)
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a change to branch revert-1029-main-patches
in repository https://gitbox.apache.org/repos/asf/tomee.git
at 1004f5032c Revert "TOMEE-4189"
This branch includes the following new commits:
new 1004f5032c Revert "TOMEE-4189"
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[tomee] 01/01: Revert "TOMEE-4189"
Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch revert-1029-main-patches
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 1004f5032cd9bb290944f44cafc8e8f176ee9d8a
Author: Richard Zowalla <13...@users.noreply.github.com>
AuthorDate: Fri Mar 24 12:45:43 2023 +0100
Revert "TOMEE-4189"
This reverts commit 6ca77a4aa15210a53f498bf1e99e79bb1753e50d.
---
.../main/java/org/apache/tomee/installer/Installer.java | 16 ++--------------
1 file changed, 2 insertions(+), 14 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..c105a3f2f5 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();
- String newCatalinaSh = catalinaShOriginal.replace("# ----- Execute The Requested Command",
+ final 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,13 +639,6 @@ 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");
@@ -688,7 +681,7 @@ public class Installer implements InstallerInterface {
// add our magic bits to the catalina bat file
openejbJavaagentPath = openejbJavaagentPath.replace('/', '\\');
- String newCatalinaBat = catalinaBatOriginal.replace("rem ----- Execute The Requested Command",
+ final 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" +
@@ -696,11 +689,6 @@ 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");