[338564] Address coming changes in Tomcat 7.0.9 and later so "Serve modules without publishing" keeps working.
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/build.properties b/plugins/org.eclipse.jst.server.tomcat.core/build.properties
index 187fbc5..dd202d4 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/build.properties
+++ b/plugins/org.eclipse.jst.server.tomcat.core/build.properties
@@ -19,7 +19,8 @@
org.eclipse.jst.server.tomcat.runtime.55.loader.jar,\
org.eclipse.jst.server.tomcat.runtime.60.loader.jar,\
org.eclipse.jst.server.tomcat.runtime.70.loader.jar,\
- org.eclipse.jst.server.tomcat.runtime.706.loader.jar
+ org.eclipse.jst.server.tomcat.runtime.706.loader.jar,\
+ org.eclipse.jst.server.tomcat.runtime.708.loader.jar
bin.excludes = bin/**,\
@dot/**,\
temp.folder/**
@@ -27,4 +28,5 @@
src.includes = org.eclipse.jst.server.tomcat.runtime.50.loader-src.zip,\
org.eclipse.jst.server.tomcat.runtime.55.loader-src.zip,\
org.eclipse.jst.server.tomcat.runtime.60.loader-src.zip,\
- org.eclipse.jst.server.tomcat.runtime.70.loader-src.zip
+ org.eclipse.jst.server.tomcat.runtime.70.loader-src.zip,\
+ org.eclipse.jst.server.tomcat.runtime.708.loader-src.zip
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/org.eclipse.jst.server.tomcat.runtime.70.loader-src.zip b/plugins/org.eclipse.jst.server.tomcat.core/org.eclipse.jst.server.tomcat.runtime.70.loader-src.zip
index f65c0f0..93e0011 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/org.eclipse.jst.server.tomcat.runtime.70.loader-src.zip
+++ b/plugins/org.eclipse.jst.server.tomcat.core/org.eclipse.jst.server.tomcat.runtime.70.loader-src.zip
Binary files differ
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/org.eclipse.jst.server.tomcat.runtime.70.loader.jar b/plugins/org.eclipse.jst.server.tomcat.core/org.eclipse.jst.server.tomcat.runtime.70.loader.jar
index 42d56c9..dd94810 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/org.eclipse.jst.server.tomcat.runtime.70.loader.jar
+++ b/plugins/org.eclipse.jst.server.tomcat.core/org.eclipse.jst.server.tomcat.runtime.70.loader.jar
Binary files differ
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/org.eclipse.jst.server.tomcat.runtime.708.loader-src.zip b/plugins/org.eclipse.jst.server.tomcat.core/org.eclipse.jst.server.tomcat.runtime.708.loader-src.zip
new file mode 100644
index 0000000..f65c0f0
--- /dev/null
+++ b/plugins/org.eclipse.jst.server.tomcat.core/org.eclipse.jst.server.tomcat.runtime.708.loader-src.zip
Binary files differ
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/org.eclipse.jst.server.tomcat.runtime.708.loader.jar b/plugins/org.eclipse.jst.server.tomcat.core/org.eclipse.jst.server.tomcat.runtime.708.loader.jar
new file mode 100644
index 0000000..42d56c9
--- /dev/null
+++ b/plugins/org.eclipse.jst.server.tomcat.core/org.eclipse.jst.server.tomcat.runtime.708.loader.jar
Binary files differ
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatVersionHelper.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatVersionHelper.java
index 1fdee43..e3c8774 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatVersionHelper.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatVersionHelper.java
@@ -804,7 +804,7 @@
public static String getLoaderJarFile(String serverId, String tomcatVersion) {
String loaderJar = "/" + serverId + ".loader.jar";
- // If Tomcat 7.0, we need to determine the older jar should be used
+ // If Tomcat 7.0, we need to determine if an older jar should be used
if ("org.eclipse.jst.server.tomcat.runtime.70".equals(serverId) && tomcatVersion != null) {
int index = tomcatVersion.indexOf('.');
if (index >= 0 && tomcatVersion.length() > index + 1) {
@@ -834,9 +834,13 @@
try {
version = Integer.parseInt(versionStr);
if (version <= 6) {
- // Use the jar for Tomcat 7.0.6 or earlier.
+ // Use this jar for Tomcat 7.0.6 or earlier.
loaderJar = "/" + serverId + "6.loader.jar";
}
+ else if (version <= 8) {
+ // Use this jar for Tomcat 7.0.8 (7.0.7 didn't release)
+ loaderJar = "/" + serverId + "8.loader.jar";
+ }
}
catch (NumberFormatException e) {
// Ignore and copy default jar
