Author: markt
Date: Thu Aug 18 16:55:06 2011
New Revision: 1159311
URL: http://svn.apache.org/viewvc?rev=1159311&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47880
Clarify error messages in *.sh files to mention that if a script is not found
it might be because execute permission is needed.
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/src/bin/digest.sh
tomcat/tc5.5.x/trunk/container/catalina/src/bin/shutdown.sh
tomcat/tc5.5.x/trunk/container/catalina/src/bin/startup.sh
tomcat/tc5.5.x/trunk/container/catalina/src/bin/version.sh
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1159311&r1=1159310&r2=1159311&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Aug 18 16:55:06 2011
@@ -25,13 +25,6 @@ $Id$
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47880
- Clarify error messages in *.sh files to mention that if a script is not
- found it might be because execute permission is needed.
- http://svn.apache.org/viewvc?rev=1088179&view=rev
- +1: kkolinko, markt, jfclere
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51042
Don't notify session creation listeners when changing session ID on
authentication
Modified: tomcat/tc5.5.x/trunk/container/catalina/src/bin/digest.sh
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/bin/digest.sh?rev=1159311&r1=1159310&r2=1159311&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/catalina/src/bin/digest.sh (original)
+++ tomcat/tc5.5.x/trunk/container/catalina/src/bin/digest.sh Thu Aug 18
16:55:06 2011
@@ -40,6 +40,7 @@ EXECUTABLE=tool-wrapper.sh
# Check that target executable exists
if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then
echo "Cannot find $PRGDIR/$EXECUTABLE"
+ echo "The file is absent or does not have execute permission"
echo "This file is needed to run this program"
exit 1
fi
Modified: tomcat/tc5.5.x/trunk/container/catalina/src/bin/shutdown.sh
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/bin/shutdown.sh?rev=1159311&r1=1159310&r2=1159311&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/catalina/src/bin/shutdown.sh (original)
+++ tomcat/tc5.5.x/trunk/container/catalina/src/bin/shutdown.sh Thu Aug 18
16:55:06 2011
@@ -40,6 +40,7 @@ EXECUTABLE=catalina.sh
# Check that target executable exists
if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then
echo "Cannot find $PRGDIR/$EXECUTABLE"
+ echo "The file is absent or does not have execute permission"
echo "This file is needed to run this program"
exit 1
fi
Modified: tomcat/tc5.5.x/trunk/container/catalina/src/bin/startup.sh
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/bin/startup.sh?rev=1159311&r1=1159310&r2=1159311&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/catalina/src/bin/startup.sh (original)
+++ tomcat/tc5.5.x/trunk/container/catalina/src/bin/startup.sh Thu Aug 18
16:55:06 2011
@@ -56,6 +56,7 @@ if $os400; then
else
if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then
echo "Cannot find $PRGDIR/$EXECUTABLE"
+ echo "The file is absent or does not have execute permission"
echo "This file is needed to run this program"
exit 1
fi
Modified: tomcat/tc5.5.x/trunk/container/catalina/src/bin/version.sh
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/bin/version.sh?rev=1159311&r1=1159310&r2=1159311&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/catalina/src/bin/version.sh (original)
+++ tomcat/tc5.5.x/trunk/container/catalina/src/bin/version.sh Thu Aug 18
16:55:06 2011
@@ -40,6 +40,7 @@ EXECUTABLE=catalina.sh
# Check that target executable exists
if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then
echo "Cannot find $PRGDIR/$EXECUTABLE"
+ echo "The file is absent or does not have execute permission"
echo "This file is needed to run this program"
exit 1
fi
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=1159311&r1=1159310&r2=1159311&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Thu Aug 18
16:55:06 2011
@@ -143,6 +143,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <update>
+ Clarify error messages in *.sh files to mention that if a script is
+ not found it might be because execute permission is needed. (kkolinko)
+ </update>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 5.5.33 (jim)" rtext="released 2011-02-10">
<subsection name="General">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
