funkman 2005/01/27 08:48:48
Modified: catalina/src/bin setclasspath.sh
webapps/docs changelog.xml
Log:
Ensure that any user defined CLASSPATH variables are not used on startup.
Revision Changes Path
1.12 +5 -2 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- setclasspath.sh 10 Jan 2005 18:16:10 -0000 1.11
+++ setclasspath.sh 27 Jan 2005 16:48:48 -0000 1.12
@@ -4,6 +4,9 @@
# $Id$
#
-----------------------------------------------------------------------------
+# First clear out the user classpath
+CLASSPATH=
+
# Make sure prerequisite environment variables are set
if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then
echo "Neither the JAVA_HOME nor the JRE_HOME environment variable is
defined"
@@ -46,7 +49,7 @@
# -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
+ # this will not work if the user belongs in secondary groups
eval
else
echo "The BASEDIR environment variable is not defined correctly"
1.228 +14 -11 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.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- changelog.xml 26 Jan 2005 14:55:59 -0000 1.227
+++ changelog.xml 27 Jan 2005 16:48:48 -0000 1.228
@@ -30,28 +30,31 @@
<subsection name="Catalina">
<changelog>
<fix>
- <bug>33187</bug>: Remove any logging of the password in the JAAS
realm,
+ <bug>33187</bug>: Remove any logging of the password in the JAAS
realm,
submitted by Andrew Jaquith (remm)
</fix>
<fix>
- <bug>33033</bug>: Don't do anything to the response in the
ErrorReportValve
+ <bug>33033</bug>: Don't do anything to the response in the
ErrorReportValve
if data has already been written (remm)
</fix>
<update>
Add charset support for the URLs used by the tasks, to remove
deprecation (remm)
</update>
<fix>
- <bug>26135</bug>: Workaround for memory leak when reloading Struts
+ <bug>26135</bug>: Workaround for memory leak when reloading Struts
based web applications by clearing the bean instrospector cache of
the JVM on
classloader stop, submitted by Tobias Löfstrand (remm)
</fix>
+ <fix>
+ Ensure that if CLASSPATH is declared on startup - it is not used.
(funkman)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
<changelog>
<fix>
- <bug>33223</bug>: pageContext.forward and jsp:include result
+ <bug>33223</bug>: pageContext.forward and jsp:include result
in StringIndexOutOfBoundsException (luehe)
</fix>
</changelog>
@@ -65,8 +68,8 @@
Add installer for mod_jk on IIS. (mturk)
</add>
<add>
- New store config module for better server.xml saving support.<br/>
- Add <Listener
className="org.apache.catalina.storeconfig.StoreConfigLifecycleListener" />
to your server.xml (pero)
+ New store config module for better server.xml saving support.<br/>
+ Add <Listener
className="org.apache.catalina.storeconfig.StoreConfigLifecycleListener" />
to your server.xml (pero)
</add>
<update>
<bug>32081</bug>: Remove the JDK requirement from the Unix scripts,
submitted
@@ -162,12 +165,12 @@
<subsection name="Cluster">
<changelog>
- <fix>
+ <fix>
correct JvmRouteSessionIDBinderListener MBean name to
<domain>:type=Listener,name=JvmRouteSessionIDBinderListener,host=<host>
(pero)
</fix>
- <add>
- JMX support to SimpleTcpCluster, ReplicationTransmitter and
all senders (pero)
- </add>
+ <add>
+ JMX support to SimpleTcpCluster, ReplicationTransmitter and all
senders (pero)
+ </add>
</changelog>
</subsection>
@@ -188,7 +191,7 @@
(remm)
</fix>
<fix>
- <bug>32771</bug>: Cannot undeploy/deploy misconfigured app after
tomcat startup,
+ <bug>32771</bug>: Cannot undeploy/deploy misconfigured app after
tomcat startup,
submitted by Gabriele Garuglieri (remm)
</fix>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
