Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org Received: (qmail 86879 invoked from network); 17 Nov 2004 20:18:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 17 Nov 2004 20:18:10 -0000 Received: (qmail 37470 invoked by uid 500); 17 Nov 2004 20:17:53 -0000 Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 37384 invoked by uid 500); 17 Nov 2004 20:17:53 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 37334 invoked by uid 500); 17 Nov 2004 20:17:52 -0000 Received: (qmail 37306 invoked by uid 99); 17 Nov 2004 20:17:52 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 17 Nov 2004 12:17:48 -0800 Received: (qmail 86593 invoked by uid 1670); 17 Nov 2004 20:17:47 -0000 Date: 17 Nov 2004 20:17:47 -0000 Message-ID: <20041117201747.86592.qmail@minotaur.apache.org> From: yoavs@apache.org To: jakarta-tomcat-catalina-cvs@apache.org Subject: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N yoavs 2004/11/17 12:17:47 Modified: catalina/src/bin catalina.sh setclasspath.sh startup.sh webapps/docs changelog.xml Log: Bugzilla 31132: better -x/-r handling for OS/400 in startup scripts Revision Changes Path 1.17 +15 -6 jakarta-tomcat-catalina/catalina/src/bin/catalina.sh Index: catalina.sh =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- catalina.sh 28 Jul 2004 15:49:19 -0000 1.16 +++ catalina.sh 17 Nov 2004 20:17:46 -0000 1.17 @@ -91,13 +91,22 @@ fi # Get standard Java environment variables -if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then +if $os400; then + # -r will Only work on the os400 if the files are: + # 1. owned by the user + # 2. owned by the PRIMARY group of the user + # this will not work if the user belongs in secondary groups BASEDIR="$CATALINA_HOME" - . "$CATALINA_HOME"/bin/setclasspath.sh + . "$CATALINA_HOME"/bin/setclasspath.sh else - echo "Cannot find $CATALINA_HOME/bin/setclasspath.sh" - echo "This file is needed to run this program" - exit 1 + if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then + BASEDIR="$CATALINA_HOME" + . "$CATALINA_HOME"/bin/setclasspath.sh + else + echo "Cannot find $CATALINA_HOME/bin/setclasspath.sh" + echo "This file is needed to run this program" + exit 1 + fi fi # Add on extra jar files to CLASSPATH 1.10 +12 -4 jakarta-tomcat-catalina/catalina/src/bin/setclasspath.sh Index: setclasspath.sh =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/setclasspath.sh,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- setclasspath.sh 14 Oct 2004 17:32:04 -0000 1.9 +++ setclasspath.sh 17 Nov 2004 20:17:46 -0000 1.10 @@ -31,9 +31,17 @@ exit 1 fi if [ ! -x "$BASEDIR"/bin/setclasspath.sh ]; then - echo "The BASEDIR environment variable is not defined correctly" - echo "This environment variable is needed to run this program" - exit 1 + if $os400; then + # -x will Only work on the os400 if the files are: + # 1. owned by the user + # 2. owned by the PRIMARY group of the user + # this will not work if the user belongs in secondary groups + eval + else + echo "The BASEDIR environment variable is not defined correctly" + echo "This environment variable is needed to run this program" + exit 1 + fi fi # Set the default -Djava.endorsed.dirs argument 1.4 +21 -6 jakarta-tomcat-catalina/catalina/src/bin/startup.sh Index: startup.sh =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/startup.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- startup.sh 4 Aug 2002 18:19:43 -0000 1.3 +++ startup.sh 17 Nov 2004 20:17:46 -0000 1.4 @@ -5,6 +5,13 @@ # $Id$ # ----------------------------------------------------------------------------- +# Better OS/400 detection: see Bugzilla 31132 +os400=false +case "`uname`" in +CYGWIN*) cygwin=true;; +OS400*) os400=true;; +esac + # resolve links - $0 may be a softlink PRG="$0" @@ -22,10 +29,18 @@ EXECUTABLE=catalina.sh # Check that target executable exists -if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then - echo "Cannot find $PRGDIR/$EXECUTABLE" - echo "This file is needed to run this program" - exit 1 -fi +if $os400; then + # -x will Only work on the os400 if the files are: + # 1. owned by the user + # 2. owned by the PRIMARY group of the user + # this will not work if the user belongs in secondary groups + eval +else + if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then + echo "Cannot find $PRGDIR/$EXECUTABLE" + echo "This file is needed to run this program" + exit 1 + fi +fi exec "$PRGDIR"/"$EXECUTABLE" start "$@" 1.169 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.168 retrieving revision 1.169 diff -u -r1.168 -r1.169 --- changelog.xml 17 Nov 2004 19:47:43 -0000 1.168 +++ changelog.xml 17 Nov 2004 20:17:46 -0000 1.169 @@ -32,6 +32,9 @@ 32235: Sync conf/web.xml MIME types with Apache httpd. (yoavs) + + 31132: Better -x/-r support for OS/400 in startup scripts. (yoavs) + --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org