Author: kkolinko
Date: Wed Jun 24 12:13:26 2009
New Revision: 787992
URL: http://svn.apache.org/viewvc?rev=787992&view=rev
Log:
Remove the code that detects the value for compilerSourceVM, compilerTargetVM
options,
because we know that this version of Tomcat cannot run on JDK 1.4.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/conf/web.xml
tomcat/tc6.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 24 12:13:26 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77
7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,784453,784602,784614,785688,786468,786667,787627,787770
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77
7466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,784453,784602,784614,785688,785768,785859,786468,786667,787627,787770
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=787992&r1=787991&r2=787992&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jun 24 12:13:26 2009
@@ -143,16 +143,6 @@
+1: markt, fhanik, mturk
-1:
-* 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.
- http://svn.apache.org/viewvc?rev=785768&view=rev
- http://svn.apache.org/viewvc?rev=785859&view=rev
- +1: kkolinko
- +1: markt - I don't like commenting out code - if it isn't needed just
delete it
- - This is fine for 6.0.x, for trunk 1.6 is the minimum
- +1: fhanik - remove it is fine
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47389
http://svn.apache.org/viewvc?rev=786124&view=rev
+1: fhanik, markt, mturk
Modified: tomcat/tc6.0.x/trunk/conf/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/web.xml?rev=787992&r1=787991&r2=787992&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/conf/web.xml (original)
+++ tomcat/tc6.0.x/trunk/conf/web.xml Wed Jun 24 12:13:26 2009
@@ -156,15 +156,9 @@
<!-- pages. See the jasper documentation for more -->
<!-- information. -->
<!-- -->
- <!-- compilerSourceVM Compiler source VM -->
- <!-- default is System.properties -->
- <!-- java.specification.version > 1.4 -->
- <!-- [1.5] else [1.4] -->
- <!-- -->
- <!-- compilerTargetVM Compiler target VM
-->
- <!-- default is System.properties -->
- <!-- java.specification.version > 1.4 -->
- <!-- [1.5] else [1.4] -->
+ <!-- compilerSourceVM Compiler source VM. [1.5] -->
+ <!-- -->
+ <!-- compilerTargetVM Compiler target VM. [1.5]
-->
<!-- -->
<!-- development Is Jasper used in development mode? If true, -->
<!-- the frequency at which JSPs are checked for -->
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java?rev=787992&r1=787991&r2=787992&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java Wed
Jun 24 12:13:26 2009
@@ -385,17 +385,6 @@
public EmbeddedServletOptions(ServletConfig config,
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
- }
-
Enumeration enumeration=config.getInitParameterNames();
while( enumeration.hasMoreElements() ) {
String k=(String)enumeration.nextElement();
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=787992&r1=787991&r2=787992&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jun 24 12:13:26 2009
@@ -120,6 +120,11 @@
<bug>47318</bug>: Process directives found in include preludes and
codas. (markt)
</fix>
+ <update>
+ Remove the code that auto-detects the value for compilerSourceVM,
+ compilerTargetVM options of Jasper, because we know that this version
+ of Tomcat cannot run on JDK 1.4 and thus the value is always "1.5".
(kkolinko)
+ </update>
</changelog>
</subsection>
<subsection name="Webapps">
Modified: tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml?rev=787992&r1=787991&r2=787992&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml Wed Jun 24 12:13:26 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: [email protected]
For additional commands, e-mail: [email protected]
