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 2013/07/25 21:27:06 UTC
svn commit: r1507098 - in /tomcat/tc7.0.x/trunk: ./ bin/daemon.sh
webapps/docs/changelog.xml
Author: markt
Date: Thu Jul 25 19:27:05 2013
New Revision: 1507098
URL: http://svn.apache.org/r1507098
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55297
Look in CATALINA_HOME for jsvc if it isn't specified and isn't found in CATALINA_BASE
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/bin/daemon.sh
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1507096
Modified: tomcat/tc7.0.x/trunk/bin/daemon.sh
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/daemon.sh?rev=1507098&r1=1507097&r2=1507098&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/daemon.sh (original)
+++ tomcat/tc7.0.x/trunk/bin/daemon.sh Thu Jul 25 19:27:05 2013
@@ -106,7 +106,13 @@ fi
test ".$CATALINA_HOME" = . && CATALINA_HOME=`cd "$DIRNAME/.." >/dev/null; pwd`
test ".$CATALINA_BASE" = . && CATALINA_BASE="$CATALINA_HOME"
test ".$CATALINA_MAIN" = . && CATALINA_MAIN=org.apache.catalina.startup.Bootstrap
-test ".$JSVC" = . && JSVC="$CATALINA_BASE/bin/jsvc"
+# If not explicitly set, look for jsvc in CATALINA_BASE first then CATALINA_HOME
+if [ -z $JSVC ]; then
+ JSVC="$CATALINA_BASE/bin/jsvc"
+ if [ ! -x $JSVC ]; then
+ JSVC="$CATALINA_HOME/bin/jsvc"
+ fi
+fi
# Set the default service-start wait time if necessary
test ".$SERVICE_START_WAIT_TIME" = . && SERVICE_START_WAIT_TIME=10
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=1507098&r1=1507097&r2=1507098&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jul 25 19:27:05 2013
@@ -202,6 +202,11 @@
Update package renamed version of Commons FileUpload to the latest code
from Commons FileUpload trunk. (markt)
</update>
+ <fix>
+ <bug>55297</bug>: When looking for the jsvc executable, if an explicit
+ path is not set and it is not found in $CATALINA_BASE, look in
+ $CATALINA_HOME as well. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org