Author: markt Date: Tue Sep 30 13:26:10 2014 New Revision: 1628437 URL: http://svn.apache.org/r1628437 Log: Be more strict with executable filename on Windows (s/java/java.exe/).
Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/bin/setclasspath.bat tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1617456 Merged /tomcat/tc7.0.x/trunk:r1617458 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1628437&r1=1628436&r2=1628437&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Sep 30 13:26:10 2014 @@ -57,11 +57,6 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko -1: -* Be more strict with executable filename on Windows (s/java/java.exe/). - http://svn.apache.org/r1617458 - +1: kkolinko, remm, markt - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43001 Enable the JspC Ant task to set the JspC option mappedFile. Modified: tomcat/tc6.0.x/trunk/bin/setclasspath.bat URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/setclasspath.bat?rev=1628437&r1=1628436&r2=1628437&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/bin/setclasspath.bat (original) +++ tomcat/tc6.0.x/trunk/bin/setclasspath.bat Tue Sep 30 13:26:10 2014 @@ -69,13 +69,13 @@ rem Don't override _RUNJAVA if the user if not "%_RUNJAVA%" == "" goto gotRunJava rem Set standard command for invoking Java. rem Also note the quoting as JRE_HOME may contain spaces. -set _RUNJAVA="%JRE_HOME%\bin\java" +set _RUNJAVA="%JRE_HOME%\bin\java.exe" :gotRunJava rem Don't override _RUNJDB if the user has set it previously rem Also note the quoting as JAVA_HOME may contain spaces. if not "%_RUNJDB%" == "" goto gotRunJdb -set _RUNJDB="%JAVA_HOME%\bin\jdb" +set _RUNJDB="%JAVA_HOME%\bin\jdb.exe" :gotRunJdb goto end 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=1628437&r1=1628436&r2=1628437&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Sep 30 13:26:10 2014 @@ -110,8 +110,9 @@ </fix> <add> <bug>56829</bug>: Add the ability for users to define their own values - for <code>_RUNJAVA</code> and <code>_RUNJDB</code>. Based on a patch by - Neeme Praks. (markt) + for <code>_RUNJAVA</code> and <code>_RUNJDB</code> environment + variables. Be more strict with executable filename on Windows + (s/java/java.exe/). Based on a patch by Neeme Praks. (markt/kkolinko) </add> </changelog> </subsection> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org