2014-08-12 1:29 GMT+04:00 <ma...@apache.org>: > Author: markt > Date: Mon Aug 11 21:29:47 2014 > New Revision: 1617362 > > URL: http://svn.apache.org/r1617362 > 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 > _RUNJBD. Based on a patch by Neeme Praks.
1. A typo, s/_RUNJBD/_RUNJDB/ in changelog.xml, > Modified: > tomcat/trunk/bin/setclasspath.bat > tomcat/trunk/bin/setclasspath.sh > tomcat/trunk/webapps/docs/changelog.xml > > Modified: tomcat/trunk/bin/setclasspath.bat > URL: > http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.bat?rev=1617362&r1=1617361&r2=1617362&view=diff > ============================================================================== > --- tomcat/trunk/bin/setclasspath.bat (original) > +++ tomcat/trunk/bin/setclasspath.bat Mon Aug 11 21:29:47 2014 > @@ -71,11 +71,18 @@ rem Set the default -Djava.endorsed.dirs > set "JAVA_ENDORSED_DIRS=%CATALINA_HOME%\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. > set _RUNJAVA="%JRE_HOME%\bin\java" > +:gotRunJava > + > +rem Don't override _RUNJDB if the user has set it previously > +if not "%_RUNJAVA%" == "" goto gotRunJdb 2. The above line should s/_RUNJAVA/_RUNJDB" > set _RUNJDB="%JAVA_HOME%\bin\jdb" > +:gotRunJdb > > goto end > (...) Best regards, Konstantin Kolinko --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
