Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TOMEE-4189 - java.lang.ClassNotFoundException: org.apache.openejb.loader.SystemInstance #1025

Merged
merged 1 commit into from
Mar 17, 2023
Merged

TOMEE-4189 - java.lang.ClassNotFoundException: org.apache.openejb.loader.SystemInstance #1025

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 14 additions & 2 deletions tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,14 +628,21 @@ public void installJavaagent() {

// 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" +
"fi\n" +
"\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");
Expand Down Expand Up @@ -678,14 +685,19 @@ public void installJavaagent() {

// 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" +
":noOpenEJBJavaagent\r\n" +
"\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");
Expand Down