Author: markt Date: Tue Sep 30 13:23:25 2014 New Revision: 1628435 URL: http://svn.apache.org/r1628435 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56829 Add the ability for users to define their own values for _RUNJAVA and _RUNJDB. Based on a patch by Neeme Praks.
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/bin/setclasspath.sh tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1617362,1617365,1617383 Merged /tomcat/tc7.0.x/trunk:r1617364,1617374,1617433,1617457 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1628435&r1=1628434&r2=1628435&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Sep 30 13:23:25 2014 @@ -57,16 +57,6 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56829 - Add the ability for users to define their own values for _RUNJAVA and _RUNJDB. - Based on a patch by Neeme Praks. - http://svn.apache.org/r1617364 (the actual fix) - http://svn.apache.org/r1617374 (fix typo in changelog) - http://svn.apache.org/r1617433 (copy/paste error) - http://svn.apache.org/r1617457 (comments) - +1: markt, kkolinko, remm - -1: - * Be more strict with executable filename on Windows (s/java/java.exe/). http://svn.apache.org/r1617458 +1: kkolinko, remm, markt Modified: tomcat/tc6.0.x/trunk/bin/setclasspath.bat URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/setclasspath.bat?rev=1628435&r1=1628434&r2=1628435&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/bin/setclasspath.bat (original) +++ tomcat/tc6.0.x/trunk/bin/setclasspath.bat Tue Sep 30 13:23:25 2014 @@ -65,11 +65,18 @@ rem Set the default -Djava.endorsed.dirs set "JAVA_ENDORSED_DIRS=%BASEDIR%\endorsed" :gotEndorseddir +rem Don't override _RUNJAVA if the user has set it previously +if not "%_RUNJAVA%" == "" goto gotRunJava rem Set standard command for invoking Java. -rem Note that NT requires a window name argument when using start. -rem Also note the quoting as JAVA_HOME may contain spaces. +rem Also note the quoting as JRE_HOME may contain spaces. set _RUNJAVA="%JRE_HOME%\bin\java" +: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" +:gotRunJdb goto end Modified: tomcat/tc6.0.x/trunk/bin/setclasspath.sh URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/setclasspath.sh?rev=1628435&r1=1628434&r2=1628435&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/bin/setclasspath.sh (original) +++ tomcat/tc6.0.x/trunk/bin/setclasspath.sh Tue Sep 30 13:23:25 2014 @@ -110,8 +110,12 @@ if [ `uname -s` = "Darwin" ]; then fi fi -# Set standard commands for invoking Java. -_RUNJAVA="$JRE_HOME"/bin/java -if [ "$os400" != "true" ]; then - _RUNJDB="$JAVA_HOME"/bin/jdb +# Set standard commands for invoking Java, if not already set. +if [ -z "$_RUNJAVA" ]; then + _RUNJAVA="$JRE_HOME"/bin/java fi +if [ "$os400" != "true" ]; then + if [ -z "$_RUNJDB" ]; then + _RUNJDB="$JAVA_HOME"/bin/jdb + fi +fi \ No newline at end of file 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=1628435&r1=1628434&r2=1628435&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:23:25 2014 @@ -106,6 +106,11 @@ <bug>56606</bug>: When creating <code>tomcat-users.xml</code> in the Windows Installer, use the new attribute name for the name of the user. (markt) + <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) + </add> </changelog> </subsection> </section> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org