Author: kkolinko
Date: Wed Jun 24 11:17:24 2009
New Revision: 787978
URL: http://svn.apache.org/viewvc?rev=787978&view=rev
Log:
Updated Jasper runtime and JspC to use "1.6" as the values for
compilerSourceVM, compilerTargetVM options by default,
as Tomcat 7 runs on JRE 1.6+
Modified:
tomcat/trunk/conf/web.xml
tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/trunk/java/org/apache/jasper/JspC.java
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
tomcat/trunk/webapps/docs/jasper-howto.xml
Modified: tomcat/trunk/conf/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=787978&r1=787977&r2=787978&view=diff
==============================================================================
--- tomcat/trunk/conf/web.xml (original)
+++ tomcat/trunk/conf/web.xml Wed Jun 24 11:17:24 2009
@@ -125,9 +125,9 @@
<!-- pages. See the jasper documentation for more -->
<!-- information. -->
<!-- -->
- <!-- compilerSourceVM Compiler source VM. [1.5] -->
+ <!-- compilerSourceVM Compiler source VM. [1.6] -->
<!-- -->
- <!-- compilerTargetVM Compiler target VM. [1.5]
-->
+ <!-- compilerTargetVM Compiler target VM. [1.6] -->
<!-- -->
<!-- development Is Jasper used in development mode? If true, -->
<!-- the frequency at which JSPs are checked for -->
Modified: tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java?rev=787978&r1=787977&r2=787978&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java (original)
+++ tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java Wed Jun 24
11:17:24 2009
@@ -131,12 +131,12 @@
/**
* Compiler target VM.
*/
- private String compilerTargetVM = "1.5";
+ private String compilerTargetVM = "1.6";
/**
* The compiler source VM.
*/
- private String compilerSourceVM = "1.5";
+ private String compilerSourceVM = "1.6";
/**
* The compiler class name.
@@ -377,18 +377,6 @@
public EmbeddedServletOptions(ServletConfig config,
ServletContext context) {
- // JVM version numbers
- // - 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() ) {
String k=enumeration.nextElement();
Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=787978&r1=787977&r2=787978&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Wed Jun 24 11:17:24 2009
@@ -164,8 +164,8 @@
protected String compiler = null;
- protected String compilerTargetVM = "1.4";
- protected String compilerSourceVM = "1.4";
+ protected String compilerTargetVM = "1.6";
+ protected String compilerSourceVM = "1.6";
protected boolean classDebugInfo = true;
Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=787978&r1=787977&r2=787978&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Wed
Jun 24 11:17:24 2009
@@ -256,8 +256,8 @@
\ -xpoweredBy Add X-Powered-By response header\n\
\ -trimSpaces Trim spaces in template text between actions,
directives\n\
\ -javaEncoding <enc> Set the encoding charset for Java classes (default
UTF-8)\n\
-\ -source <version> Set the -source argument to the compiler (default
1.4)\n\
-\ -target <version> Set the -target argument to the compiler (default
1.4)\n\
+\ -source <version> Set the -source argument to the compiler (default
1.6)\n\
+\ -target <version> Set the -target argument to the compiler (default
1.6)\n\
jspc.webxml.header=<?xml version="1.0" encoding="ISO-8859-1"?>\n\
\n\
Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties?rev=787978&r1=787977&r2=787978&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
Wed Jun 24 11:17:24 2009
@@ -256,8 +256,8 @@
\ -xpoweredBy A\u00F1ade cabecera de respuesta
X-Powered-By\n\
\ -trimSpaces Trim spaces in template text between actions,
directives\n\
\ -javaEncoding <enc> Set the encoding charset for Java classes
(default UTF-8)\n\
- \ -source <version> Set the -source argument to the compiler
(default 1.4)\n\
- \ -target <version> Set the -target argument to the compiler
(default 1.4)\n
+ \ -source <version> Set the -source argument to the compiler
(default 1.6)\n\
+ \ -target <version> Set the -target argument to the compiler
(default 1.6)\n
jspc.webxml.header = <?xml version\="1.0" encoding\="ISO-8859-1"?>\n\
\n\
<\!DOCTYPE web-app\n\
Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties?rev=787978&r1=787977&r2=787978&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
Wed Jun 24 11:17:24 2009
@@ -198,8 +198,8 @@
\ -sax2 <driverclassname> Le nom de classe du Driver SAX 2.0 \u00e0
utiliser\n\
\ -trimSpaces Trim spaces in template text between actions,
directives\n\
\ -javaEncoding <enc> Set the encoding charset for Java classes (default
UTF-8)\n\
-\ -source <version> Set the -source argument to the compiler (default
1.4)\n\
-\ -target <version> Set the -target argument to the compiler (default
1.4)\n\
+\ -source <version> Set the -source argument to the compiler (default
1.6)\n\
+\ -target <version> Set the -target argument to the compiler (default
1.6)\n\
jspc.webxml.header=<?xml version="1.0" encoding="ISO-8859-1"?>\n\
\n\
Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties?rev=787978&r1=787977&r2=787978&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
Wed Jun 24 11:17:24 2009
@@ -241,8 +241,8 @@
\ -trimSpaces
\u30a2\u30af\u30b7\u30e7\u30f3\u3084\u6307\u793a\u5b50\u306e\u9593\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30c6\u30ad\u30b9\u30c8\u4e2d\u306e\u30b9\u30da\u30fc\u30b9\u3092\u524a\u9664\n\
\ -trimSpaces Trim spaces in template text between actions,
directives\n\
\ -javaEncoding <enc> Set the encoding charset for Java classes (default
UTF-8)\n\
-\ -source <version> Set the -source argument to the compiler (default
1.4)\n\
-\ -target <version> Set the -target argument to the compiler (default
1.4)\n\
+\ -source <version> Set the -source argument to the compiler (default
1.6)\n\
+\ -target <version> Set the -target argument to the compiler (default
1.6)\n\
jspc.webxml.header=<?xml version="1.0" encoding="ISO-8859-1"?>\n\
\n\
Modified: tomcat/trunk/webapps/docs/jasper-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jasper-howto.xml?rev=787978&r1=787977&r2=787978&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/jasper-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jasper-howto.xml Wed Jun 24 11:17:24 2009
@@ -107,10 +107,10 @@
No default value.</li>
<li><strong>compilerSourceVM</strong> - What JDK version are the source files
-compatible with? (Default value: <code>1.5</code>)</li>
+compatible with? (Default value: <code>1.6</code>)</li>
<li><strong>compilerTargetVM</strong> - What JDK version are the generated
files
-compatible with? (Default value: <code>1.5</code>)</li>
+compatible with? (Default value: <code>1.6</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
@@ -318,9 +318,9 @@
At the jasper2 task you can use the option <code>addWebXmlMappings</code> for
automatic merge the <code>${webapp.path}/WEB-INF/generated_web.xml</code>
with the current web application deployment descriptor at
-<code>${webapp.path}/WEB-INF/web.xml</code>. When you want to use Java 5
+<code>${webapp.path}/WEB-INF/web.xml</code>. When you want to use Java 6
features inside your jsp's, add the following javac compiler task attributes:
-<code>source="1.5" target="1.5"</code>. For live
+<code>source="1.6" target="1.6"</code>. For live
applications you can also compile with <code>optimize="on"</code> and
without debug info <code>debug="off"</code>.
</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
