tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kkoli...@apache.org
Subject svn commit: r790649 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/jasper/ java/org/apache/jasper/resources/ webapps/docs/
Date Thu, 02 Jul 2009 16:25:11 GMT
Author: kkolinko
Date: Thu Jul  2 16:25:10 2009
New Revision: 790649

URL: http://svn.apache.org/viewvc?rev=790649&view=rev
Log:
Change default value of compilerTargetVM, compilerSourceVM options in JspC to be "1.5",
to align with the values used by Jasper at runtime (EmbeddedServletOptions).

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java
    tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
    tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
    tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
    tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=790649&r1=790648&r2=790649&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul  2 16:25:10 2009
@@ -135,13 +135,6 @@
      )
   -1:
 
-* Change default value of compilerTargetVM, compilerSourceVM options in JspC,
-  to align with the values used by Jasper at runtime (EmbeddedServletOptions).
-  Tomcat 6 requires an 1.5 or later JRE to run.
-  http://people.apache.org/~kkolinko/patches/2009-06-24_JspC_targetVM.patch
-  +1: kkolinko, markt, rjung
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47158
   Update AccessLogValve with all the recent threading improvements
   http://people.apache.org/~markt/patches/2009-06-24-AccessLogValve-tc6.patch

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java?rev=790649&r1=790648&r2=790649&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java Thu Jul  2 16:25:10 2009
@@ -161,8 +161,8 @@
 
     protected String compiler = null;
 
-    protected String compilerTargetVM = "1.4";
-    protected String compilerSourceVM = "1.4";
+    protected String compilerTargetVM = "1.5";
+    protected String compilerSourceVM = "1.5";
 
     protected boolean classDebugInfo = true;
 

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=790649&r1=790648&r2=790649&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties Thu Jul
 2 16:25:10 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.5)\n\
+\    -target <version>   Set the -target argument to the compiler (default 1.5)\n\
 
 jspc.webxml.header=<?xml version="1.0" encoding="ISO-8859-1"?>\n\
 \n\

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties?rev=790649&r1=790648&r2=790649&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties Thu Jul
 2 16:25:10 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.5)\n\
+	\    -target <version>   Set the -target argument to the compiler (default 1.5)\n
 jspc.webxml.header = <?xml version\="1.0" encoding\="ISO-8859-1"?>\n\
 	\n\
 	<\!DOCTYPE web-app\n\

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties?rev=790649&r1=790648&r2=790649&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties Thu Jul
 2 16:25:10 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.5)\n\
+\    -target <version>   Set the -target argument to the compiler (default 1.5)\n\
 
 jspc.webxml.header=<?xml version="1.0" encoding="ISO-8859-1"?>\n\
 \n\

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties?rev=790649&r1=790648&r2=790649&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties Thu Jul
 2 16:25:10 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.5)\n\
+\    -target <version>   Set the -target argument to the compiler (default 1.5)\n\
 
 jspc.webxml.header=<?xml version="1.0" encoding="ISO-8859-1"?>\n\
 \n\

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=790649&r1=790648&r2=790649&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jul  2 16:25:10 2009
@@ -124,7 +124,7 @@
       </add>
       <update>
         Update Apache Commons Pool from 1.4 to 1.5.1. This update includes
-        various fixes to prevent deadlocks, reduces synchronisation and makes
+        various fixes to prevent deadlocks, reduces synchronization and makes
         object allocation occur fairly - i.e. objects are allocated to threads
         in the order that the threads request them. This update fixes a number
         of issues in Tomcat's built-in copy of DBCP. (markt)
@@ -151,6 +151,12 @@
         of Tomcat cannot run on JDK 1.4 and thus the value is always "1.5".
         (kkolinko)
       </update>
+      <update>
+        Change default values for JDK version compliance options of JspC
+        (-source and -target when running from command line)
+        to be "1.5", to be the same as the ones used by Jasper servlet.
+        (kkolinko)
+      </update>
     </changelog>
   </subsection>
   <subsection name="Cluster">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message