[529156] Add support for 4.0 web modules to Tomcat 9.0
Change-Id: I820640e57b148f944fcbd6716cd4afcc96305d82
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml b/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml
index 9db482c..1e57d2e 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml
+++ b/plugins/org.eclipse.jst.server.tomcat.core/plugin.xml
@@ -144,7 +144,7 @@
class="org.eclipse.jst.server.tomcat.core.internal.TomcatRuntime">
<moduleType
types="jst.web"
- versions="2.2, 2.3, 2.4, 2.5, 3.0, 3.1"/>
+ versions="2.2, 2.3, 2.4, 2.5, 3.0, 3.1, 4.0"/>
<moduleType
types="jst.utility"
versions="1.0"/>
@@ -531,10 +531,10 @@
version="9.0"/>
<facet
id="jst.web"
- version="2.2,2.3,2.4,2.5,3.0,3.1"/>
+ version="2.2,2.3,2.4,2.5,3.0,3.1,4.0"/>
<facet
id="jst.webfragment"
- version="3.0,3.1"/>
+ version="3.0,3.1,4.0"/>
<facet
id="jst.utility"
version="1.0"/>
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat90Handler.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat90Handler.java
index 2a6f058..202dcf6 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat90Handler.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat90Handler.java
@@ -113,7 +113,7 @@
public IStatus canAddModule(IModule module) {
String version = module.getModuleType().getVersion();
if ("2.2".equals(version) || "2.3".equals(version) || "2.4".equals(version) || "2.5".equals(version)
- || "3.0".equals(version) || "3.1".equals(version))
+ || "3.0".equals(version) || "3.1".equals(version) || "4.0".equals(version))
return Status.OK_STATUS;
return new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, Messages.errorSpec90, null);
