Author: markt
Date: Mon Nov 24 11:25:56 2014
New Revision: 1641368
URL: http://svn.apache.org/r1641368
Log:
Correct JspC usage message since the defaults for Tomcat 8 are 1.7 (Java 7)
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1641368&r1=1641367&r2=1641368&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
Mon Nov 24 11:25:56 2014
@@ -180,8 +180,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.6)\n\
-\ -target <version> Set the -target argument to the compiler (default
1.6)\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.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties?rev=1641368&r1=1641367&r2=1641368&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
Mon Nov 24 11:25:56 2014
@@ -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.6)\n\
- \ -target <version> Set the -target argument to the compiler (default
1.6)\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\
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties?rev=1641368&r1=1641367&r2=1641368&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
Mon Nov 24 11:25:56 2014
@@ -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.6)\n\
-\ -target <version> Set the -target argument to the compiler (default
1.6)\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.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties?rev=1641368&r1=1641367&r2=1641368&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
Mon Nov 24 11:25:56 2014
@@ -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.6)\n\
-\ -target <version> Set the -target argument to the compiler (default
1.6)\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.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1641368&r1=1641367&r2=1641368&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Mon Nov 24 11:25:56 2014
@@ -93,6 +93,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <bug>57247</bug>: Correct the default Java source and target versions
in
+ the JspC usage message to <code>1.7</code> for Java 7. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="WebSocket">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
