Author: fschumacher
Date: Sun Mar 13 18:41:22 2016
New Revision: 1734840
URL: http://svn.apache.org/viewvc?rev=1734840&view=rev
Log:
Use java 7 as default for jsp comilation
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspC.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspC.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspC.java?rev=1734840&r1=1734839&r2=1734840&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspC.java Sun Mar 13 18:41:22
2016
@@ -193,8 +193,8 @@ public class JspC extends Task implement
protected String compiler = null;
- protected String compilerTargetVM = "1.8";
- protected String compilerSourceVM = "1.8";
+ protected String compilerTargetVM = "1.7";
+ protected String compilerSourceVM = "1.7";
protected boolean classDebugInfo = true;
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java?rev=1734840&r1=1734839&r2=1734840&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java Sun
Mar 13 18:41:22 2016
@@ -318,12 +318,12 @@ public class JDTCompiler extends org.apa
} else {
log.warn("Unknown source VM " + opt + " ignored.");
settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_8);
+ CompilerOptions.VERSION_1_7);
}
} else {
- // Default to 1.8
+ // Default to 1.7
settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_8);
+ CompilerOptions.VERSION_1_7);
}
// Target JVM
@@ -369,14 +369,14 @@ public class JDTCompiler extends org.apa
} else {
log.warn("Unknown target VM " + opt + " ignored.");
settings.put(CompilerOptions.OPTION_TargetPlatform,
- CompilerOptions.VERSION_1_8);
+ CompilerOptions.VERSION_1_7);
}
} else {
- // Default to 1.8
+ // Default to 1.7
settings.put(CompilerOptions.OPTION_TargetPlatform,
- CompilerOptions.VERSION_1_8);
+ CompilerOptions.VERSION_1_7);
settings.put(CompilerOptions.OPTION_Compliance,
- CompilerOptions.VERSION_1_8);
+ CompilerOptions.VERSION_1_7);
}
final IProblemFactory problemFactory =
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1734840&r1=1734839&r2=1734840&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
Sun Mar 13 18:41:22 2016
@@ -182,8 +182,8 @@ where options include:\n\
\ -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.8)\n\
-\ -target <version> Set the -target argument to the compiler (default
1.8)\n\
+\ -source <version> Set the -source argument to the compiler (default
1.7)\n\
+\ -target <version> Set the -target argument to the compiler (default
1.7)\n\
jspc.webxml.header=<?xml version="1.0" encoding="ISO-8859-1"?>\n\
\n\
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties?rev=1734840&r1=1734839&r2=1734840&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
Sun Mar 13 18:41:22 2016
@@ -178,8 +178,8 @@ jspc.usage = Uso\: jspc <opciones> [--]
\ -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.8)\n\
- \ -target <version> Set the -target argument to the compiler (default
1.8)\n
+ \ -source <version> Set the -source argument to the compiler (default
1.7)\n\
+ \ -target <version> Set the -target argument to the compiler (default
1.7)\n
jspc.webxml.header = <?xml version\="1.0" encoding\="ISO-8859-1"?>\n\
\n\
<\!DOCTYPE web-app\n\
@@ -369,4 +369,4 @@ jsp.tldCache.noTldInJar = No se han hall
jsp.tldCache.noTldSummary = Al menos un JAR, que se ha explorado buscando
TLDs, a\u00FAn no conten\u00EDa TLDs. Activar historial de depuraci\u00F3n para
este historiador para una completa lista de los JARs que fueron explorados y de
los que nos se hall\u00F3 TLDs. Saltarse JARs no necesarios durante la
exploraci\u00F3n puede dar lugar a una mejora de tiempo significativa en el
arranque y compilaci\u00F3n de JSP .
#ELInterpreter
-jsp.error.el_interpreter_class.instantiation=No se puede cargar la clase
ELInterpreter llamada [{0}]
\ No newline at end of file
+jsp.error.el_interpreter_class.instantiation=No se puede cargar la clase
ELInterpreter llamada [{0}]
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties?rev=1734840&r1=1734839&r2=1734840&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
Sun Mar 13 18:41:22 2016
@@ -113,8 +113,8 @@ o\u00f9 les options comprennet:\n\
\ -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.8)\n\
-\ -target <version> Set the -target argument to the compiler (default
1.8)\n\
+\ -source <version> Set the -source argument to the compiler (default
1.7)\n\
+\ -target <version> Set the -target argument to the compiler (default
1.7)\n\
jspc.webxml.header=<?xml version="1.0" encoding="ISO-8859-1"?>\n\
\n\
@@ -211,4 +211,4 @@ jsp.error.attributes.not.allowed = {0} n
#jsp.error.invalid.bean=
#ELInterpreter
-jsp.error.el_interpreter_class.instantiation=Impossible de charger ou
d''instancier la classe ELInterpreter [{0}]
\ No newline at end of file
+jsp.error.el_interpreter_class.instantiation=Impossible de charger ou
d''instancier la classe ELInterpreter [{0}]
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties?rev=1734840&r1=1734839&r2=1734840&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
Sun Mar 13 18:41:22 2016
@@ -155,8 +155,8 @@ JSP\u30d5\u30a1\u30a4\u30eb\u306e\u5834\
\ -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.8)\n\
-\ -target <version> Set the -target argument to the compiler (default
1.8)\n\
+\ -source <version> Set the -source argument to the compiler (default
1.7)\n\
+\ -target <version> Set the -target argument to the compiler (default
1.7)\n\
jspc.webxml.header=<?xml version="1.0" encoding="ISO-8859-1"?>\n\
\n\
@@ -310,4 +310,4 @@ jsp.error.invalid.bean=useBean\u306e\u30
jsp.error.prefix.use_before_dcl=\u3053\u306e\u30bf\u30b0\u6307\u793a\u5b50\u3067\u6307\u5b9a\u3055\u308c\u3066\u3044\u308b\u30d7\u30ea\u30d5\u30a3\u30c3\u30af\u30b9
{0} \u306f\u3001\u3059\u3067\u306b\u30d5\u30a1\u30a4\u30eb {1} \u306e {2}
\u884c\u76ee\u306e\u30a2\u30af\u30b7\u30e7\u30f3\u3067\u4f7f\u7528\u3055\u308c\u3066\u3044\u307e\u3059
#ELInterpreter
-jsp.error.el_interpreter_class.instantiation=ELInterpreter
class\u306e\u30ed\u30fc\u30c9\u53c8\u306f\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u5316\u306b\u5931\u6557\u3057\u307e\u3057\u305f
[{0}]
\ No newline at end of file
+jsp.error.el_interpreter_class.instantiation=ELInterpreter
class\u306e\u30ed\u30fc\u30c9\u53c8\u306f\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u5316\u306b\u5931\u6557\u3057\u307e\u3057\u305f
[{0}]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
