Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 74427 invoked from network); 3 May 2009 01:33:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 3 May 2009 01:33:27 -0000 Received: (qmail 99444 invoked by uid 500); 3 May 2009 01:33:26 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 99379 invoked by uid 500); 3 May 2009 01:33:26 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 99368 invoked by uid 99); 3 May 2009 01:33:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 May 2009 01:33:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 May 2009 01:33:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A0D8023889B9; Sun, 3 May 2009 01:33:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r771014 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/core/Constants.java java/org/apache/catalina/core/StandardWrapper.java webapps/docs/changelog.xml Date: Sun, 03 May 2009 01:33:02 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090503013302.A0D8023889B9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Sun May 3 01:33:01 2009 New Revision: 771014 URL: http://svn.apache.org/viewvc?rev=771014&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47013 Use system property rather than hard code default Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/Constants.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun May 3 01:33:01 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,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,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763611,763654,763681,763706,765662,768335 +/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,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,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=771014&r1=771013&r2=771014&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun May 3 01:33:01 2009 @@ -119,14 +119,6 @@ +1: markt, remm (risky ...) -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47013 - Use system property rather than hard code default - http://svn.apache.org/viewvc?rev=764985&view=rev - http://svn.apache.org/viewvc?rev=764997&view=rev - +1: markt, rjung, pero - -0: remm: Why should this be backported ? - -1: - * Fix use of non-ASCII characters in property files http://people.apache.org/~markt/patches/2009-04-20-native2ascii-de.patch (German) http://people.apache.org/~markt/patches/2009-04-20-native2ascii-en.patch (English) Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/Constants.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/Constants.java?rev=771014&r1=771013&r2=771014&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/Constants.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/Constants.java Sun May 3 01:33:01 2009 @@ -28,5 +28,8 @@ public static final String JSP_SERVLET_CLASS = "org.apache.jasper.servlet.JspServlet"; public static final String JSP_SERVLET_NAME = "jsp"; + public static final String PRECOMPILE = + System.getProperty("org.apache.jasper.Constants.PRECOMPILE", + "jsp_precompile"); } Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=771014&r1=771013&r2=771014&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java Sun May 3 01:33:01 2009 @@ -1178,7 +1178,7 @@ // Invoking jspInit DummyRequest req = new DummyRequest(); req.setServletPath(jspFile); - req.setQueryString("jsp_precompile=true"); + req.setQueryString(Constants.PRECOMPILE + "=true"); DummyResponse res = new DummyResponse(); if( Globals.IS_SECURITY_ENABLED) { 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=771014&r1=771013&r2=771014&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun May 3 01:33:01 2009 @@ -128,6 +128,10 @@ 46909: Only include semi-colon in type attribute for <jsp:plugin> when it is required. (markt) + + 47013: Use system property rather than hard-coded string for + pre-compilation flag. (markt) + --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org