Skip to content

Add support for Tomcat 9.0 #23

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.

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

Merged
merged 1 commit into from
Sep 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
<value>TOMCAT_VER_70</value>
<value>TOMCAT_VER_80</value>
<value>TOMCAT_VER_85</value>
<value>TOMCAT_VER_90</value>
</skipIf>
<i18n key="INT_GLOBAL_WEB_XML" group="tomcatv6Tools"/>
<default-value-finder>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ public interface IConstants {
public static final String TOMCAT_VER_70 = "TOMCAT_VER_70";
public static final String TOMCAT_VER_80 = "TOMCAT_VER_80";
public static final String TOMCAT_VER_85 = "TOMCAT_VER_85";
public static final String TOMCAT_VER_90 = "TOMCAT_VER_90";
public static final String STR_WEBAPP_DIR = "webapps";
public static final String STR_AGENT_APP_WAR_FILE = "agentapp.war";
public static final String INSTANCE_CONFIG_DIR_NAME = "config";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,8 @@ public static String getTomcatVersion(String serverInfo) {
result = TOMCAT_VER_80;
} else if (versionLine.startsWith("8.5")) {
result = TOMCAT_VER_85;
} else if (versionLine.startsWith("9.0")) {
result = TOMCAT_VER_90;
}

Debug.log("TomcatVersionValidator.getTomcatVersion() - version:" + versionLine +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,15 @@ public class TomcatVersionValidatorTest {
"Architecture: amd64\n" +
"JVM Version: 1.8.0_181-b13\n" +
"JVM Vendor: Oracle Corporation\n";

public static final String LINUX_TOMCAT90_SERVERINFO = "Server version: Apache Tomcat/9.0.80\n" +
"Server built: Aug 23 2023 21:59:38 UTC\n" +
"Server number: 9.0.80.0\n" +
"OS Name: Linux\n" +
"OS Version: 5.15.0-83-generic\n" +
"Architecture: amd64\n" +
"JVM Version: 11.0.20.1+1-post-Ubuntu-0ubuntu122.04\n" +
"JVM Vendor: Ubuntu\n";

@Test
public void testCheckTomcatVersionIsValid() {
Expand All @@ -93,6 +102,7 @@ public void testCheckTomcatVersionIsValid() {
Assert.assertEquals(IConstants.TOMCAT_VER_70, TomcatVersionValidator.getTomcatVersion(LINUX_TOMCAT7_SERVERINFO));
Assert.assertEquals(IConstants.TOMCAT_VER_80, TomcatVersionValidator.getTomcatVersion(LINUX_TOMCAT8_SERVERINFO));
Assert.assertEquals(IConstants.TOMCAT_VER_85, TomcatVersionValidator.getTomcatVersion(LINUX_TOMCAT85_SERVERINFO));
Assert.assertEquals(IConstants.TOMCAT_VER_90, TomcatVersionValidator.getTomcatVersion(LINUX_TOMCAT90_SERVERINFO));

Assert.assertNull(TomcatVersionValidator.getTomcatVersion(LINUX_TOMCAT5_SERVERINFO));
Assert.assertNull(TomcatVersionValidator.getTomcatVersion(null));
Expand Down