The part of this patch that changes setclasspath.bat is broken. The if condition line should be:
+if not "%JAVA_ENDORSED_DIRS%" == "" goto gotEndorseddir I.e., there should be a second '%' after the env variable name. Note: an error in the .sh part of the patch has already been fixed as http://svn.apache.org/viewvc?view=rev&revision=727303 2008/12/5 <ma...@apache.org>: > Author: markt > Date: Fri Dec 5 06:27:57 2008 > New Revision: 723738 > > URL: http://svn.apache.org/viewvc?rev=723738&view=rev > Log: > https://issues.apache.org/bugzilla/show_bug.cgi?id=46232 > Don't override the endorsed dir if the user has set it > Based on a patch by Russ Tokuyama > > Modified: > tomcat/trunk/bin/setclasspath.bat > tomcat/trunk/bin/setclasspath.sh > > Modified: tomcat/trunk/bin/setclasspath.bat > URL: > http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.bat?rev=723738&r1=723737&r2=723738&view=diff > ============================================================================== > --- tomcat/trunk/bin/setclasspath.bat (original) > +++ tomcat/trunk/bin/setclasspath.bat Fri Dec 5 06:27:57 2008 > @@ -61,8 +61,11 @@ > 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 > +:gotEndorseddir > > rem Set standard CLASSPATH > rem Note that there are no quotes as we do not want to introduce random > > Modified: tomcat/trunk/bin/setclasspath.sh > URL: > http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.sh?rev=723738&r1=723737&r2=723738&view=diff > ============================================================================== > --- tomcat/trunk/bin/setclasspath.sh (original) > +++ tomcat/trunk/bin/setclasspath.sh Fri Dec 5 06:27:57 2008 > @@ -95,8 +95,11 @@ > fi > fi > > -# Set the default -Djava.endorsed.dirs argument > -JAVA_ENDORSED_DIRS="$BASEDIR"/endorsed > +# 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 > +fi > > # Set standard CLASSPATH > if [ "$1" = "javac" ] ; then > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
