You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2014/08/11 23:31:45 UTC
svn commit: r1617364 - in /tomcat/tc7.0.x/trunk: ./ bin/setclasspath.bat
bin/setclasspath.sh webapps/docs/changelog.xml
Author: markt
Date: Mon Aug 11 21:31:45 2014
New Revision: 1617364
URL: http://svn.apache.org/r1617364
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.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/bin/setclasspath.bat
tomcat/tc7.0.x/trunk/bin/setclasspath.sh
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1617362
Modified: tomcat/tc7.0.x/trunk/bin/setclasspath.bat
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/setclasspath.bat?rev=1617364&r1=1617363&r2=1617364&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/setclasspath.bat (original)
+++ tomcat/tc7.0.x/trunk/bin/setclasspath.bat Mon Aug 11 21:31:45 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
set _RUNJDB="%JAVA_HOME%\bin\jdb"
+:gotRunJdb
goto end
Modified: tomcat/tc7.0.x/trunk/bin/setclasspath.sh
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/setclasspath.sh?rev=1617364&r1=1617363&r2=1617364&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/setclasspath.sh (original)
+++ tomcat/tc7.0.x/trunk/bin/setclasspath.sh Mon Aug 11 21:31:45 2014
@@ -83,8 +83,12 @@ if [ -z "$JAVA_ENDORSED_DIRS" ]; then
JAVA_ENDORSED_DIRS="$CATALINA_HOME"/endorsed
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/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1617364&r1=1617363&r2=1617364&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Aug 11 21:31:45 2014
@@ -135,6 +135,11 @@
applications when installed via the Windows installer package. Patch
provided by Alexandre Garnier. (markt)
</add>
+ <add>
+ <bug>56829</bug>: Add the ability for users to define their own values
+ for <code>_RUNJAVA</code> and <code>_RUNJBD</code>. Based on a patch by
+ Neeme Praks. (markt)
+ </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org