Author: rjung Date: Thu Jun 23 11:27:57 2011 New Revision: 1138835 URL: http://svn.apache.org/viewvc?rev=1138835&view=rev Log: Remove unnecessary variable BASEDIR from scripts.
Modified: tomcat/trunk/bin/catalina.bat tomcat/trunk/bin/catalina.sh tomcat/trunk/bin/setclasspath.bat tomcat/trunk/bin/setclasspath.sh tomcat/trunk/bin/tool-wrapper.bat tomcat/trunk/bin/tool-wrapper.sh tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/bin/catalina.bat URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.bat?rev=1138835&r1=1138834&r2=1138835&view=diff ============================================================================== --- tomcat/trunk/bin/catalina.bat (original) +++ tomcat/trunk/bin/catalina.bat Thu Jun 23 11:27:57 2011 @@ -150,7 +150,6 @@ echo Cannot find "%CATALINA_HOME%\bin\se echo This file is needed to run this program goto end :okSetclasspath -set "BASEDIR=%CATALINA_HOME%" call "%CATALINA_HOME%\bin\setclasspath.bat" %1 if errorlevel 1 goto end Modified: tomcat/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1138835&r1=1138834&r2=1138835&view=diff ============================================================================== --- tomcat/trunk/bin/catalina.sh (original) +++ tomcat/trunk/bin/catalina.sh Thu Jun 23 11:27:57 2011 @@ -167,11 +167,9 @@ if $os400; then # 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 else 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" Modified: tomcat/trunk/bin/setclasspath.bat URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.bat?rev=1138835&r1=1138834&r2=1138835&view=diff ============================================================================== --- tomcat/trunk/bin/setclasspath.bat (original) +++ tomcat/trunk/bin/setclasspath.bat Thu Jun 23 11:27:57 2011 @@ -67,21 +67,10 @@ echo This environment variable is needed goto exit :okJava -if not "%BASEDIR%" == "" goto gotBasedir -echo The BASEDIR environment variable is not defined -echo This environment variable is needed to run this program -goto exit -:gotBasedir -if exist "%BASEDIR%\bin\setclasspath.bat" goto okBasedir -echo The BASEDIR environment variable is not defined correctly -echo This environment variable is needed to run this program -goto exit -:okBasedir - rem Don't override the endorsed dir if the user has set it previously if not "%JAVA_ENDORSED_DIRS%" == "" goto gotEndorseddir rem Set the default -Djava.endorsed.dirs argument -set "JAVA_ENDORSED_DIRS=%BASEDIR%\endorsed" +set "JAVA_ENDORSED_DIRS=%CATALINA_HOME%\endorsed" :gotEndorseddir rem Set standard command for invoking Java. Modified: tomcat/trunk/bin/setclasspath.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.sh?rev=1138835&r1=1138834&r2=1138835&view=diff ============================================================================== --- tomcat/trunk/bin/setclasspath.sh (original) +++ tomcat/trunk/bin/setclasspath.sh Thu Jun 23 11:27:57 2011 @@ -75,29 +75,11 @@ if [ "$1" = "debug" ] ; then fi fi fi -if [ -z "$BASEDIR" ]; then - echo "The BASEDIR environment variable is not defined" - echo "This environment variable is needed to run this program" - exit 1 -fi -if [ ! -x "$BASEDIR"/bin/setclasspath.sh ]; then - 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 # Don't override the endorsed dir if the user has set it previously if [ -z "$JAVA_ENDORSED_DIRS" ]; then # Set the default -Djava.endorsed.dirs argument - JAVA_ENDORSED_DIRS="$BASEDIR"/endorsed + JAVA_ENDORSED_DIRS="$CATALINA_HOME"/endorsed fi # Set standard commands for invoking Java. Modified: tomcat/trunk/bin/tool-wrapper.bat URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/tool-wrapper.bat?rev=1138835&r1=1138834&r2=1138835&view=diff ============================================================================== --- tomcat/trunk/bin/tool-wrapper.bat (original) +++ tomcat/trunk/bin/tool-wrapper.bat Thu Jun 23 11:27:57 2011 @@ -70,7 +70,6 @@ echo Cannot find "%CATALINA_HOME%\bin\se echo This file is needed to run this program goto end :okSetclasspath -set "BASEDIR=%CATALINA_HOME%" call "%CATALINA_HOME%\bin\setclasspath.bat" %1 if errorlevel 1 goto end Modified: tomcat/trunk/bin/tool-wrapper.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/tool-wrapper.sh?rev=1138835&r1=1138834&r2=1138835&view=diff ============================================================================== --- tomcat/trunk/bin/tool-wrapper.sh (original) +++ tomcat/trunk/bin/tool-wrapper.sh Thu Jun 23 11:27:57 2011 @@ -105,11 +105,9 @@ if $os400; then # 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 else 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" Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1138835&r1=1138834&r2=1138835&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Jun 23 11:27:57 2011 @@ -217,6 +217,9 @@ <fix> <bug>51206</bug>: Make CATALINA_BASE visible for setenv.sh. (rjung) </fix> + <update> + Remove unnecessary variable BASEDIR from scripts. (rjung) + </update> </changelog> </subsection> </section> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org