Disable the code that detects the value for compilerSourceVM, compilerTargetVM options,

because we know that this version of Tomcat cannot run on JDK 1.4.
Update the doc.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@785768 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/jasper/EmbeddedServletOptions.java b/java/org/apache/jasper/EmbeddedServletOptions.java
index 8623417..d0acf40 100644 (file)
--- a/java/org/apache/jasper/EmbeddedServletOptions.java
+++ b/java/org/apache/jasper/EmbeddedServletOptions.java
@@ -378,15 +378,16 @@ public final class EmbeddedServletOptions implements Options {
             ServletContext context) {
         
         // JVM version numbers
-        try {
-            if (Float.parseFloat(System.getProperty("java.specification.version")) > 1.4) {
-                compilerSourceVM = compilerTargetVM = "1.5";
-            } else {
-                compilerSourceVM = compilerTargetVM = "1.4";
-            }
-        } catch (NumberFormatException e) {
-            // Ignore
-        }
+        // - not needed, because this version of Tomcat requires at least JDK 1.5
+        // try {
+        //    if (Float.parseFloat(System.getProperty("java.specification.version")) > 1.4) {
+        //        compilerSourceVM = compilerTargetVM = "1.5";
+        //    } else {
+        //        compilerSourceVM = compilerTargetVM = "1.4";
+        //    }
+        // } catch (NumberFormatException e) {
+        //    // Ignore
+        // }
         
         Enumeration<String> enumeration=config.getInitParameterNames();
         while( enumeration.hasMoreElements() ) {

diff --git a/webapps/docs/jasper-howto.xml b/webapps/docs/jasper-howto.xml
index 9c0cc19..ec39da1 100644 (file)
--- a/webapps/docs/jasper-howto.xml
+++ b/webapps/docs/jasper-howto.xml
@@ -107,10 +107,10 @@ then the default Eclipse JDT Java compiler will be used instead of using Ant.
 No default value.</li>
 
 <li><strong>compilerSourceVM</strong> - What JDK version are the source files
-compatible with? (Default JDK 1.4)</li>
+compatible with? (Default value: <code>1.5</code>)</li>
 
 <li><strong>compilerTargetVM</strong> - What JDK version are the generated files
-compatible with? (Default JDK 1.4)</li>
+compatible with? (Default value: <code>1.5</code>)</li>
 
 <li><strong>development</strong> - Is Jasper used in development mode? If true,
 the frequency at which JSPs are checked for modification may be specified via