Author: kkolinko Date: Wed Jun 17 19:58:30 2009 New Revision: 785768 URL: http://svn.apache.org/viewvc?rev=785768&view=rev Log: 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.
Modified: tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java tomcat/trunk/webapps/docs/jasper-howto.xml Modified: tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java?rev=785768&r1=785767&r2=785768&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java (original) +++ tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java Wed Jun 17 19:58:30 2009 @@ -378,15 +378,16 @@ 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() ) { Modified: tomcat/trunk/webapps/docs/jasper-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jasper-howto.xml?rev=785768&r1=785767&r2=785768&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/jasper-howto.xml (original) +++ tomcat/trunk/webapps/docs/jasper-howto.xml Wed Jun 17 19:58:30 2009 @@ -107,10 +107,10 @@ 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 --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org