[334818] Allow Tomcat 7.0 to use a JRE, like Tomcat 6.0 and 5.5. An SDK is not required.
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatRuntime.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatRuntime.java
index 8690654..d579f8c 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatRuntime.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatRuntime.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2010 IBM Corporation and others.
+ * Copyright (c) 2003, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -132,10 +132,10 @@
found = true;
}
- // on Tomcat 5.5 and 6.0, the Eclipse JDT compiler is used for JSP's
+ // on Tomcat 5.5 and later, the Eclipse JDT compiler is used for JSP's
String id = getRuntime().getRuntimeType().getId();
if (!found) {
- if (id != null && (id.indexOf("55") > 0 || id.indexOf("60") > 0))
+ if (id != null && (id.indexOf("55") > 0 || id.indexOf("60") > 0 || id.indexOf("70") > 0))
found = true;
}
