svn commit: r1558771 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Thu Jan 16 12:43:15 2014 New Revision: 1558771 URL: http://svn.apache.org/r1558771 Log: some +1's Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1558771r1=1558770r2=1558771view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 16 12:43:15 2014 @@ -63,16 +63,16 @@ PATCHES PROPOSED TO BACKPORT: enable the logging of any blocked entities. Backport of https://svn.apache.org/r1549529 http://people.apache.org/~markt/patches/2014-01-13-xml-block-external-tc6-v1.patch - +1: markt, mturk + +1: markt, mturk, funkman -1: * Ensure that sessions IDs are not parsed from URLs for Contexts where disableURLRewriting is true. http://people.apache.org/~markt/patches/2014-01-14-disableURLRewriting-tc6-v1.patch - +1: markt + +1: markt,funkman -1: PATCHES/ISSUES THAT ARE STALLED: -None \ No newline at end of file +None - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1221266 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: funkman Date: Tue Dec 20 14:14:31 2011 New Revision: 1221266 URL: http://svn.apache.org/viewvc?rev=1221266view=rev Log: vote Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1221266r1=1221265r2=1221266view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Dec 20 14:14:31 2011 @@ -102,5 +102,5 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52335 Only handle \% and not \% as escaped in template text. http://svn.apache.org/viewvc?rev=1215121view=rev - +1: markt + +1: markt, funkman -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1221274 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Tue Dec 20 14:23:30 2011 New Revision: 1221274 URL: http://svn.apache.org/viewvc?rev=1221274view=rev Log: some votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1221274r1=1221273r2=1221274view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Dec 20 14:23:30 2011 @@ -77,7 +77,7 @@ PATCHES PROPOSED TO BACKPORT: kkolinko: I tested only that it does not break things with the current released tcnative version 1.1.22 that does not have FIPS mode support. http://people.apache.org/~kkolinko/patches/2011-11-12_tc6_AprLifecycleListener.patch - +1: kkolinko, markt + +1: kkolinko, markt,funkman -1: * Fix autodeployment of applications that have configuration errors. @@ -102,37 +102,37 @@ PATCHES PROPOSED TO BACKPORT: * Reduce overhead from exception handling in UDecoder http://people.apache.org/~kkolinko/patches/2011-11-17_tc6_UDecoder.patch (r1203054 in TC7) - +1: kkolinko + +1: kkolinko,funkman -1: * Align %2f handling between implementations of UDecoder.convert() http://svn.apache.org/viewvc?rev=1203091view=rev - +1: kkolinko + +1: kkolinko,funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52225 Fix ClassCastException in Alias added for existing host via JMX http://svn.apache.org/viewvc?rev=1204856view=rev (without tests; it is r1204860 in TC7) - +1: kkolinko, markt + +1: kkolinko, markt,funkman -1: * Do not throw IllegalArgumentException from parseParameters() call when chunked POST request is too large, but treat it like an IO error. http://svn.apache.org/viewvc?rev=1206200view=rev (without tests; it is r1206205 in TC7) - +1: kkolinko + +1: kkolinko,funkman -1: * Update Commons Daemon to 1.0.8 Change is trivial so no patch provided - +1: mturk, markt + +1: mturk, markt,funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52335 Only handle \% and not \% as escaped in template text. http://svn.apache.org/viewvc?rev=1215121view=rev - +1: markt + +1: markt,funkman -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1214735 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: funkman Date: Thu Dec 15 12:50:25 2011 New Revision: 1214735 URL: http://svn.apache.org/viewvc?rev=1214735view=rev Log: some votes Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1214735r1=1214734r2=1214735view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Dec 15 12:50:25 2011 @@ -42,7 +42,7 @@ PATCHES PROPOSED TO BACKPORT: It is based on r1189256 and r1187027, r1198622 (r1189258, r1187029, r1198623 in TC7) http://people.apache.org/~kkolinko/patches/2011-11-08_tc55_RequestFilterValve_v4.patch - +1: kkolinko + +1: kkolinko,funkman -1: kkolinko: It does its work and prevents app from starting and working. Though @@ -75,7 +75,7 @@ PATCHES PROPOSED TO BACKPORT: svn propset svn:eol-style native connectors/util/java/org/apache/tomcat/util/http/LocalStrings.properties svn propset svn:eol-style native container/catalina/src/share/org/apache/catalina/filters/FailedRequestFilter.java svn propset svn:eol-style native container/webapps/docs/config/filter.xml - +1: kkolinko, markt + +1: kkolinko, markt, funkman -1: * Clean up handling multi-byte chars in the connectors plus makin @@ -84,7 +84,7 @@ PATCHES PROPOSED TO BACKPORT: and r1201452 from TC 6. TC 6 patch applies with small offsets: http://people.apache.org/~rjung/patches/connectors_multi-byte_handling_cleanup-v2.patch +1: rjung - +1: kkolinko (see 5.5 specific version below), markt + +1: kkolinko (see 5.5 specific version below), markt, funkman -1: kkolinko: 5.5 version of the above. No changes besides file paths and line numbers and absence of InternalNioOutputBuffer in TC55: @@ -92,7 +92,7 @@ PATCHES PROPOSED TO BACKPORT: * Align %2f handling between implementations of UDecoder.convert() http://svn.apache.org/viewvc?rev=1203091view=rev - +1: kkolinko, markt + +1: kkolinko, markt, funkman -1: * Remove obsolete build.xml file that was used to download source tree. @@ -108,12 +108,12 @@ PATCHES PROPOSED TO BACKPORT: Fix ClassCastException in Alias added for existing host via JMX http://svn.apache.org/viewvc?rev=1204856view=rev (without tests; it is r1204860 in TC7) - +1: kkolinko, markt + +1: kkolinko, markt, funkman -1: * Do not throw IllegalArgumentException from parseParameters() call when chunked POST request is too large, but treat it like an IO error. http://svn.apache.org/viewvc?rev=1206200view=rev (without tests; it is r1206205 in TC7) - +1: kkolinko, markt + +1: kkolinko, markt,funkman -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1066302 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Wed Feb 2 01:48:28 2011 New Revision: 1066302 URL: http://svn.apache.org/viewvc?rev=1066302view=rev Log: some votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1066302r1=1066301r2=1066302view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Feb 2 01:48:28 2011 @@ -92,7 +92,7 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50642 Better memory leak protection for HttpClient keep-alive thread http://svn.apache.org/viewvc?rev=1064652view=rev - +1: markt, kkolinko + +1: markt, kkolinko,funkman -1: kkolinko: About the docs: it might be better to be explicit: @@ -104,14 +104,14 @@ PATCHES PROPOSED TO BACKPORT: authentication if client indicates that they are expected. (It is backport of r987948.) https://issues.apache.org/bugzilla/attachment.cgi?id=26576 - +1: kkolinko, markt + +1: kkolinko, markt,funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50325 Use JVM provided solutions to CVE-2009-3555 if available (i.e. RFC 5746 support) http://svn.apache.org/viewvc?rev=1065859view=rev - +1: markt, kkolinko + +1: markt, kkolinko, funkman -1: kkolinko: I think it would be better to do not change visibility of @@ -123,10 +123,10 @@ PATCHES PROPOSED TO BACKPORT: InternalNioInputBuffer should honor maxHttpHeadSize (backport of r1065939) http://people.apache.org/~kkolinko/patches/2011-02-01_tc6_50631.patch - +1: kkolinko, markt + +1: kkolinko, markt, funkman -1: * Improve HTTP specification compliance http://svn.apache.org/viewvc?rev=1066244view=rev - +1: kkolinko, rjung, markt + +1: kkolinko, rjung, markt, funkman -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1056166 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Fri Jan 7 02:18:15 2011 New Revision: 1056166 URL: http://svn.apache.org/viewvc?rev=1056166view=rev Log: some +1's Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1056166r1=1056165r2=1056166view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 7 02:18:15 2011 @@ -62,7 +62,7 @@ PATCHES PROPOSED TO BACKPORT: resources already present in the webapp. http://svn.apache.org/viewvc?view=revisionrevision=936825 http://people.apache.org/~rjung/patches/2010-05-14-loader-backport-r936825.patch - +1: rjung + +1: rjung, funkman -1: -0: kkolinko: The patch itself is OK, but I think having a synonym will cause confusion. I'd prefer not to invent a new name, but mention the @@ -74,7 +74,7 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=961948view=rev http://svn.apache.org/viewvc?rev=963106view=rev http://svn.apache.org/viewvc?rev=966863view=rev - +1: markt, kkolinko + +1: markt, kkolinko,funkman -1: kkolinko: I was worried that ELFunctionMapper$PrivilegedGetTccl should be preloaded in o.a.jasper.security.SecurityClassLoad, @@ -95,7 +95,7 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1004415view=rev http://svn.apache.org/viewvc?rev=1004912view=rev (fix for includes) +1: timw - +1: markt, kkolinko if http://svn.apache.org/viewvc?rev=1033897view=rev + +1: markt, kkolinko,funkman if http://svn.apache.org/viewvc?rev=1033897view=rev is also applied -1: @@ -226,7 +226,7 @@ PATCHES PROPOSED TO BACKPORT: Improve JreMemoryLeakPreventionListener to load javax.security.auth.login.Configuration to avoid redeployment leak. http://svn.apache.org/viewvc?rev=1042029view=rev - +1: slaurent, kkolinko + +1: slaurent, kkolinko, funkman -0: markt - See http://markmail.org/message/mnowpijhnxg554t5 -1: @@ -285,30 +285,30 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50453 Correct handle multiple X-Forwarded-For headers in RemoteIpValve http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?r1=1055482r2=1055481pathrev=1055482 - +1: markt, fhanik + +1: markt, fhanik, funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50547 Add time stamp for CHANGE_SESSION_ID and SESSION_EXPIRED message. http://svn.apache.org/viewvc?view=revisionrevision=1055798 - +1: kfujino, fhanik + +1: kfujino, fhanik, funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47319 Return IP address rather than null for getRemoteHost() and the APR connector http://people.apache.org/~markt/patches/2011-01-06-bug47319-tc6.patch - +1: markt, fhanik + +1: markt, fhanik, funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50550 Requests for a newly created directory using MKCOL should not result in a 404 http://svn.apache.org/viewvc?rev=1055975view=rev - +1: markt + +1: markt, funkman +1: fhanik - what does the boolean 'result' signify if the first unload() is false, and the second is true? -1: * Add helper class to allow a shared data source with different credentials http://svn.apache.org/viewvc?view=revisionrevision=1055989 - +1: fhanik + +1: fhanik, funkman -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1031043 - in /tomcat/trunk: bin/catalina.sh bin/configtest.sh build.xml java/org/apache/catalina/startup/Bootstrap.java java/org/apache/catalina/startup/Catalina.java
Author: funkman
Date: Thu Nov 4 15:47:56 2010
New Revision: 1031043
URL: http://svn.apache.org/viewvc?rev=1031043view=rev
Log:
Allow for configest
Now one may type in bin/configtest.sh and then check the
exit code.
This will try to use the default loggers so it may spew
a lot to stdout/err so as to avoid clobbering existing
log files in use.
Potential future todo
- Making the parsing of server.xml more finicky as to avoid
bad values being ignored (example - use 'x8005' as the
shutdown port - and tomcat still starts up fine )
Added:
tomcat/trunk/bin/configtest.sh (with props)
Modified:
tomcat/trunk/bin/catalina.sh
tomcat/trunk/build.xml
tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
Modified: tomcat/trunk/bin/catalina.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1031043r1=1031042r2=1031043view=diff
==
--- tomcat/trunk/bin/catalina.sh (original)
+++ tomcat/trunk/bin/catalina.sh Thu Nov 4 15:47:56 2010
@@ -474,6 +474,16 @@ elif [ $1 = stop ] ; then
fi
fi
+elif [ $1 = configtest ] ; then
+
+eval \$_RUNJAVA\ $JAVA_OPTS $CATALINA_OPTS \
+ -Djava.endorsed.dirs=\$JAVA_ENDORSED_DIRS\ -classpath \$CLASSPATH\ \
+ -Dcatalina.base=\$CATALINA_BASE\ \
+ -Dcatalina.home=\$CATALINA_HOME\ \
+ -Djava.io.tmpdir=\$CATALINA_TMPDIR\ \
+ org.apache.catalina.startup.Bootstrap configtest
+exit $?
+
elif [ $1 = version ] ; then
$_RUNJAVA \
Added: tomcat/trunk/bin/configtest.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/configtest.sh?rev=1031043view=auto
==
--- tomcat/trunk/bin/configtest.sh (added)
+++ tomcat/trunk/bin/configtest.sh Thu Nov 4 15:47:56 2010
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the License); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an AS IS BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# -
+# configtest for the CATALINA Server
+#
+# $Id: configtest.sh $
+# -
+
+# Better OS/400 detection: see Bugzilla 31132
+os400=false
+darwin=false
+case `uname` in
+CYGWIN*) cygwin=true;;
+OS400*) os400=true;;
+Darwin*) darwin=true;;
+esac
+
+# resolve links - $0 may be a softlink
+PRG=$0
+
+while [ -h $PRG ] ; do
+ ls=`ls -ld $PRG`
+ link=`expr $ls : '.*- \(.*\)$'`
+ if expr $link : '/.*' /dev/null; then
+PRG=$link
+ else
+PRG=`dirname $PRG`/$link
+ fi
+done
+
+PRGDIR=`dirname $PRG`
+EXECUTABLE=catalina.sh
+
+# Check that target executable exists
+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 configtest $@
+
Propchange: tomcat/trunk/bin/configtest.sh
--
svn:eol-style = native
Propchange: tomcat/trunk/bin/configtest.sh
--
svn:executable = *
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1031043r1=1031042r2=1031043view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Nov 4 15:47:56 2010
@@ -1763,6 +1763,7 @@ Apache Tomcat ${version} native binaries
tarfile=${tomcat.release}/v${version}/bin/${final.name}.tar.gz
tarfileset dir=${tomcat.dist} mode=755 prefix=${final.name}
include name=bin/catalina.sh /
+include name=bin/configtest.sh /
include name=bin/digest.sh /
include name=bin/jasper.sh /
include name=bin/jspc.sh /
@@ -1792,6 +1793,7 @@ Apache Tomcat ${version} native binaries
include name=RUNNING.txt /
include
svn commit: r1030655 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Wed Nov 3 20:36:22 2010 New Revision: 1030655 URL: http://svn.apache.org/viewvc?rev=1030655view=rev Log: some votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1030655r1=1030654r2=1030655view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov 3 20:36:22 2010 @@ -106,7 +106,7 @@ PATCHES PROPOSED TO BACKPORT: Correct race condition in StandardThreadExecutor that can lead to long delays in processing requests. Patch provided by Sylvain Laurent. https://issues.apache.org/bugzilla/attachment.cgi?id=25865 - +1: markt, rjung + +1: markt, rjung, funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49860 @@ -147,7 +147,7 @@ PATCHES PROPOSED TO BACKPORT: * Improve recycling of processors in Http11NioProtocol http://svn.apache.org/viewvc?rev=1022415view=rev - +1: kkolinko, rjung + +1: kkolinko, rjung,funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50140 @@ -163,7 +163,7 @@ PATCHES PROPOSED TO BACKPORT: * Update Commons daemon to 1.0.4 Version 1.0.4 is bug fixing release. (Patch is trivial changing the version number to 1.0.4 in build.properties.default, so not provided) - +1: mturk, rjung, kkolinko + +1: mturk, rjung, kkolinko,funkman -1: * Additional minor patch / followup to r1030188 @@ -171,7 +171,7 @@ PATCHES PROPOSED TO BACKPORT: To reproduce, send a HTTP/1.1 request with an invalid value for the port number in the Host header. http://people.apache.org/~kkolinko/patches/2010-11-03_tc6_49099_Http11Processor.patch - +1: kkolinko + +1: kkolinko,funkman -1: * Followup to r1030188 @@ -180,5 +180,5 @@ PATCHES PROPOSED TO BACKPORT: To reproduce, start Tomcat without the ROOT webapp and make an invalid request. An NPE happens. It is backport of r966570, r1030253. http://people.apache.org/~kkolinko/patches/2010-11-03_tc6_49099_StandardEngine.patch - +1: kkolinko + +1: kkolinko, funkman -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1029719 - /tomcat/trunk/java/org/apache/juli/FileHandler.java
Author: funkman
Date: Mon Nov 1 15:48:32 2010
New Revision: 1029719
URL: http://svn.apache.org/viewvc?rev=1029719view=rev
Log:
bug 49180
Add option to disable log rotation in FileHandler
credit: Pid (pidster at apache )
Modified:
tomcat/trunk/java/org/apache/juli/FileHandler.java
Modified: tomcat/trunk/java/org/apache/juli/FileHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/FileHandler.java?rev=1029719r1=1029718r2=1029719view=diff
==
--- tomcat/trunk/java/org/apache/juli/FileHandler.java (original)
+++ tomcat/trunk/java/org/apache/juli/FileHandler.java Mon Nov 1 15:48:32 2010
@@ -95,6 +95,12 @@ public class FileHandler
/**
+ * Determines whether the logfile is rotatable
+ */
+private boolean rotatable = true;
+
+
+/**
* The PrintWriter to which we are currently logging, if any.
*/
private volatile PrintWriter writer = null;
@@ -134,7 +140,7 @@ public class FileHandler
writerLock.readLock().lock();
// If the date has changed, switch log files
-if (!date.equals(tsDate)) {
+if (rotatable !date.equals(tsDate)) {
// Update to writeLock before we switch
writerLock.readLock().unlock();
writerLock.writeLock().lock();
@@ -245,6 +251,7 @@ public class FileHandler
ClassLoader cl = Thread.currentThread().getContextClassLoader();
// Retrieve configuration of logging file name
+rotatable = Boolean.parseBoolean(getProperty(className + .rotatable,
true));
if (directory == null)
directory = getProperty(className + .directory, logs);
if (prefix == null)
@@ -326,7 +333,7 @@ public class FileHandler
writerLock.writeLock().lock();
try {
String pathname = dir.getAbsolutePath() + File.separator +
-prefix + date + suffix;
+prefix + (rotatable ? date : ) + suffix;
String encoding = getEncoding();
FileOutputStream fos = new FileOutputStream(pathname, true);
OutputStream os = bufferSize0?new
BufferedOutputStream(fos,bufferSize):fos;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1029720 - /tomcat/trunk/webapps/docs/changelog.xml
Author: funkman Date: Mon Nov 1 15:53:22 2010 New Revision: 1029720 URL: http://svn.apache.org/viewvc?rev=1029720view=rev Log: changelog update Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1029720r1=1029719r2=1029720view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Mon Nov 1 15:53:22 2010 @@ -83,6 +83,10 @@ default, the existing Tomcat 6.0.x welcome file handling is used. (markt) /add + fix +bug49180/bug: Add option to disable log rotation in +juli FileHandler. credit: Pid (pidster at apache ) + /fix /changelog /subsection subsection name=Jasper @@ -165,6 +169,9 @@ be installed. If a 64-bit JDK is selected, the 64-bit service wrapper and the 64-bit native DLL will be installed. (markt) /add + fix +bug49819/bug: redesign of home page by Pid (pidster at apache ) + /fix /changelog /subsection /section - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1028737 - /tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
Author: funkman
Date: Fri Oct 29 13:43:30 2010
New Revision: 1028737
URL: http://svn.apache.org/viewvc?rev=1028737view=rev
Log:
for resourceOnlyServlets allow whitespace in the comma
seperated list.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1028737r1=1028736r2=1028737view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Fri Oct 29
13:43:30 2010
@@ -826,13 +826,14 @@ public class StandardContext extends Con
@Override
public void setResourceOnlyServlets(String resourceOnlyServlets) {
this.resourceOnlyServlets.clear();
-if (resourceOnlyServlets == null ||
-resourceOnlyServlets.length() == 0) {
+if (resourceOnlyServlets == null) {
return;
}
-String[] servletNames = resourceOnlyServlets.split(,);
-for (String servletName : servletNames) {
-this.resourceOnlyServlets.add(servletName);
+for (String servletName : resourceOnlyServlets.split(,)) {
+servletName = servletName.trim();
+if (servletName.length()0) {
+this.resourceOnlyServlets.add(servletName);
+}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r988079 - in /tomcat/site/trunk: docs/legal.html xdocs/legal.xml
Author: funkman Date: Mon Aug 23 11:35:27 2010 New Revision: 988079 URL: http://svn.apache.org/viewvc?rev=988079view=rev Log: s/Sun Microsystems, Inc/Oracle Corporation/ Modified: tomcat/site/trunk/docs/legal.html tomcat/site/trunk/xdocs/legal.xml Modified: tomcat/site/trunk/docs/legal.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/legal.html?rev=988079r1=988078r2=988079view=diff == --- tomcat/site/trunk/docs/legal.html (original) +++ tomcat/site/trunk/docs/legal.html Mon Aug 23 11:35:27 2010 @@ -204,8 +204,8 @@ Software Foundation p Sun, Sun Microsystems, Solaris, Java, JavaServer Web Development Kit, -and JavaServer Pages are trademarks or registered trademarks of Sun -Microsystems, Inc. UNIX is a registered trademark in the United States +and JavaServer Pages are trademarks or registered trademarks of Oracle +Corporation. UNIX is a registered trademark in the United States and other countries, exclusively licensed through 'The Open Group'. Microsoft, Windows, WindowsNT, and Win32 are registered trademarks of Microsoft Corporation. Linux is a registered trademark of Linus Torvalds. Modified: tomcat/site/trunk/xdocs/legal.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/legal.xml?rev=988079r1=988078r2=988079view=diff == --- tomcat/site/trunk/xdocs/legal.xml (original) +++ tomcat/site/trunk/xdocs/legal.xml Mon Aug 23 11:35:27 2010 @@ -17,8 +17,8 @@ Software Foundation p Sun, Sun Microsystems, Solaris, Java, JavaServer Web Development Kit, -and JavaServer Pages are trademarks or registered trademarks of Sun -Microsystems, Inc. UNIX is a registered trademark in the United States +and JavaServer Pages are trademarks or registered trademarks of Oracle +Corporation. UNIX is a registered trademark in the United States and other countries, exclusively licensed through 'The Open Group'. Microsoft, Windows, WindowsNT, and Win32 are registered trademarks of Microsoft Corporation. Linux is a registered trademark of Linus Torvalds. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r952737 - /tomcat/trunk/RUNNING.txt
Author: funkman Date: Tue Jun 8 17:08:45 2010 New Revision: 952737 URL: http://svn.apache.org/viewvc?rev=952737view=rev Log: s/jre5/jre6/ Modified: tomcat/trunk/RUNNING.txt Modified: tomcat/trunk/RUNNING.txt URL: http://svn.apache.org/viewvc/tomcat/trunk/RUNNING.txt?rev=952737r1=952736r2=952737view=diff == --- tomcat/trunk/RUNNING.txt (original) +++ tomcat/trunk/RUNNING.txt Tue Jun 8 17:08:45 2010 @@ -36,7 +36,7 @@ Running With JRE 6.0 Or Later (1.2) Install the JRE according to the instructions included with the release. (1.3) Set an environment variable named JRE_HOME to the pathname of - the directory into which you installed the JRE, e.g. c:\jre5.0 + the directory into which you installed the JRE, e.g. c:\jre6.0 or /usr/local/java/jre6.0. NOTE: You may also use the full JDK rather than just the JRE. In this @@ -119,7 +119,7 @@ of $CATALINA_HOME: Note that by default Tomcat will first try to load classes and JARs from $CATALINA_BASE/lib and then $CATALINA_HOME/lib. You can place instance specific JARs and classes (eg JDBC drivers) in $CATALINA_BASE/lib whilst keeping the -standard Tomcat JARs in $CATALINA_HOME/lib. +standard Tomcat JARs in $CATALINA_HOME/lib. If you do not set $CATALINA_BASE, $CATALINA_BASE will default to the same value as $CATALINA_HOME, which means that the same directory is used for all relative - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r938737 - /tomcat/trunk/webapps/docs/setup.xml
Author: funkman Date: Wed Apr 28 00:26:27 2010 New Revision: 938737 URL: http://svn.apache.org/viewvc?rev=938737view=rev Log: java 6, not java5 Modified: tomcat/trunk/webapps/docs/setup.xml Modified: tomcat/trunk/webapps/docs/setup.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/setup.xml?rev=938737r1=938736r2=938737view=diff == --- tomcat/trunk/webapps/docs/setup.xml (original) +++ tomcat/trunk/webapps/docs/setup.xml Wed Apr 28 00:26:27 2010 @@ -64,7 +64,7 @@ administration tool and its documentation)./li listrongJava location/strong: The installer will use the registry or the JAVA_HOME environment variable to determine the base path -of a J2SE 5 JRE. +of a J2SE 6 JRE. /li listrongTray icon/strong: When Tomcat is run as a service, there will not be any tray icon present when Tomcat is running. Note that - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r918458 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Wed Mar 3 13:04:00 2010 New Revision: 918458 URL: http://svn.apache.org/viewvc?rev=918458view=rev Log: votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=918458r1=918457r2=918458view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Mar 3 13:04:00 2010 @@ -79,7 +79,7 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48050 NamingContext.createSubcontext method returns Context with wrong name http://people.apache.org/~markt/patches/2010-03-01-bug48050.patch - +1: markt + +1: markt,funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48660 @@ -96,7 +96,7 @@ - Allow the encoding used for web.xml files to be configured, and allow the addWebXmlMappings option to be specified on the command line (r916157) http://people.apache.org/~kkolinko/patches/2010-02-25_tc6_bug48371.patch - +1: kkolinko, markt + +1: kkolinko, markt,funkman -1: @@ -128,7 +128,7 @@ Based on the https://svn.apache.org/viewvc?view=revisionrevision=915861 6.0.x patch is at http://people.apache.org/~mturk/tomcat/patches/915861.patch - +1: mturk, kkolinko, jfclere + +1: mturk, kkolinko, jfclere,funkman -1: * Improve logging behaviour when shutdown occurs via a shutdownhook. If present, @@ -141,7 +141,7 @@ * Add constraint for findleaks manager command http://people.apache.org/~kkolinko/patches/2010-02-28_tc6_findLeaks.patch - +1: kkolinko, mturk, markt, jfclere + +1: kkolinko, mturk, markt, jfclere,funkman -1: * Move sessionDetail.jsp sessionsList.jsp of Manager webapp into WEB-INF @@ -152,10 +152,10 @@ svn move sessionDetail.jsp sessionsList.jsp WEB-INF/jsp/ 2) http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=917598r1=917597r2=917598view=diff - +1: kkolinko, markt + +1: kkolinko, markt,funkman -1: * Amend the messages displayed by Find Leaks diagnostics in the Manager application. http://svn.apache.org/viewvc?rev=917633view=rev - +1: kkolinko, markt, jfclere + +1: kkolinko, markt, jfclere,funkman -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r833125 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Thu Nov 5 18:51:37 2009 New Revision: 833125 URL: http://svn.apache.org/viewvc?rev=833125view=rev Log: proposal for http://svn.apache.org/viewvc?rev=833121view=rev https://issues.apache.org/bugzilla/show_bug.cgi?id=47495 Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=833125r1=833124r2=833125view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Nov 5 18:51:37 2009 @@ -387,4 +387,10 @@ -1: +* If server.xml not readable - be more explicit in letting the user know + http://svn.apache.org/viewvc?rev=833121view=rev + https://issues.apache.org/bugzilla/show_bug.cgi?id=47495 + +1: funkman + -1: + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r833121 - /tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
Author: funkman
Date: Thu Nov 5 18:46:43 2009
New Revision: 833121
URL: http://svn.apache.org/viewvc?rev=833121view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=47495
If server.xml doesnt have read permission - let the user know
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=833121r1=833120r2=833121view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Thu Nov 5
18:46:43 2009
@@ -516,6 +516,9 @@
if ((inputStream == null) (file != null)) {
log.warn(Can't load server.xml from + file.getAbsolutePath());
+if (file.exists() !file.canRead()) {
+log.warn(Permissions incorrect, read permission is not
allowed on the file.);
+}
return;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r833271 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Fri Nov 6 01:49:50 2009 New Revision: 833271 URL: http://svn.apache.org/viewvc?rev=833271view=rev Log: some votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=833271r1=833270r2=833271view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Nov 6 01:49:50 2009 @@ -230,6 +230,7 @@ Use StringBuilder instead of StringBuffer -0: markt for all SBuilder-SBuffer patches. Code cleanup is fine in trunk but no need to backport it + -0: funkman The patches, as well as patches for individual files inside them, are independent of each other. Vote for as many as you want. @@ -400,5 +401,5 @@ http://people.apache.org/~markt/patches/2009-11-05-bug47330-tc6.patch http://people.apache.org/~markt/patches/RemoteIpValve.java http://people.apache.org/~markt/patches/RemoteIpValveTest.java - +1: markt + +1: markt, funkman -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r832792 - /tomcat/trunk/java/org/apache/naming/NamingContext.java
Author: funkman
Date: Wed Nov 4 16:40:16 2009
New Revision: 832792
URL: http://svn.apache.org/viewvc?rev=832792view=rev
Log:
revert based on https://issues.apache.org/bugzilla/show_bug.cgi?id=47512#c4
Modified:
tomcat/trunk/java/org/apache/naming/NamingContext.java
Modified: tomcat/trunk/java/org/apache/naming/NamingContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingContext.java?rev=832792r1=832791r2=832792view=diff
==
--- tomcat/trunk/java/org/apache/naming/NamingContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/NamingContext.java Wed Nov 4 16:40:16
2009
@@ -794,8 +794,13 @@
}
} else if (entry.type == NamingEntry.REFERENCE) {
try {
-return NamingManager.getObjectInstance
+Object obj = NamingManager.getObjectInstance
(entry.value, name, this, env);
+if (obj != null) {
+entry.value = obj;
+entry.type = NamingEntry.ENTRY;
+}
+return obj;
} catch (NamingException e) {
throw e;
} catch (Exception e) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r832793 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Wed Nov 4 16:41:09 2009 New Revision: 832793 URL: http://svn.apache.org/viewvc?rev=832793view=rev Log: withdrawl proposal based on feedback Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=832793r1=832792r2=832793view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov 4 16:41:09 2009 @@ -385,10 +385,4 @@ -1: -* Binding java.lang.reflect.Proxy to JNDI directory raises java.lang.ClassCastException - https://issues.apache.org/bugzilla/show_bug.cgi?id=47512 - http://svn.apache.org/viewvc?rev=832638view=rev - +1: funkman - -1: kkolinko: -https://issues.apache.org/bugzilla/show_bug.cgi?id=47512#c4 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r832636 - in /tomcat/trunk/java/org/apache: catalina/ant/jmx/JMXAccessorTask.java catalina/tribes/transport/bio/BioReceiver.java catalina/valves/JDBCAccessLogValve.java tomcat/util/net/Nio
Author: funkman
Date: Wed Nov 4 00:54:02 2009
New Revision: 832636
URL: http://svn.apache.org/viewvc?rev=832636view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=46947
Code cleanup patch that removes some obsolete null checks
Modified:
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java?rev=832636r1=832635r2=832636view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java Wed Nov
4 00:54:02 2009
@@ -430,10 +430,8 @@
try {
jmxServerConnection = (MBeanServerConnection) pref;
} catch (ClassCastException cce) {
-if (project != null) {
-project.log(wrong object reference + refId + -
+project.log(wrong object reference + refId + -
+ pref.getClass());
-}
return null;
}
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java?rev=832636r1=832635r2=832636view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
Wed Nov 4 00:54:02 2009
@@ -30,7 +30,7 @@
/**
*
* @author Filip Hanik
- * @version $Revision:$ $Date:$
+ * @version $Revision$ $Date$
*/
public class BioReceiver extends ReceiverBase implements Runnable,
ChannelReceiver, ListenCallback {
Modified: tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java?rev=832636r1=832635r2=832636view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java Wed
Nov 4 00:54:02 2009
@@ -462,17 +462,13 @@
getNext().invoke(request, response);
-String remoteHost = EMPTY;
+String remoteHost;
if(resolveHosts)
remoteHost = request.getRemoteHost();
else
remoteHost = request.getRemoteAddr();
-String user = EMPTY;
-if(request != null)
-user = request.getRemoteUser();
-String query=;
-if(request != null)
-query = request.getRequestURI();
+String user = request.getRemoteUser();
+String query=request.getRequestURI();
long bytes = response.getContentCountLong() ;
if(bytes 0)
@@ -482,7 +478,7 @@
String method = EMPTY;
String referer = EMPTY;
String userAgent = EMPTY;
-if (pattern.equals(combined) request != null) {
+if (pattern.equals(combined)) {
virtualHost = request.getServerName();
method = request.getMethod();
referer = request.getHeader(referer);
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java?rev=832636r1=832635r2=832636view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java Wed
Nov 4 00:54:02 2009
@@ -350,7 +350,7 @@
countDown(attachment.getWriteLatch());
}
}catch (CancelledKeyException ckx) {
-if (sk!=null) sk.cancel();
+sk.cancel();
countDown(attachment.getReadLatch());
countDown(attachment.getWriteLatch());
}
@@ -391,4 +391,4 @@
}
}
-}
\ No newline at end of file
+}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r832638 - /tomcat/trunk/java/org/apache/naming/NamingContext.java
Author: funkman
Date: Wed Nov 4 01:18:08 2009
New Revision: 832638
URL: http://svn.apache.org/viewvc?rev=832638view=rev
Log:
Binding java.lang.reflect.Proxy to JNDI directory raises
java.lang.ClassCastException
https://issues.apache.org/bugzilla/show_bug.cgi?id=47512
Also acts as dead code removal
Modified:
tomcat/trunk/java/org/apache/naming/NamingContext.java
Modified: tomcat/trunk/java/org/apache/naming/NamingContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingContext.java?rev=832638r1=832637r2=832638view=diff
==
--- tomcat/trunk/java/org/apache/naming/NamingContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/NamingContext.java Wed Nov 4 01:18:08
2009
@@ -794,13 +794,8 @@
}
} else if (entry.type == NamingEntry.REFERENCE) {
try {
-Object obj = NamingManager.getObjectInstance
+return NamingManager.getObjectInstance
(entry.value, name, this, env);
-if (obj != null) {
-entry.value = obj;
-entry.type = NamingEntry.ENTRY;
-}
-return obj;
} catch (NamingException e) {
throw e;
} catch (Exception e) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r832639 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Wed Nov 4 01:20:33 2009 New Revision: 832639 URL: http://svn.apache.org/viewvc?rev=832639view=rev Log: proposal for 47512 Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=832639r1=832638r2=832639view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov 4 01:20:33 2009 @@ -383,3 +383,11 @@ http://people.apache.org/~kkolinko/patches/2009-11-03_StringBuilder_o_a_c_valves_AccessLogValve.patch +1: kkolinko -1: + + +* Binding java.lang.reflect.Proxy to JNDI directory raises java.lang.ClassCastException + https://issues.apache.org/bugzilla/show_bug.cgi?id=47512 + http://svn.apache.org/viewvc?rev=832638view=rev + +1: funkman + -1: + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r832589 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman
Date: Tue Nov 3 22:50:50 2009
New Revision: 832589
URL: http://svn.apache.org/viewvc?rev=832589view=rev
Log:
votes
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=832589r1=832588r2=832589view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Nov 3 22:50:50 2009
@@ -72,7 +72,7 @@
It is updated version of Mark's (since withdrawn) patch,
where the new method in JAASRealm calls the old one.
http://people.apache.org/~kkolinko/patches/2009-11-02_bug39231.patch
- +1: kkolinko, markt
+ +1: kkolinko, markt,funkman
-1:
* Improve NIO connector shutdown time by doing shutdowns in parallel
@@ -153,7 +153,7 @@
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47699
Better handling of PID files
https://issues.apache.org/bugzilla/attachment.cgi?id=24202
- +1: markt
+ +1: markt, funkman
+1: fhanik (although, on .sh, I think we could get rid of 'Bootstrap stop'
by now, shutdown hooks have been available for quite some time)
-1:
@@ -162,7 +162,7 @@
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44041
Threading issue in classloading. Adds a sync so please check performance
http://svn.apache.org/viewvc?rev=805182view=rev
- +1: markt
+ +1: markt, funkman
0: jim
-1: fhanik, I would say a thread safe, yet concurrent implementation would do
synchronized (className.intern()) {
@@ -206,7 +206,7 @@
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47267
http://svn.apache.org/viewvc?rev=817822view=rev
- +1: markt
+ +1: markt, funkman
-1:
rjung: Our dreaded multi platform build system is a bit fragile
w.r.t. fixcrlf. If you change the file to crlf in the installer
@@ -228,7 +228,7 @@
* Fix ReplicationValve CrossContext support
http://svn.apache.org/viewvc?rev=831718view=rev
- +1: pero, rjung
+ +1: pero, rjung, funkman
-1:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47331
@@ -410,5 +410,5 @@
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47918
Correct copy and paste in mbeans descriptions
http://svn.apache.org/viewvc?rev=832218view=rev
- +1: markt, kkolinko
+ +1: markt, kkolinko, funkman
-1:
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r809603 - /tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
Author: funkman Date: Mon Aug 31 14:17:37 2009 New Revision: 809603 URL: http://svn.apache.org/viewvc?rev=809603view=rev Log: https://issues.apache.org/bugzilla/show_bug.cgi?id=47705 ArithmeticException: / by zero when expiring sessions via manager Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=809603r1=809602r2=809603view=diff == --- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Mon Aug 31 14:17:37 2009 @@ -1106,6 +1106,8 @@ int histoInterval = maxInactiveInterval / maxCount; if ( histoInterval * maxCount maxInactiveInterval ) histoInterval++; +if (0==histoInterval) +histoInterval=1; maxCount = maxInactiveInterval / histoInterval; if ( histoInterval * maxCount maxInactiveInterval ) maxCount++; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r809605 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Mon Aug 31 14:19:52 2009 New Revision: 809605 URL: http://svn.apache.org/viewvc?rev=809605view=rev Log: add https://issues.apache.org/bugzilla/show_bug.cgi?id=47705 Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=809605r1=809604r2=809605view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Aug 31 14:19:52 2009 @@ -314,3 +314,10 @@ +1: markt 0: Where's the patch? -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47705 + ArithmeticException: / by zero when expiring sessions via manager + http://svn.apache.org/viewvc?rev=809603view=rev + +1: funkman + -1: + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r809596 - /tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
Author: funkman
Date: Mon Aug 31 13:59:00 2009
New Revision: 809596
URL: http://svn.apache.org/viewvc?rev=809596view=rev
Log:
Allow welcome files without a physical backing.
Inspired by this bug https://issues.apache.org/bugzilla/show_bug.cgi?id=47378
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java?rev=809596r1=809595r2=809596view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java Mon Aug 31
13:59:00 2009
@@ -804,6 +804,36 @@
}
+/* welcome file processing - take 2
+ * Now that we have looked for welcome files with a physical
+ * backing, now look for an extension mapping listed
+ * but may not have a physical backing to it. This is for
+ * the case of index.jsf, index.do, etc.
+ * A watered down version of rule 4
+ */
+if (mappingData.wrapper == null) {
+boolean checkWelcomeFiles = checkJspWelcomeFiles;
+if (!checkWelcomeFiles) {
+char[] buf = path.getBuffer();
+checkWelcomeFiles = (buf[pathEnd - 1] == '/');
+}
+if (checkWelcomeFiles) {
+for (int i = 0; (i context.welcomeResources.length)
+ (mappingData.wrapper == null); i++) {
+path.setOffset(pathOffset);
+path.setEnd(pathEnd);
+path.append(context.welcomeResources[i], 0,
+context.welcomeResources[i].length());
+path.setOffset(servletPath);
+internalMapExtensionWrapper(extensionWrappers,
+path, mappingData);
+}
+
+path.setOffset(servletPath);
+path.setEnd(pathEnd);
+}
+}
+
// Rule 7 -- Default servlet
if (mappingData.wrapper == null !checkJspWelcomeFiles) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r790245 - /tomcat/current/tc5.5.x/STATUS.txt
Author: funkman Date: Wed Jul 1 16:10:56 2009 New Revision: 790245 URL: http://svn.apache.org/viewvc?rev=790245view=rev Log: vote Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=790245r1=790244r2=790245view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 1 16:10:56 2009 @@ -51,6 +51,7 @@ updated from a previous proposal based on the comments of Konstantin. mark and konstatin: please vote again. +1: rjung, kkolinko, markt + -0: new Boolean bad, Boolean.valueOf() much better -1: * Make AccessLogValve thread safe - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r783342 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Wed Jun 10 13:00:11 2009 New Revision: 783342 URL: http://svn.apache.org/viewvc?rev=783342view=rev Log: votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=783342r1=783341r2=783342view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jun 10 13:00:11 2009 @@ -127,7 +127,7 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47318 Process include preludes and codas for directivesOnly as well as full pages http://svn.apache.org/viewvc?rev=783313view=rev - +1: markt + +1: markt, funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47237 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r783167 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Wed Jun 10 01:07:19 2009 New Revision: 783167 URL: http://svn.apache.org/viewvc?rev=783167view=rev Log: more votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=783167r1=783166r2=783167view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jun 10 01:07:19 2009 @@ -129,24 +129,25 @@ http://www.iana.org/assignments/media-types/index.html The rest of the change is OK. ) + -1: funkman: agree with kkolinko * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47158 Thread safety issues in AccessLogValve http://svn.apache.org/viewvc?rev=781779view=rev - +1: markt + +1: markt, funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47316 Remove use of ServerFactory to enable MapperListener to start when service name != engine name https://issues.apache.org/bugzilla/attachment.cgi?id=23764 - +1: markt, kkolinko + +1: markt, kkolinko, funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47299 Simply code. Make it work with classes that extend StandardContext http://svn.apache.org/viewvc?rev=782145view=rev - +1: markt + +1: markt, funkman +1: kkolinko ( good. I see no need to carry on the Race condition is harmless comment, @@ -164,12 +165,12 @@ * Use a more sensible default for appBase http://svn.apache.org/viewvc?rev=782791view=rev Patch by Ian Darwin - +1: markt, kkolinko + +1: markt, kkolinko, funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47237 http://svn.apache.org/viewvc?rev=783155view=rev - +1: fhanik + +1: fhanik, funkman -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r782612 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Mon Jun 8 13:09:47 2009 New Revision: 782612 URL: http://svn.apache.org/viewvc?rev=782612view=rev Log: vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=782612r1=782611r2=782612view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jun 8 13:09:47 2009 @@ -159,4 +159,5 @@ Process include preludes and codas for directivesOnly as well as full pages http://svn.apache.org/viewvc?rev=782166view=rev +1: markt, kkolinko - -1: + -1: new regression - see bug for new test case + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r779684 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Thu May 28 17:29:20 2009 New Revision: 779684 URL: http://svn.apache.org/viewvc?rev=779684view=rev Log: votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=779684r1=779683r2=779684view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 28 17:29:20 2009 @@ -80,41 +80,42 @@ 0: billbarker: generally agree with remm that this is too big of a change for the stable branch but could agree to some of it if it was split into parts -1: remm: no for TC 6.0 + -1: funkman : api change in Session.java for .x.x release * Fix use of non-ASCII characters in property files http://people.apache.org/~markt/patches/2009-04-20-native2ascii-de.patch (German) http://people.apache.org/~markt/patches/2009-04-20-native2ascii-en.patch (English) http://people.apache.org/~markt/patches/2009-04-20-native2ascii-es.patch (Spanish) http://people.apache.org/~markt/patches/2009-04-20-native2ascii-fr.patch (French) - +1: markt + +1: markt, funkman +0: kkolinko: should not be needed, as old and new are both correct. -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47080 Prevent NPE when mapper makes no matches http://svn.apache.org/viewvc?rev=770809view=rev - +1: markt, pero + +1: markt, pero, funkman -1: * Fix Close Stream at WebappClassLoader after read error http://svn.apache.org/viewvc?rev=772872view=rev - +1: pero + +1: pero, funkman -0: kkolinko: http://marc.info/?l=tomcat-devm=124192105131636w=2 -1: * Build files: Apply explicit encoding to all operations that perform filtering. http://svn.apache.org/viewvc?rev=776921view=rev - +1: kkolinko, markt + +1: kkolinko, markt, funkman -1: * Update to NSIS 2.44 http://svn.apache.org/viewvc?rev=776924view=rev - +1: kkolinko, markt + +1: kkolinko, markt, funkman -1: * Build files: Calculate current year automatically by using tstamp. http://svn.apache.org/viewvc?rev=776935view=rev - +1: kkolinko, markt + +1: kkolinko, markt,funkman -1: * In dist-javadoc target of dist.xml: @@ -136,38 +137,38 @@ maxmemory=256m /javadoc - +1: kkolinko, markt + +1: kkolinko, markt, funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44943 For zip/tgz distributives it was already fixed in 6.0.17, 5.5.27. Now, apply the same fix to exe distributive. http://svn.apache.org/viewvc?rev=776945view=rev - +1: kkolinko, markt + +1: kkolinko, markt,funkman -1: * Add missing svn properties http://people.apache.org/~rjung/patches/tc6-svnprops.patch - +1: rjung, fhanik, markt + +1: rjung, fhanik, markt,funkman -1: * Don't add extra blank lines to files in .tar.gz distro http://svn.apache.org/viewvc?rev=777464view=rev http://svn.apache.org/viewvc?rev=777466view=rev - +1: markt, kkolinko + +1: markt, kkolinko,funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47228 Correct French translation. Patch provided by s...@a.o http://svn.apache.org/viewvc?view=revrevision=778379 - +1: markt, kkolinko + +1: markt, kkolinko,funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47050 Remove unnecessary filtering http://svn.apache.org/viewvc?rev=770716view=rev - +1: markt + +1: markt,funkman -1: * Fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=43343 @@ -175,5 +176,5 @@ are currently using it. http://svn.apache.org/viewvc?rev=778523view=rev http://svn.apache.org/viewvc?rev=778524view=rev - +1: markt + +1: markt,funkman -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r741668 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Fri Feb 6 18:44:13 2009 New Revision: 741668 URL: http://svn.apache.org/viewvc?rev=741668view=rev Log: votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=741668r1=741667r2=741668view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Feb 6 18:44:13 2009 @@ -126,33 +126,34 @@ * Align installer licenses with main license file http://svn.apache.org/viewvc?rev=734743view=rev - +1: markt, fhanik + +1: markt, fhanik, funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46564 Make page encoding test case insensitive +1: markt, remm + +0: funkman: Where's the patch? -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46606 Make max depth configurable for WebDAV servlet http://svn.apache.org/viewvc?rev=740635view=rev - +1: markt, remm + +1: markt, remm, funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38197 Take account of jsp:attribute elements when naming tag pools http://svn.apache.org/viewvc?rev=740675view=rev - +1: markt, remm + +1: markt, remm, funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38553 Return 401 rather than 400 if client presents no certs for CLIENT-CERT auth http://svn.apache.org/viewvc?rev=740684view=rev - +1: markt, remm + +1: markt, remm, funkman -1: * Make sure the 400 is returned to the browser. (like other connectors). http://people.apache.org/~jfclere/patches/patch400.txt - +1: jfclere, remm + +1: jfclere, remm, funkman -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r734116 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Tue Jan 13 04:42:22 2009 New Revision: 734116 URL: http://svn.apache.org/viewvc?rev=734116view=rev Log: some votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=734116r1=734115r2=734116view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan 13 04:42:22 2009 @@ -34,21 +34,21 @@ * Fix issue where the first request for a deleted JSPs returns as if the JSP still exists. http://svn.apache.org/viewvc?view=revrevision=683969 - +1: markt + +1: markt, funkman 0: remm (looks risky, very minor problem) -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45608 Prevent race condition for allocate/deallocate in StandardWrapper http://svn.apache.org/viewvc?rev=685177view=rev - +1: markt + +1: markt, funkman 0: remm: The only unsafe usage of this field is to implement the gimmick loop-wait hack, which to me means adding any sort of sync is not worth it. -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45074 http://svn.apache.org/viewvc?rev=689402view=rev - +1: jfclere + +1: jfclere, funkman 0: markt: The OP was using linux so I assume they saw some benefit. If this is goign to be applied, the docs should be updated as well. @@ -70,6 +70,7 @@ fhanik why did we change it in trunk to begin with if we are gonna change it again when the spec comes out lets just implement the spec in trunk, and discuss the simplest solution for 6.0.x but I don't agree with changing the default value + funkman: leave as gap until 3.0 spec -1: rjung: slightly prefer enabled for 6.0.x because of increased security by default, but disabled for tc5.5.x because of the small risk of breaking existing apps. @@ -91,13 +92,14 @@ * Fix serialisation issue reported by Find Bugs http://svn.apache.org/viewvc?rev=699633view=rev +1: markt + +1: funkman (prefer to also remove Serializable from trunk) 0: remm (StdContext was marked as Serializable for an experiment; obviously it won't work) -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45933 Don't use xml parser from web-app to process tld files http://svn.apache.org/viewvc?rev=701355view=rev - +1: markt + +1: markt, funkman -0: remm (it is a refactoring, and is not appropriate to me in 6.0.x) markt - It is a refactoring but the refactoring was necessary to change when TLDs were processed to avoid the bug. It @@ -106,7 +108,7 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45403 See commit message for details of negligable performance impact http://svn.apache.org/viewvc?rev=701358view=rev - +1: markt + +1: markt, funkman -0: remm (I also do not think the patch is a good idea as a backport) * Backport NCDFE fix from trunk (TCK failures without it) @@ -119,7 +121,7 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41861 Add major version number to Tomcat service name created by Windows installer http://svn.apache.org/viewvc?rev=710066view=rev - +1: markt, rjung + +1: markt, rjung, funkman -1: rjung: tomcat.nsi already uses replacement patterns like @vers...@. So it might be more robust, to add another replacement like @@ -142,13 +144,13 @@ * [2] Prevent async close NPE on already closed sockets http://people.apache.org/~fhanik/tomcat/comet-close-2.patch - +1: fhanik, markt (need to fix indenting) + +1: fhanik, markt (need to fix indenting), funkman -1: * [3] Add ability to fix the keyAlias in NIO/SSL http://svn.apache.org/viewvc?rev=720587view=rev http://svn.apache.org/viewvc?rev=720553view=rev - +1: fhanik, markt + +1: fhanik, markt, funkman -1: * [4] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45154 (add sendfile support to NIO/SSL) - performance improvement @@ -160,24 +162,24 @@ * [5] Fix Comet interest registration bug http://people.apache.org/~fhanik/tomcat/comet-ops.patch - +1: fhanik + +1: fhanik, funkman -1: * [6] Fix file descriptor leak during send file behavior in NIO connector http://svn.apache.org/viewvc?rev=729191view=rev - +1: fhanik, markt, jim + +1: fhanik, markt, jim, funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42693 Fix compilation of recursive tags http://svn.apache.org/viewvc?rev=720046view=rev - +1: markt, fhanik + +1: markt, fhanik, funkman -1: * Use consistent (and more useful) JPDA defaults in catalina.bat http://svn.apache.org/viewvc?rev=721040view=rev - +1: markt, fhanik + +1: markt, fhanik, funkman -1: * Changes required to run with a security manager @@ -195,19 +197,19 @@ Excludes performance
svn commit: r686194 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Fri Aug 15 04:32:02 2008 New Revision: 686194 URL: http://svn.apache.org/viewvc?rev=686194view=rev Log: votes and patch proposal for (very) minor annoyance http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHost.java?r1=593649r2=685530diff_format=h Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=686194r1=686193r2=686194view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Aug 15 04:32:02 2008 @@ -74,9 +74,8 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41407 Add support for CLIENT-CERT to the JASSRealm. Builds on DIGEST patch above. http://svn.apache.org/viewvc?rev=684270view=rev - +1: markt, remm + +1: markt, remm, funkman -1: - 0: funkman - I see the bug URL twice with no patch * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45608 Prevent race condition for allocate/deallocate in StandardWrapper @@ -85,3 +84,9 @@ 0: remm: The only unsafe usage of this field is to implement the gimmick loop-wait hack, which to me means adding any sort of sync is not worth it. -1: + +* http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHost.java?r1=593649r2=685530diff_format=h + Provide full stacktrace/message when ErrorReportValveClass can't be instantiated. + +1: funkman + -1: + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r685535 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Wed Aug 13 06:22:14 2008 New Revision: 685535 URL: http://svn.apache.org/viewvc?rev=685535view=rev Log: some votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=685535r1=685534r2=685535view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Aug 13 06:22:14 2008 @@ -45,13 +45,13 @@ * Add in startup options, so that cluster can be started in TCP mode only, when using static membership Also document the multicast recovery options http://svn.apache.org/viewvc?rev=674125view=rev - +1: fhanik, markt + +1: fhanik, markt, funkman -1: * Fix comet behavior Invoke READ when there is a body and make sure END is called if CometEvent.close is called during an invokation http://svn.apache.org/viewvc?rev=677473view=rev - +1: fhanik + +1: fhanik, funkman 0: remm: no idea if it's better or worse (the fact that it's been closed is visible) -1: @@ -59,6 +59,8 @@ Include possible cause in error message since excpetion isn't that clear http://svn.apache.org/viewvc?rev=680710view=rev +1: markt + -0: funkman ( Agree with Remy - just not as strongly (There is enough in the stacktrace that your fav search + engine can tell you what is wrong fairly quickly) -1: remm (this error seems to be displayed by Class.newInstance() which should be ok to use; I am not ok with the idea of working around every error message from JDKs) @@ -66,7 +68,7 @@ Add required sync to race condition Based on a patch by Santtu Hyrkk http://svn.apache.org/viewvc?rev=680725view=rev - +1: markt, remm + +1: markt, remm, funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45511 @@ -75,7 +77,7 @@ http://svn.apache.org/viewvc?rev=681735view=rev (revert) http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParser.jjt?r1=681735r2=681789 (new fix) Note: Auto-generated files will also need to be updated - +1: markt, remm + +1: markt, remm, funkman -1: * Fix issue where the first request for a deleted JSPs returns as if the JSP @@ -88,26 +90,26 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45591 NPE on start-up failure in some cases. Based on a patch by Matt Passell http://svn.apache.org/viewvc?rev=683982view=rev - +1: markt, remm + +1: markt, remm, funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45585 Tomcat failed to start if using $CATALINA_BASE but not JULI. Patch based on a suggestion by Ian Ward Comfort http://svn.apache.org/viewvc?rev=684001view=rev - +1: markt, remm + +1: markt, remm, funkman -1: * JAASMemoryLoginModule didn't conform to JAASRealm contract. This prevented any user from being assigned a role. http://svn.apache.org/viewvc?rev=684081view=rev - +1: markt, remm + +1: markt, remm, funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45576 Add support for DIGEST to the JAASRealm http://svn.apache.org/viewvc?rev=684234view=rev - +1: markt, remm (the two people using digest could be interested) + +1: markt, funkman, remm (the two people using digest could be interested) -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41407 @@ -115,7 +117,9 @@ https://issues.apache.org/bugzilla/show_bug.cgi?id=41407 +1: markt, remm -1: + 0: funkman - I see the bug URL twice with no patch + * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45528 Test the SSL socket for cert/cipher compatibility before returning it http://svn.apache.org/viewvc?rev=684559view=rev - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r684613 - /tomcat/current/tc4.1.x/STATUS.txt
Author: funkman Date: Sun Aug 10 16:50:06 2008 New Revision: 684613 URL: http://svn.apache.org/viewvc?rev=684613view=rev Log: Followup on request to review Modified: tomcat/current/tc4.1.x/STATUS.txt Modified: tomcat/current/tc4.1.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc4.1.x/STATUS.txt?rev=684613r1=684612r2=684613view=diff == --- tomcat/current/tc4.1.x/STATUS.txt (original) +++ tomcat/current/tc4.1.x/STATUS.txt Sun Aug 10 16:50:06 2008 @@ -28,17 +28,17 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44562 http://svn.apache.org/viewvc?rev=635294view=rev (prior code clean up) http://svn.apache.org/viewvc?rev=635297view=rev (the actual fix) - +1: markt, yoavs + +1: markt, yoavs, funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41217 This is CVE-2008-0128. http://people.apache.org/~markt/patches/2008-03-10-bug41217-tc4.patch - +1: markt, yoavs + +1: markt, yoavs, funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45301 Remove a JDK 1.4 dep for the few users that still run TC4 on 1.3 JDKs http://people.apache.org/~markt/patches/2008-07-07-bug45301-tc4.patch - +1: markt, yoavs + +1: markt, yoavs, funkman -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r628307 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/startup/WebRuleSet.java webapps/docs/changelog.xml
Author: funkman Date: Sat Feb 16 06:40:24 2008 New Revision: 628307 URL: http://svn.apache.org/viewvc?rev=628307view=rev Log: If listener declared in web.xml, only add it once. (per STATUS) Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=628307r1=628306r2=628307view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Feb 16 06:40:24 2008 @@ -80,10 +80,6 @@ http://svn.apache.org/viewvc?rev=620778view=rev +1: pero,funkman,markt -* Remove duplicate listner additions - http://svn.apache.org/viewvc?rev=620844view=rev - +1: funkman, pero, jfclere, markt, remm - * lib is relative to catalina home, not base http://svn.apache.org/viewvc?rev=627602view=rev +1: markt, fhanik Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java?rev=628307r1=628306r2=628307view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java Sat Feb 16 06:40:24 2008 @@ -256,9 +256,6 @@ digester.addCallMethod(prefix + web-app/jsp-config/jsp-property-group/url-pattern, addJspMapping, 0); -digester.addCallMethod(prefix + web-app/listener/listener-class, - addApplicationListener, 0); - digester.addRule(prefix + web-app/login-config, loginConfig); @@ -902,4 +899,4 @@ if (digester.getLogger().isDebugEnabled()) digester.getLogger().debug(pop SecurityRoleRef); } -} \ No newline at end of file +} Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=628307r1=628306r2=628307view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Feb 16 06:40:24 2008 @@ -38,6 +38,9 @@ fix bug44337/bug: Dir listing crashes if no readme-file present (funkman) /fix + fix +If listener declared in web.xml, only add it once. (funkman) + /fix /changelog /subsection subsection name=Coyote - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r620848 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Tue Feb 12 08:27:45 2008 New Revision: 620848 URL: http://svn.apache.org/viewvc?rev=620848view=rev Log: addition of dupl listener removal and a vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=620848r1=620847r2=620848view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Feb 12 08:27:45 2008 @@ -88,5 +88,11 @@ * ExtendedAccessLogValve cs-uri not print empty querystring http://svn.apache.org/viewvc?rev=620778view=rev - +1: pero + +1: pero,funkman + + +* Remove duplicate listner additions + http://svn.apache.org/viewvc?rev=620844view=rev + +1: funkman -1: + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r620844 - /tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
Author: funkman Date: Tue Feb 12 08:22:19 2008 New Revision: 620844 URL: http://svn.apache.org/viewvc?rev=620844view=rev Log: Only add the listener once (to prevent the dup message from accidently appearing) related to http://issues.apache.org/bugzilla/show_bug.cgi?id=44268 Modified: tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java Modified: tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java?rev=620844r1=620843r2=620844view=diff == --- tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java Tue Feb 12 08:22:19 2008 @@ -204,9 +204,6 @@ digester.addCallMethod(prefix + web-app/jsp-config/jsp-property-group/url-pattern, addJspMapping, 0); -digester.addCallMethod(prefix + web-app/listener/listener-class, - addApplicationListener, 0); - digester.addRule(prefix + web-app/login-config, loginConfig); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r620842 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/servlets/DefaultServlet.java webapps/docs/changelog.xml
Author: funkman
Date: Tue Feb 12 08:13:54 2008
New Revision: 620842
URL: http://svn.apache.org/viewvc?rev=620842view=rev
Log:
Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44337
Dir listing crashes if no readme-file present
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=620842r1=620841r2=620842view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Feb 12 08:13:54 2008
@@ -70,12 +70,6 @@
+0: remm: do we really want to fix these sort of bugs ?
-1:
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44337
- Dir listing crashes if no readme-file present
- http://svn.apache.org/viewvc?rev=618150view=rev
- +1: funkman, markt, fhanik, pero
- -1:
-
* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43741
Correctly handle dependencies on tags in JARs
http://svn.apache.org/viewvc?rev=618481view=rev
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=620842r1=620841r2=620842view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Tue Feb 12 08:13:54 2008
@@ -1415,7 +1415,10 @@
return buffer.toString();
}
} catch (NamingException e) {
-throw new ServletException(Error opening readme resource, e);
+if (debug 10)
+log(readme ' + readmeFile + ' not found, e);
+
+return null;
}
}
@@ -1438,7 +1441,10 @@
return is;
}
} catch (NamingException e) {
-throw new ServletException(Error opening XSLT resource, e);
+if (debug 10)
+log(localXsltFile ' + localXsltFile + ' not found, e);
+
+return null;
}
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=620842r1=620841r2=620842view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Feb 12 08:13:54 2008
@@ -32,6 +32,13 @@
/properties
body
+section name=Tomcat 6.0.17 (remm)
+ subsection name=Catalina
+changelog
+bug44337/bug: Dir listing crashes if no readme-file present
(funkman)
+/changelog
+ /subsection
+/section
section name=Tomcat 6.0.16 (remm)
subsection name=General
changelog
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r618153 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Sun Feb 3 18:19:43 2008 New Revision: 618153 URL: http://svn.apache.org/viewvc?rev=618153view=rev Log: proposal for Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44337 Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=618153r1=618152r2=618153view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Feb 3 18:19:43 2008 @@ -69,3 +69,11 @@ +1: markt +0: remm: do we really want to fix these sort of bugs ? -1: + +* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44337 + Dir listing crashes if no readme-file present + http://svn.apache.org/viewvc?rev=618150view=rev + +1: funkman + -1: + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r618150 - /tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Author: funkman
Date: Sun Feb 3 18:10:39 2008
New Revision: 618150
URL: http://svn.apache.org/viewvc?rev=618150view=rev
Log:
http://issues.apache.org/bugzilla/show_bug.cgi?id=44337
Dir listing crashes if no readme-file present
Catch NamingException on resource not found instead of checking for null
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=618150r1=618149r2=618150view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Sun Feb
3 18:10:39 2008
@@ -1415,7 +1415,10 @@
return buffer.toString();
}
} catch (NamingException e) {
-throw new ServletException(Error opening readme resource, e);
+if (debug 10)
+log(readme ' + readmeFile + ' not found, e);
+
+return null;
}
}
@@ -1438,7 +1441,10 @@
return is;
}
} catch (NamingException e) {
-throw new ServletException(Error opening XSLT resource, e);
+if (debug 10)
+log(localXsltFile ' + localXsltFile + ' not found, e);
+
+return null;
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r609246 - /tomcat/current/tc5.5.x/STATUS.txt
Author: funkman Date: Sat Jan 5 17:10:17 2008 New Revision: 609246 URL: http://svn.apache.org/viewvc?rev=609246view=rev Log: votes and proposal for chucking the download for HttpClient since it is unused [and the download link is bad] Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609246r1=609245r2=609246view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Sat Jan 5 17:10:17 2008 @@ -33,7 +33,7 @@ * Fix bug in CGI servlet that causes it to fail when included http://svn.apache.org/viewvc?view=revrevision=595802 - +1: markt, fhanik + +1: markt, fhanik, funkman -1: * JDT location return 404 @@ -158,7 +158,7 @@ * Fix CVE-2007-5342 JULI permissions need to be restricted http://svn.apache.org/viewvc?rev=606594view=rev - +1: markt, pero + +1: markt, pero, funkman -1: * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44084 @@ -178,5 +178,11 @@ present. Based on a patch by Yuan Qingyun. http://svn.apache.org/viewvc?rev=606944view=rev http://svn.apache.org/viewvc?rev=609003view=rev - +1: markt + +1: markt,funkman -1: + +* Remove unused dependency on HttpClient + http://people.apache.org/~funkman/tc5.5-build.properties.patch + +1: funkman + -1: + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r608313 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Wed Jan 2 18:46:52 2008 New Revision: 608313 URL: http://svn.apache.org/viewvc?rev=608313view=rev Log: some votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=608313r1=608312r2=608313view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 2 18:46:52 2008 @@ -52,25 +52,25 @@ Include user principal if possible when serializing / de-serializing http://svn.apache.org/viewvc?rev=607596view=rev http://svn.apache.org/viewvc?rev=607597view=rev - +1: markt + +1: markt, funkman -1: * Improve Jasper docs. Note rather than remove unused option, it will be deprecated in 6.0.x. http://svn.apache.org/viewvc?rev=607860view=rev - +1: markt + +1: markt, funkman -1: * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43800 Make link between APR and Native clearer http://svn.apache.org/viewvc?rev=607875view=rev - +1: markt + +1: markt, funkman -1: Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43775 Don't change line endings for binary files http://svn.apache.org/viewvc?rev=607888view=rev - +1: markt + +1: markt, funkman -1: Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43758 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r606992 - in /tomcat/trunk: build.xml webapps/docs/cluster-howto.xml webapps/docs/introduction.xml webapps/docs/tribes/project.xml
Author: funkman
Date: Wed Dec 26 17:38:17 2007
New Revision: 606992
URL: http://svn.apache.org/viewvc?rev=606992view=rev
Log:
FAQ links to wiki
use the xslt task instead of style task
Modified:
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/cluster-howto.xml
tomcat/trunk/webapps/docs/introduction.xml
tomcat/trunk/webapps/docs/tribes/project.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=606992r1=606991r2=606992view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Dec 26 17:38:17 2007
@@ -350,55 +350,55 @@
mkdir dir=${tomcat.build}/webapps/docs/funcspecs /
!-- XSL processing --
-style basedir=webapps/docs
+xslt basedir=webapps/docs
destdir=${tomcat.build}/webapps/docs
extension=.html
style=webapps/docs/tomcat-docs.xsl
excludes=build.xml project.xml
includes=*.xml
param name=relative-path expression=./
-/style
-style basedir=webapps/docs/appdev
+/xslt
+xslt basedir=webapps/docs/appdev
destdir=${tomcat.build}/webapps/docs/appdev
extension=.html
style=webapps/docs/tomcat-docs.xsl
excludes=project.xml
includes=*.xml
param name=relative-path expression=../
-/style
-style basedir=webapps/docs/funcspecs
+/xslt
+xslt basedir=webapps/docs/funcspecs
destdir=${tomcat.build}/webapps/docs/funcspecs
extension=.html
style=webapps/docs/tomcat-docs.xsl
excludes=project.xml
includes=*.xml
param name=relative-path expression=../
-/style
-style basedir=webapps/docs/config
+/xslt
+xslt basedir=webapps/docs/config
destdir=${tomcat.build}/webapps/docs/config
extension=.html
style=webapps/docs/tomcat-docs.xsl
excludes=project.xml
includes=*.xml
param name=relative-path expression=../
-/style
-style basedir=webapps/docs/architecture
+/xslt
+xslt basedir=webapps/docs/architecture
destdir=${tomcat.build}/webapps/docs/architecture
extension=.html
style=webapps/docs/tomcat-docs.xsl
excludes=project.xml
includes=*.xml
param name=relative-path expression=../
-/style
+/xslt
-style basedir=webapps/docs/tribes
+xslt basedir=webapps/docs/tribes
destdir=${tomcat.build}/webapps/docs/tribes
extension=.html
style=webapps/docs/tomcat-docs.xsl
excludes=project.xml
includes=*.xml
param name=relative-path expression=../
-/style
+/xslt
/target
target name=deploy depends=build-only,build-docs
Modified: tomcat/trunk/webapps/docs/cluster-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/cluster-howto.xml?rev=606992r1=606991r2=606992view=diff
==
--- tomcat/trunk/webapps/docs/cluster-howto.xml (original)
+++ tomcat/trunk/webapps/docs/cluster-howto.xml Wed Dec 26 17:38:17 2007
@@ -693,7 +693,7 @@
/section
section name=FAQ
-pPlease see a href=http://tomcat.apache.org/faq/cluster.html;the
clustering section of the FAQ/a./p
+pPlease see a href=http://wiki.apache.org/tomcat/FAQ/Clustering;the
clustering section of the FAQ/a./p
/section
/body
Modified: tomcat/trunk/webapps/docs/introduction.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/introduction.xml?rev=606992r1=606991r2=606992view=diff
==
--- tomcat/trunk/webapps/docs/introduction.xml (original)
+++ tomcat/trunk/webapps/docs/introduction.xml Wed Dec 26 17:38:17 2007
@@ -115,7 +115,7 @@
to fully read the relevant documentation as it will save you much time
and effort. There's nothing like scouring the web only to find out that
the answer was right in front of you all along!/li
-lia href=http://tomcat.apache.org/faq/;Tomcat FAQ/a as maintained by
the developers./li
+lia href=http://wiki.apache.org/tomcat/FAQ;Tomcat FAQ/a as maintained
by the developers./li
lia href=http://wiki.apache.org/tomcat/;Tomcat WIKI/a/li
liTomcat FAQ at a
href=http://www.jguru.com/faq/home.jsp?topic=Tomcat;jGuru/a/li
liTomcat mailing list archives - numerous sites archive the Tomcat mailing
Modified: tomcat/trunk/webapps/docs/tribes/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/tribes/project.xml?rev=606992r1=606991r2=606992view=diff
==
--- tomcat/trunk/webapps/docs/tribes/project.xml (original)
+++ tomcat/trunk/webapps/docs/tribes/project.xml Wed Dec 26 17:38:17 2007
@@ -27,7 +27,7 @@
menu name=Links
svn commit: r606994 - /tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
Author: funkman
Date: Wed Dec 26 17:57:02 2007
New Revision: 606994
URL: http://svn.apache.org/viewvc?rev=606994view=rev
Log:
http://issues.apache.org/bugzilla/show_bug.cgi?id=42503
ServletContext.getResourceAsStream returns stale data
patch by Arvind Srinivasan
arvindDOTsrinivasan sun com
Modified:
tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
Modified: tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java?rev=606994r1=606993r2=606994view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java Wed Dec
26 17:57:02 2007
@@ -986,6 +986,8 @@
public FileResourceAttributes(File file) {
this.file = file;
+getCreation();
+getLastModified();
}
// --- Member Variables
@@ -1036,7 +1038,7 @@
public long getCreation() {
if (creation != -1L)
return creation;
-creation = file.lastModified();
+creation = getLastModified();
return creation;
}
@@ -1048,7 +1050,7 @@
*/
public Date getCreationDate() {
if (creation == -1L) {
-creation = file.lastModified();
+creation = getCreation();
}
return super.getCreationDate();
}
@@ -1074,7 +1076,7 @@
*/
public Date getLastModifiedDate() {
if (lastModified == -1L) {
-lastModified = file.lastModified();
+lastModified = getLastModified();
}
return super.getLastModifiedDate();
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r606995 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Wed Dec 26 17:59:02 2007 New Revision: 606995 URL: http://svn.apache.org/viewvc?rev=606995view=rev Log: http://issues.apache.org/bugzilla/show_bug.cgi?id=42503 ServletContext.getResourceAsStream returns stale data Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=606995r1=606994r2=606995view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 26 17:59:02 2007 @@ -78,3 +78,10 @@ http://svn.apache.org/viewvc?rev=606952view=rev +1: markt,funkman -1: + +* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=42503 + ServletContext.getResourceAsStream returns stale data + http://svn.apache.org/viewvc?rev=606994view=rev + +1: funkman + -1: + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r606996 - /tomcat/trunk/java/org/apache/el/parser/AstValue.java
Author: funkman
Date: Wed Dec 26 18:10:38 2007
New Revision: 606996
URL: http://svn.apache.org/viewvc?rev=606996view=rev
Log:
http://issues.apache.org/bugzilla/show_bug.cgi?id=43285
Missing EL Coercion causes argument type mismatch
Patch by Bernhard Huemer bernhard.huemers gmail com
Modified:
tomcat/trunk/java/org/apache/el/parser/AstValue.java
Modified: tomcat/trunk/java/org/apache/el/parser/AstValue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstValue.java?rev=606996r1=606995r2=606996view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstValue.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstValue.java Wed Dec 26 18:10:38
2007
@@ -26,6 +26,7 @@
import javax.el.MethodInfo;
import javax.el.PropertyNotFoundException;
+import org.apache.el.lang.ELSupport;
import org.apache.el.lang.EvaluationContext;
import org.apache.el.util.MessageFactory;
import org.apache.el.util.ReflectionUtil;
@@ -127,7 +128,11 @@
throws ELException {
Target t = getTarget(ctx);
ctx.setPropertyResolved(false);
-ctx.getELResolver().setValue(ctx, t.base, t.property, value);
+ELResolver resolver = ctx.getELResolver();
+resolver.setValue(ctx, t.base, t.property,
+ // coerce to the expected type
+ ELSupport.coerceToType(value,
+ resolver.getType(ctx, t.base,
t.property)));
}
public MethodInfo getMethodInfo(EvaluationContext ctx, Class[] paramTypes)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r606997 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Wed Dec 26 18:15:39 2007 New Revision: 606997 URL: http://svn.apache.org/viewvc?rev=606997view=rev Log: http://issues.apache.org/bugzilla/show_bug.cgi?id=43285 Missing EL Coercion causes argument type mismatch Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=606997r1=606996r2=606997view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 26 18:15:39 2007 @@ -85,3 +85,8 @@ +1: funkman -1: +* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43285 + Missing EL Coercion causes argument type mismatch + http://svn.apache.org/viewvc?rev=606996view=rev + +1: funkman + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r606649 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Sun Dec 23 17:21:10 2007 New Revision: 606649 URL: http://svn.apache.org/viewvc?rev=606649view=rev Log: votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=606649r1=606648r2=606649view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Dec 23 17:21:10 2007 @@ -39,17 +39,17 @@ * Fix CVE-2007-5342 JULI permissions need to be restricted http://svn.apache.org/viewvc?rev=606594view=rev - +1: markt + +1: markt,funkman -1: * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44084 JASSRealm is broken for application provided Principals http://svn.apache.org/viewvc?rev=606621view=rev - +1: markt + +1: markt,funkman -1: * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44088 Expire button on Manager web page doesn't work http://svn.apache.org/viewvc?rev=606633view=rev - +1: markt + +1: markt,funkman -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r602196 - in /tomcat/site/trunk/docs/faq: ./ printer/
Author: funkman Date: Fri Dec 7 11:40:59 2007 New Revision: 602196 URL: http://svn.apache.org/viewvc?rev=602196view=rev Log: faq to wiki deletes Removed: tomcat/site/trunk/docs/faq/bugs.html tomcat/site/trunk/docs/faq/classnotfound.html tomcat/site/trunk/docs/faq/cluster.html tomcat/site/trunk/docs/faq/connectors.html tomcat/site/trunk/docs/faq/database.html tomcat/site/trunk/docs/faq/deployment.html tomcat/site/trunk/docs/faq/development.html tomcat/site/trunk/docs/faq/fda-validation.html tomcat/site/trunk/docs/faq/index.html tomcat/site/trunk/docs/faq/logging.html tomcat/site/trunk/docs/faq/memory.html tomcat/site/trunk/docs/faq/meta.html tomcat/site/trunk/docs/faq/misc.html tomcat/site/trunk/docs/faq/otherOperatingSystems.html tomcat/site/trunk/docs/faq/performance.html tomcat/site/trunk/docs/faq/printer/ tomcat/site/trunk/docs/faq/security.html tomcat/site/trunk/docs/faq/tomcatuser.html tomcat/site/trunk/docs/faq/unix.html tomcat/site/trunk/docs/faq/windows.html - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r602195 - /tomcat/site/trunk/xdocs-faq/
Author: funkman Date: Fri Dec 7 11:39:55 2007 New Revision: 602195 URL: http://svn.apache.org/viewvc?rev=602195view=rev Log: faq to wiki delete Removed: tomcat/site/trunk/xdocs-faq/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r602193 - /tomcat/site/tags/FAQ_MOVING_TO_WIKI/
Author: funkman Date: Fri Dec 7 11:36:41 2007 New Revision: 602193 URL: http://svn.apache.org/viewvc?rev=602193view=rev Log: faq moving to wiki tag soon to be followed by some deletes Added: tomcat/site/tags/FAQ_MOVING_TO_WIKI/ - copied from r602192, tomcat/site/trunk/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r601796 - /tomcat/site/trunk/docs/faq/.htaccess
Author: funkman Date: Thu Dec 6 09:59:20 2007 New Revision: 601796 URL: http://svn.apache.org/viewvc?rev=601796view=rev Log: FAQ move to the wiki Added: tomcat/site/trunk/docs/faq/.htaccess (with props) Added: tomcat/site/trunk/docs/faq/.htaccess URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/faq/.htaccess?rev=601796view=auto == --- tomcat/site/trunk/docs/faq/.htaccess (added) +++ tomcat/site/trunk/docs/faq/.htaccess Thu Dec 6 09:59:20 2007 @@ -0,0 +1,23 @@ +# As part of FAQ move Dec 2007 +RedirectPermanent /faq/bugs.html http://wiki.apache.org/tomcat/FAQ/Bugs +RedirectPermanent /faq/classnotfound.html http://wiki.apache.org/tomcat/FAQ/Class_Not_Found +RedirectPermanent /faq/cluster.html http://wiki.apache.org/tomcat/FAQ/Clustering +RedirectPermanent /faq/connectors.html http://wiki.apache.org/tomcat/FAQ/Connectors +RedirectPermanent /faq/database.html http://wiki.apache.org/tomcat/FAQ/Database +RedirectPermanent /faq/deployment.html http://wiki.apache.org/tomcat/FAQ/Deployment +RedirectPermanent /faq/development.html http://wiki.apache.org/tomcat/FAQ/Developing +RedirectPermanent /faq/fda-validation.html http://wiki.apache.org/tomcat/FAQ/FDA_Validation +RedirectPermanent /faq/logging.html http://wiki.apache.org/tomcat/FAQ/Logging +RedirectPermanent /faq/memory.html http://wiki.apache.org/tomcat/FAQ/Memory +RedirectPermanent /faq/meta.html http://wiki.apache.org/tomcat/FAQ/About +RedirectPermanent /faq/misc.html http://wiki.apache.org/tomcat/FAQ/Miscellaneous +RedirectPermanent /faq/otherOperatingSystems.html http://wiki.apache.org/tomcat/FAQ/Other_Operating_Systems +RedirectPermanent /faq/performance.html http://wiki.apache.org/tomcat/FAQ/Performance_and_Monitoring +RedirectPermanent /faq/security.html http://wiki.apache.org/tomcat/FAQ/Security +RedirectPermanent /faq/tomcatuser.html http://wiki.apache.org/tomcat/FAQ/Tomcat_User +RedirectPermanent /faq/unix.html http://wiki.apache.org/tomcat/FAQ/Linux_Unix +RedirectPermanent /faq/windows.html http://wiki.apache.org/tomcat/FAQ/Windows +RedirectPermanent /faq/index.html http://wiki.apache.org/tomcat/FAQ +RedirectPermanent /faq/ http://wiki.apache.org/tomcat/FAQ + + Propchange: tomcat/site/trunk/docs/faq/.htaccess -- svn:eol-style = native - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r601950 - in /tomcat/tc6.0.x/trunk: STATUS.txt conf/web.xml webapps/docs/changelog.xml
Author: funkman Date: Thu Dec 6 17:06:13 2007 New Revision: 601950 URL: http://svn.apache.org/viewvc?rev=601950view=rev Log: 43993 - mime mapping for WS-Policy Patch by Fabian Ritzmann Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/conf/web.xml tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=601950r1=601949r2=601950view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Dec 6 17:06:13 2007 @@ -36,8 +36,4 @@ +1: markt, fhanik, funkman, remm, pero -1: -* 43993 - mime mapping for WS-Policy - http://svn.apache.org/viewvc?rev=601188view=rev - +1: funkman, remm, pero - -1: Modified: tomcat/tc6.0.x/trunk/conf/web.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/web.xml?rev=601950r1=601949r2=601950view=diff == --- tomcat/tc6.0.x/trunk/conf/web.xml (original) +++ tomcat/tc6.0.x/trunk/conf/web.xml Thu Dec 6 17:06:13 2007 @@ -1143,6 +1143,10 @@ mime-typex-world/x-vrml/mime-type /mime-mapping mime-mapping +extensionwspolicy/extension +mime-typeapplication/wspolicy+xml/mime-type +/mime-mapping +mime-mapping extensionZ/extension mime-typeapplication/x-compress/mime-type /mime-mapping Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=601950r1=601949r2=601950view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Dec 6 17:06:13 2007 @@ -92,6 +92,9 @@ fix bug43530 /bug: doc link fixes provided by Paul Shemansky (funkman) /fix + fix +bug43993/bug: mime mapping for WS-Policy. Patch by Fabian Ritzmann (funkman) + /fix /changelog /subsection subsection name=Coyote - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r601943 - /tomcat/site/trunk/docs/
Author: funkman Date: Thu Dec 6 17:01:14 2007 New Revision: 601943 URL: http://svn.apache.org/viewvc?rev=601943view=rev Log: apply printer friendy to the html and update faq links (actually just ran the ant task) Modified: tomcat/site/trunk/docs/bugreport.html tomcat/site/trunk/docs/contact.html tomcat/site/trunk/docs/download-33.html tomcat/site/trunk/docs/download-41.html tomcat/site/trunk/docs/download-55.html tomcat/site/trunk/docs/download-60.html tomcat/site/trunk/docs/download-connectors.html tomcat/site/trunk/docs/findhelp.html tomcat/site/trunk/docs/getinvolved.html tomcat/site/trunk/docs/heritage.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/irc.html tomcat/site/trunk/docs/legal.html tomcat/site/trunk/docs/lists.html tomcat/site/trunk/docs/migration.html tomcat/site/trunk/docs/resources.html tomcat/site/trunk/docs/security-3.html tomcat/site/trunk/docs/security-4.html tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/docs/security-impact.html tomcat/site/trunk/docs/security-jk.html tomcat/site/trunk/docs/security.html tomcat/site/trunk/docs/svn.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/docs/whoweare.html Modified: tomcat/site/trunk/docs/bugreport.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=601943r1=601942r2=601943view=diff == --- tomcat/site/trunk/docs/bugreport.html (original) +++ tomcat/site/trunk/docs/bugreport.html Thu Dec 6 17:01:14 2007 @@ -6,6 +6,7 @@ meta name=author value=Glenn L. Nielsen/ meta name=email value=/ link type=text/css href=stylesheets/tomcat.css rel=stylesheet/ +link type=text/css href=stylesheets/tomcat-printer.css rel=stylesheet media=print/ /head body bgcolor=#ff text=#00 link=#525D76 alink=#525D76 vlink=#525D76 table border=0 width=100% cellspacing=0 @@ -30,7 +31,7 @@ /td /tr /table -div class=searchbox +div class=searchbox noPrint form action=http://www.google.com/search; method=get input value=tomcat.apache.org name=sitesearch type=hidden/ input value=Search the Site size=25 name=q id=query type=text/ @@ -46,7 +47,7 @@ /tr tr !--LEFT SIDE NAVIGATION-- -td width=20% valign=top nowrap=true +td width=20% valign=top nowrap=true class=noPrint p strongApache Tomcat/strong /p @@ -175,7 +176,7 @@ /ul /td !--RIGHT SIDE MAIN BODY-- -td width=80% valign=top align=left +td width=80% valign=top align=left id=mainBody table border=0 cellspacing=0 cellpadding=2 width=100% tr td bgcolor=#525D76 Modified: tomcat/site/trunk/docs/contact.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/contact.html?rev=601943r1=601942r2=601943view=diff == --- tomcat/site/trunk/docs/contact.html (original) +++ tomcat/site/trunk/docs/contact.html Thu Dec 6 17:01:14 2007 @@ -4,6 +4,7 @@ head titleApache Tomcat - Apache Tomcat -- Contact Information/title link type=text/css href=stylesheets/tomcat.css rel=stylesheet/ +link type=text/css href=stylesheets/tomcat-printer.css rel=stylesheet media=print/ /head body bgcolor=#ff text=#00 link=#525D76 alink=#525D76 vlink=#525D76 table border=0 width=100% cellspacing=0 @@ -28,7 +29,7 @@ /td /tr /table -div class=searchbox +div class=searchbox noPrint form action=http://www.google.com/search; method=get input value=tomcat.apache.org name=sitesearch type=hidden/ input value=Search the Site size=25 name=q id=query type=text/ @@ -44,7 +45,7 @@ /tr tr !--LEFT SIDE NAVIGATION-- -td width=20% valign=top nowrap=true +td width=20% valign=top nowrap=true class=noPrint p strongApache Tomcat/strong /p @@ -173,7 +174,7 @@ /ul /td !--RIGHT SIDE MAIN BODY-- -td width=80% valign=top align=left +td width=80% valign=top align=left id=mainBody table border=0 cellspacing=0 cellpadding=2 width=100% tr td bgcolor=#525D76 Modified: tomcat/site/trunk/docs/download-33.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-33.html?rev=601943r1=601942r2=601943view=diff == --- tomcat/site/trunk/docs/download-33.html (original) +++ tomcat/site/trunk/docs/download-33.html Thu Dec 6 17:01:14 2007 @@ -4,6 +4,7 @@ head titleApache Tomcat - Apache Tomcat 3 Downloads/title link type=text/css href=stylesheets/tomcat.css rel=stylesheet/ +link type=text/css href=stylesheets/tomcat-printer.css rel=stylesheet media=print/ /head body bgcolor=#ff text=#00 link=#525D76 alink=#525D76 vlink=#525D76 table border=0 width=100% cellspacing=0 @@ -28,7 +29,7 @@ /td /tr /table -div class=searchbox +div class=searchbox noPrint form action=http://www.google.com/search; method=get input value=tomcat.apache.org name=sitesearch type=hidden/ input
svn commit: r601941 - in /tomcat/site/trunk/xdocs: findhelp.xml getinvolved.xml
Author: funkman Date: Thu Dec 6 16:56:40 2007 New Revision: 601941 URL: http://svn.apache.org/viewvc?rev=601941view=rev Log: faq move to wiki Modified: tomcat/site/trunk/xdocs/findhelp.xml tomcat/site/trunk/xdocs/getinvolved.xml Modified: tomcat/site/trunk/xdocs/findhelp.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/findhelp.xml?rev=601941r1=601940r2=601941view=diff == --- tomcat/site/trunk/xdocs/findhelp.xml (original) +++ tomcat/site/trunk/xdocs/findhelp.xml Thu Dec 6 16:56:40 2007 @@ -30,7 +30,7 @@ favourite search engine to try and find it./p pAnswers to very common questions are documented on the -a href=/faq/FAQ/a./p +a href=http://wiki.apache.org/tomcat/FAQ;FAQ/a./p pThe archives for the user mailing list are a rich source of useful information. Use the search features provided by one of them. A Modified: tomcat/site/trunk/xdocs/getinvolved.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/getinvolved.xml?rev=601941r1=601940r2=601941view=diff == --- tomcat/site/trunk/xdocs/getinvolved.xml (original) +++ tomcat/site/trunk/xdocs/getinvolved.xml Thu Dec 6 16:56:40 2007 @@ -17,7 +17,7 @@ ul liAnswer questions posted to the a href=lists.htmlmailing lists/a. /li - liContribute to the a href=/faqFAQ/a or + liContribute to the a href=http://wiki.apache.org/tomcat/FAQ;FAQ/a or a href=http://wiki.apache.org/tomcat;Wiki/a./li liContribute other documentation patches, either for the website or for the Apache Tomcat user documentation./li - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: FAQ chucking alternatives
Cool. We'll need explicit mappings since the old names and new pages aren't the same. Like this: RewriteRule /faq/classnotfound.html http://wiki.apache.org/tomcat/FAQ/Class_Not_Found [R=301] Unless someone beats me - I'll try to do that this evening. (East Coast USA time) If mod_alias is available, this would work too: RedirectPermanent /faq/classnotfound.html http://wiki.apache.org/tomcat/FAQ/Class_Not_Found From an admin point of view - I'm not sure if there is a preference. -Tim Yoav Shapira wrote: RewriteEngine On RewriteRule /faq/(.*) http://wiki.apache.org/tomcat/FAQ/$1 [R=301] +1 I am not 100% the mapping will be this simple. It is is, great. If not, we could either map each page or do: RewriteRule /faq/(.*) http://wiki.apache.org/tomcat/FAQ [R=301] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r601172 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.xml webapps/docs/changelog.xml webapps/docs/funcspecs/project.xml webapps/docs/index.xml
Author: funkman
Date: Tue Dec 4 16:45:41 2007
New Revision: 601172
URL: http://svn.apache.org/viewvc?rev=601172view=rev
Log:
backport BZ 43530 per approved STATUS
doc link fixes patch inspired by Paul Shemansky
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/project.xml
tomcat/tc6.0.x/trunk/webapps/docs/index.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=601172r1=601171r2=601172view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Dec 4 16:45:41 2007
@@ -31,12 +31,6 @@
+1: jfclere
-1: fhanik - Can we add the 'package' directive to make the package match
the dir structure
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43530
- Fix bad links on docs home page
- http://svn.apache.org/viewvc?view=revrevision=600222
- +1: funkman, markt, pero, remm
- -1:
-
* Port license fix from TC5 that got missed last time - sorry
http://svn.apache.org/viewvc?rev=600993view=rev
+1: markt, fhanik
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=601172r1=601171r2=601172view=diff
==
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Tue Dec 4 16:45:41 2007
@@ -347,7 +347,7 @@
copy tofile=${tomcat.build}/webapps/docs/appdev/sample/build.xml
file=webapps/docs/appdev/build.xml.txt/
- mkdir dir=${tomcat.build}/webapps/docs/funcspec /
+ mkdir dir=${tomcat.build}/webapps/docs/funcspecs /
!-- XSL processing --
style basedir=webapps/docs
@@ -372,7 +372,7 @@
style=webapps/docs/tomcat-docs.xsl
excludes=project.xml
includes=*.xml
- param name=relative-path expression=../../
+ param name=relative-path expression=../
/style
style basedir=webapps/docs/config
destdir=${tomcat.build}/webapps/docs/config
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=601172r1=601171r2=601172view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Dec 4 16:45:41 2007
@@ -89,6 +89,9 @@
fixbug43687/bug Remove conditional headers on Form Auth replay,
since the UA (esp. FireFox) isn't expecting it.
/fix
+ fix
+bug43530 /bug: doc link fixes provided by Paul Shemansky (funkman)
+ /fix
/changelog
/subsection
subsection name=Coyote
Modified: tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/project.xml?rev=601172r1=601171r2=601172view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/project.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/project.xml Tue Dec 4 16:45:41
2007
@@ -27,7 +27,7 @@
body
menu name=Links
-item name=Docs Home href=../../index.html/
+item name=Docs Home href=../index.html/
item name=Functional Specs href=index.html/
/menu
Modified: tomcat/tc6.0.x/trunk/webapps/docs/index.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/index.xml?rev=601172r1=601171r2=601172view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/index.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/index.xml Tue Dec 4 16:45:41 2007
@@ -177,7 +177,7 @@
lia href=developers.htmlstrongDevelopers/strong/a - List of active
Apache Tomcat contributors.
/li
-lia href=catalina/funcspecs/index.htmlstrongFunctional
Specifications/strong/a
+lia href=funcspecs/index.htmlstrongFunctional
Specifications/strong/a
- Requirements specifications for features of the emCatalina/em servlet
container portion of Apache Tomcat 6./li
lia href=api/index.htmlstrongJavadocs/strong/a
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r601180 - in /tomcat/trunk: build.xml webapps/docs/build.xml webapps/docs/tomcat-docs.xsl
Author: funkman
Date: Tue Dec 4 17:08:54 2007
New Revision: 601180
URL: http://svn.apache.org/viewvc?rev=601180view=rev
Log:
http://code.google.com/p/google-highly-open-participation-asf/issues/detail?id=23
Printer friendlize the docs
Also discovered webapps/docs/build.xml is no longer used from the
main build.xml. Can that be chucked?
Modified:
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/build.xml
tomcat/trunk/webapps/docs/tomcat-docs.xsl
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=601180r1=601179r2=601180view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Dec 4 17:08:54 2007
@@ -90,7 +90,7 @@
delete dir=${tomcat.build}/temp /
delete dir=${tomcat.build}/work /
- mkdir dir=${tomcat.build}/
+mkdir dir=${tomcat.build}/
mkdir dir=${tomcat.build}/bin/
mkdir dir=${tomcat.build}/conf/
mkdir dir=${tomcat.build}/lib/
@@ -115,8 +115,8 @@
/javac
tstamp
format property=TODAY pattern=MMM d locale=en/
- format property=TSTAMP pattern=hh:mm:ss/
-/tstamp
+ format property=TSTAMP pattern=hh:mm:ss/
+/tstamp
!-- Copy static resource files --
filter token=VERSION value=${version}/
filter token=VERSION_NUMBER value=${version.number}/
@@ -184,7 +184,7 @@
/jar
!-- Bootstrap JAR File --
-jar jarfile=${bootstrap.jar}
+jar jarfile=${bootstrap.jar}
manifest=res/bootstrap.jar.manifest
fileset dir=${tomcat.classes}
include name=org/apache/catalina/startup/Bootstrap.class /
@@ -233,7 +233,7 @@
exclude name=org/apache/naming/factory/webservices/** /
/fileset
/jar
-
+
!-- Catalina GroupCom/Tribes JAR File --
jar jarfile=${catalina-tribes.jar}
fileset dir=${tomcat.classes}
@@ -341,15 +341,15 @@
/fileset
/copy
filter token=VERSION value=${version}/
-copy tofile=${tomcat.build}/webapps/docs/RELEASE-NOTES.txt
file=RELEASE-NOTES
+copy tofile=${tomcat.build}/webapps/docs/RELEASE-NOTES.txt
file=RELEASE-NOTES
filtering=true /
copy tofile=${tomcat.build}/webapps/docs/appdev/sample/build.xml
file=webapps/docs/appdev/build.xml.txt/
-
- mkdir dir=${tomcat.build}/webapps/docs/funcspecs /
-
- !-- XSL processing --
+
+mkdir dir=${tomcat.build}/webapps/docs/funcspecs /
+
+!-- XSL processing --
style basedir=webapps/docs
destdir=${tomcat.build}/webapps/docs
extension=.html
@@ -390,7 +390,7 @@
includes=*.xml
param name=relative-path expression=../
/style
-
+
style basedir=webapps/docs/tribes
destdir=${tomcat.build}/webapps/docs/tribes
extension=.html
@@ -399,72 +399,6 @@
includes=*.xml
param name=relative-path expression=../
/style
-
- !-- Print friendly version --
- mkdir dir=${tomcat.build}/webapps/docs/printer /
-copy todir=${tomcat.build}/webapps/docs/printer
- fileset dir=.
-include name=BUILDING.txt/
-include name=NOTICE/
-include name=RUNNING.txt/
- /fileset
-/copy
- mkdir dir=${tomcat.build}/webapps/docs/appdev/printer /
-copy todir=${tomcat.build}/webapps/docs/appdev/printer
-fileset dir=webapps
- include name=docs/appdev/*.txt/
-/fileset
-/copy
- mkdir dir=${tomcat.build}/webapps/docs/funcspecs/printer /
-mkdir dir=${tomcat.build}/webapps/docs/architecture/printer/
-mkdir dir=${tomcat.build}/webapps/docs/config/printer/
-
- style basedir=webapps/docs
- destdir=${tomcat.build}/webapps/docs/printer
- extension=.html
- style=webapps/docs/tomcat-docs.xsl
- excludes=build.xml project.xml
- includes=*.xml
- param name=relative-path expression=./../
- param name=project-menu expression=nomenu/
-/style
-style basedir=webapps/docs/appdev
- destdir=${tomcat.build}/webapps/docs/appdev/printer
- extension=.html
- style=webapps/docs/tomcat-docs.xsl
- excludes=project.xml
- includes=*.xml
- param name=relative-path expression=../../
- param name=project-menu expression=nomenu/
-/style
-style basedir=webapps/docs/funcspecs
- destdir=${tomcat.build}/webapps/docs/funcspecs/printer
- extension=.html
- style=webapps/docs/tomcat-docs.xsl
- excludes=project.xml
- includes=*.xml
- param name=relative-path expression=../../../
- param name=project-menu expression=nomenu/
-/style
-style basedir=webapps/docs/config
- destdir=${tomcat.build}/webapps/docs/config/printer
- extension=.html
- style=webapps/docs/tomcat-docs.xsl
- excludes
svn commit: r601182 - in /tomcat/site/trunk: docs/stylesheets/tomcat-printer.css xdocs/stylesheets/tomcat-site.xsl
Author: funkman
Date: Tue Dec 4 17:28:31 2007
New Revision: 601182
URL: http://svn.apache.org/viewvc?rev=601182view=rev
Log:
http://code.google.com/p/google-highly-open-participation-asf/issues/detail?id=23
printer friendly support
patch by Vitezslav Smid
Added:
tomcat/site/trunk/docs/stylesheets/tomcat-printer.css (with props)
Modified:
tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl
Added: tomcat/site/trunk/docs/stylesheets/tomcat-printer.css
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/stylesheets/tomcat-printer.css?rev=601182view=auto
==
--- tomcat/site/trunk/docs/stylesheets/tomcat-printer.css (added)
+++ tomcat/site/trunk/docs/stylesheets/tomcat-printer.css Tue Dec 4 17:28:31
2007
@@ -0,0 +1,3 @@
+.noPrint {display: none;}
+td#mainBody {width: 100%;}
+
Propchange: tomcat/site/trunk/docs/stylesheets/tomcat-printer.css
--
svn:eol-style = native
Propchange: tomcat/site/trunk/docs/stylesheets/tomcat-printer.css
--
svn:executable = *
Modified: tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl?rev=601182r1=601181r2=601182view=diff
==
--- tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl (original)
+++ tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Tue Dec 4 17:28:31 2007
@@ -56,6 +56,7 @@
!-- YS 20051102: Add a stylesheet --
link type=text/css href=stylesheets/tomcat.css rel=stylesheet /
+link type=text/css href=stylesheets/tomcat-printer.css
rel=stylesheet media=print /
/head
body bgcolor={$body-bg} text={$body-fg} link={$body-link}
@@ -87,7 +88,7 @@
/table
!-- Search box: uses CSS positioning --
-div class=searchbox
+div class=searchbox noPrint
form action=http://www.google.com/search; method=get
input value=tomcat.apache.org name=sitesearch type=hidden /
input value=Search the Site size=25 name=q id=query
type=text /
@@ -106,14 +107,13 @@
/tr
tr
-
xsl:commentLEFT SIDE NAVIGATION/xsl:comment
-td width=20% valign=top nowrap=true
+td width=20% valign=top nowrap=true class=noPrint
xsl:apply-templates select=$project/body/menu/
/td
xsl:commentRIGHT SIDE MAIN BODY/xsl:comment
-td width=80% valign=top align=left
+td width=80% valign=top align=left id=mainBody
xsl:apply-templates select=body/section/
/td
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r601188 - /tomcat/trunk/conf/web.xml
Author: funkman Date: Tue Dec 4 18:14:27 2007 New Revision: 601188 URL: http://svn.apache.org/viewvc?rev=601188view=rev Log: 43993 - mime mapping for WS-Policy Patch by Fabian Ritzmann Modified: tomcat/trunk/conf/web.xml Modified: tomcat/trunk/conf/web.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=601188r1=601187r2=601188view=diff == --- tomcat/trunk/conf/web.xml (original) +++ tomcat/trunk/conf/web.xml Tue Dec 4 18:14:27 2007 @@ -1143,6 +1143,10 @@ mime-typex-world/x-vrml/mime-type /mime-mapping mime-mapping +extensionwspolicy/extension +mime-typeapplication/wspolicy+xml/mime-type +/mime-mapping +mime-mapping extensionZ/extension mime-typeapplication/x-compress/mime-type /mime-mapping - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r601189 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Tue Dec 4 18:16:48 2007 New Revision: 601189 URL: http://svn.apache.org/viewvc?rev=601189view=rev Log: proposal for 43993 - mime mapping for WS-Policy http://svn.apache.org/viewvc?rev=601188view=rev Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=601189r1=601188r2=601189view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Dec 4 18:16:48 2007 @@ -33,5 +33,11 @@ * Port license fix from TC5 that got missed last time - sorry http://svn.apache.org/viewvc?rev=600993view=rev - +1: markt, fhanik + +1: markt, fhanik, funkman -1: + +* 43993 - mime mapping for WS-Policy + http://svn.apache.org/viewvc?rev=601188view=rev + +1: funkman + -1: + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r600221 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Sat Dec 1 17:01:34 2007 New Revision: 600221 URL: http://svn.apache.org/viewvc?rev=600221view=rev Log: a few +1 votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=600221r1=600220r2=600221view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Dec 1 17:01:34 2007 @@ -38,7 +38,7 @@ * Add get/set methods for properties in the Tcp Failure detector http://people.apache.org/~fhanik/patches/tcpfaildet-getset.patch - +1: fhanik, pero + +1: fhanik, pero, funkman -1: * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43706 @@ -56,24 +56,24 @@ * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43757 Use SMAP info rather than string matching to ID line number in JSP http://svn.apache.org/viewvc?rev=599605view=rev - +1: markt + +1: markt, funkman -1: * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43622 Don't always overwrite min compression size with default http://svn.apache.org/viewvc?rev=599914view=rev - +1: markt + +1: markt, funkman -1: * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43611 Provide an error message when trying to upload a war if the context is defined in server.xml http://svn.apache.org/viewvc?rev=600177view=rev - +1: markt + +1: markt, funkman -1: * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43594 Use CATALINA_BASE (if set) for setenv http://svn.apache.org/viewvc?rev=600185view=rev - +1: markt + +1: markt, funkman -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r600222 - in /tomcat/trunk: build.xml webapps/docs/funcspecs/project.xml webapps/docs/index.xml
Author: funkman
Date: Sat Dec 1 17:11:50 2007
New Revision: 600222
URL: http://svn.apache.org/viewvc?rev=600222view=rev
Log:
BZ 43530
Path inspired by Paul Shemansky : paul.shemansky
at gmail com
Modified:
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/funcspecs/project.xml
tomcat/trunk/webapps/docs/index.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=600222r1=600221r2=600222view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Sat Dec 1 17:11:50 2007
@@ -347,7 +347,7 @@
copy tofile=${tomcat.build}/webapps/docs/appdev/sample/build.xml
file=webapps/docs/appdev/build.xml.txt/
- mkdir dir=${tomcat.build}/webapps/docs/funcspec /
+ mkdir dir=${tomcat.build}/webapps/docs/funcspecs /
!-- XSL processing --
style basedir=webapps/docs
@@ -372,7 +372,7 @@
style=webapps/docs/tomcat-docs.xsl
excludes=project.xml
includes=*.xml
- param name=relative-path expression=../../
+ param name=relative-path expression=../
/style
style basedir=webapps/docs/config
destdir=${tomcat.build}/webapps/docs/config
Modified: tomcat/trunk/webapps/docs/funcspecs/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/funcspecs/project.xml?rev=600222r1=600221r2=600222view=diff
==
--- tomcat/trunk/webapps/docs/funcspecs/project.xml (original)
+++ tomcat/trunk/webapps/docs/funcspecs/project.xml Sat Dec 1 17:11:50 2007
@@ -27,7 +27,7 @@
body
menu name=Links
-item name=Docs Home href=../../index.html/
+item name=Docs Home href=../index.html/
item name=Functional Specs href=index.html/
/menu
Modified: tomcat/trunk/webapps/docs/index.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/index.xml?rev=600222r1=600221r2=600222view=diff
==
--- tomcat/trunk/webapps/docs/index.xml (original)
+++ tomcat/trunk/webapps/docs/index.xml Sat Dec 1 17:11:50 2007
@@ -177,7 +177,7 @@
lia href=developers.htmlstrongDevelopers/strong/a - List of active
Apache Tomcat contributors.
/li
-lia href=catalina/funcspecs/index.htmlstrongFunctional
Specifications/strong/a
+lia href=funcspecs/index.htmlstrongFunctional
Specifications/strong/a
- Requirements specifications for features of the emCatalina/em servlet
container portion of Apache Tomcat 6./li
lia href=api/index.htmlstrongJavadocs/strong/a
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r600223 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Sat Dec 1 17:16:12 2007 New Revision: 600223 URL: http://svn.apache.org/viewvc?rev=600223view=rev Log: for http://issues.apache.org/bugzilla/show_bug.cgi?id=43530 Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=600223r1=600222r2=600223view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Dec 1 17:16:12 2007 @@ -77,3 +77,9 @@ http://svn.apache.org/viewvc?rev=600185view=rev +1: markt, funkman -1: + +* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43530 + Fix bad links on docs home page + http://svn.apache.org/viewvc?view=revrevision=600222 + +1: funkman + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r586571 - /tomcat/tc6.0.x/trunk/STATUS
Author: funkman Date: Fri Oct 19 11:30:30 2007 New Revision: 586571 URL: http://svn.apache.org/viewvc?rev=586571view=rev Log: +1 Modified: tomcat/tc6.0.x/trunk/STATUS Modified: tomcat/tc6.0.x/trunk/STATUS URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=586571r1=586570r2=586571view=diff == --- tomcat/tc6.0.x/trunk/STATUS (original) +++ tomcat/tc6.0.x/trunk/STATUS Fri Oct 19 11:30:30 2007 @@ -29,7 +29,7 @@ * Connector is no longer an exception case. Any new component can still use setProperty and return a boolean * to accept or reject the property http://people.apache.org/~fhanik/patches/digester-attribute-warnings.patch - +1: fhanik, yoavs + +1: fhanik, yoavs,funkman -1: * IcedTea support. Upcoming Linux distributions will package a (working) open source JRE, @@ -70,11 +70,11 @@ escaping. This patch also tidies up ServerCookie to make it clearer what applies to which particular cookie spec. http://people.apache.org/~markt/patches/2007-10-18-cookies.patch - +1: markt, fhanik + +1: markt, fhanik,funkman -1: * Fix MD5 files for distribution http://issues.apache.org/bugzilla/attachment.cgi?id=21009action=view - +1: fhanik + +1: fhanik,funkman -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r585189 - /tomcat/tc6.0.x/trunk/STATUS
Author: funkman
Date: Tue Oct 16 09:27:32 2007
New Revision: 585189
URL: http://svn.apache.org/viewvc?rev=585189view=rev
Log:
+1 a few patches
Modified:
tomcat/tc6.0.x/trunk/STATUS
Modified: tomcat/tc6.0.x/trunk/STATUS
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=585189r1=585188r2=585189view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS (original)
+++ tomcat/tc6.0.x/trunk/STATUS Tue Oct 16 09:27:32 2007
@@ -34,12 +34,12 @@
* Add missing mbean descriptor
http://people.apache.org/~fhanik/patches/loader-mbean.patch
- +1: fhanik
+ +1: fhanik,funkman
-1:
* Proposed solution to http://issues.apache.org/bugzilla/show_bug.cgi?id=42693
Patch: http://issues.apache.org/bugzilla/attachment.cgi?id=20940
- +1: fhanik
+ +1: fhanik,funkman
-1:
* Fix important vulnerability when webdav is enabled for write
@@ -49,10 +49,10 @@
* Fix for JDT update: update jdt.jar in build.properties.default to:
jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.3.1.v_780_R33x.jar
- +1: remm, fhanik
+ +1: remm, fhanik,funkman
-1:
* Fix property setter for keystore type
http://issues.apache.org/bugzilla/show_bug.cgi?id=43634
- +1: fhanik
- -1:
\ No newline at end of file
+ +1: fhanik,funkman
+ -1:
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r584774 - /tomcat/tc6.0.x/trunk/STATUS
Author: funkman Date: Mon Oct 15 05:41:09 2007 New Revision: 584774 URL: http://svn.apache.org/viewvc?rev=584774view=rev Log: webdav vote Modified: tomcat/tc6.0.x/trunk/STATUS Modified: tomcat/tc6.0.x/trunk/STATUS URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=584774r1=584773r2=584774view=diff == --- tomcat/tc6.0.x/trunk/STATUS (original) +++ tomcat/tc6.0.x/trunk/STATUS Mon Oct 15 05:41:09 2007 @@ -88,5 +88,5 @@ * Fix important vulnerability when webdav is enabled for write Patch: http://marc.info/?l=tomcat-devm=119245116910632w=2 - +1: markt + +1: markt,funkman -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r582924 - /tomcat/tc6.0.x/trunk/STATUS
Author: funkman Date: Mon Oct 8 11:18:14 2007 New Revision: 582924 URL: http://svn.apache.org/viewvc?rev=582924view=rev Log: +1 proposals abstained from Call StopAwait at StandardServer.stop as port==-1 since it was missing the patch in the status file Modified: tomcat/tc6.0.x/trunk/STATUS Modified: tomcat/tc6.0.x/trunk/STATUS URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=582924r1=582923r2=582924view=diff == --- tomcat/tc6.0.x/trunk/STATUS (original) +++ tomcat/tc6.0.x/trunk/STATUS Mon Oct 8 11:18:14 2007 @@ -27,22 +27,22 @@ * Fix explicit flush before response commit in the org.apache.jk AJP connector. http://svn.apache.org/viewvc?view=revrevision=580815 - +1: remm, pero + +1: remm, pero, funkman -1: * 43479: Memory leak cleaning up sendfile connections (submitted by the bug reporter) http://issues.apache.org/bugzilla/attachment.cgi?id=20883 - +1: remm, pero + +1: remm, pero, funkman -1: * 42925: No timeout for sendfile http://issues.apache.org/bugzilla/attachment.cgi?id=20930 - +1: remm, pero + +1: remm, pero, funkman -1: * Use newer eclipse jdt - old location is gone (reported by Jason Britian via email) update to jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip - +1: pero + +1: pero, funkman -1: * Call StopAwait at StandardServer.stop as port==-1 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r578610 - /tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
Author: funkman
Date: Sun Sep 23 16:33:56 2007
New Revision: 578610
URL: http://svn.apache.org/viewvc?rev=578610view=rev
Log:
bug 41797: CNFE/NPE thrown from function mapper when externalizing
Patch by Tuomas Kiviaho- tuomas.kiviahos at ikis fi
(submit part2 of the patch as seem in comment #3)
(Format police - help!!! I did my best)
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java?rev=578610r1=578609r2=578610view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java Sun
Sep 23 16:33:56 2007
@@ -120,9 +120,16 @@
public void writeExternal(ObjectOutput out) throws IOException {
out.writeUTF((this.prefix != null) ? this.prefix : );
out.writeUTF(this.localName);
-out.writeUTF(this.m.getDeclaringClass().getName());
-out.writeUTF(this.m.getName());
-
out.writeObject(ReflectionUtil.toTypeNameArray(this.m.getParameterTypes()));
+out.writeUTF((this.owner != null) ?
+ this.owner :
+ this.m.getDeclaringClass().getName());
+out.writeUTF((this.name != null) ?
+ this.name :
+ this.m.getName());
+out.writeObject((this.types != null) ?
+ this.types :
+
ReflectionUtil.toTypeNameArray(this.m.getParameterTypes()));
+
}
/*
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r578613 - in /tomcat/tc6.0.x/trunk: java/org/apache/catalina/core/StandardContext.java webapps/docs/changelog.xml
Author: funkman
Date: Sun Sep 23 16:53:05 2007
New Revision: 578613
URL: http://svn.apache.org/viewvc?rev=578613view=rev
Log:
bug 43453: ClassCastException at
org.apache.catalina.core.StandardContext.findStatusPage(int)
In reality - I don't see anywhere that calls findStatusPage(). Is there a
chance (in the future)
to drop this method from StandardContext as well as the Context interface?
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=578613r1=578612r2=578613view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Sun
Sep 23 16:53:05 2007
@@ -2938,7 +2938,11 @@
*/
public String findStatusPage(int status) {
-return ((String) statusPages.get(new Integer(status)));
+ErrorPage errorPage = (ErrorPage)statusPages.get(new Integer(status));
+if (errorPage!=null) {
+return errorPage.getLocation();
+}
+return null;
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=578613r1=578612r2=578613view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Sep 23 16:53:05 2007
@@ -100,7 +100,12 @@
/fix
fix
bug41797/bug: CNFE/NPE thrown from function mapper when
externalizing
-Patch by Tuomas Kiviaho- tuomas.kiviahos at ikis fi
+Patch by Tuomas Kiviaho- tuomas.kiviahos at ikis fi (funkman)
+ /fix
+ fix
+bug43453/bug: ClassCastException at
+org.apache.catalina.core.StandardContext.findStatusPage(int)
+ (funkman)
/fix
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r578466 - in /tomcat/tc6.0.x/trunk: java/org/apache/el/lang/FunctionMapperImpl.java webapps/docs/changelog.xml
Author: funkman
Date: Sat Sep 22 11:05:54 2007
New Revision: 578466
URL: http://svn.apache.org/viewvc?rev=578466view=rev
Log:
bug 41797: CNFE/NPE thrown from function mapper when externalizing
Patch by Tuomas Kiviaho- tuomas.kiviahos at ikis fi
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java?rev=578466r1=578465r2=578466view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java Sat
Sep 22 11:05:54 2007
@@ -144,7 +144,7 @@
public Method getMethod() {
if (this.m == null) {
try {
-Class t = Class.forName(this.owner);
+Class t = ReflectionUtil.forName(this.owner);
Class[] p = ReflectionUtil.toTypeArray(this.types);
this.m = t.getMethod(this.name, p);
} catch (Exception e) {
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=578466r1=578465r2=578466view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Sep 22 11:05:54 2007
@@ -98,6 +98,10 @@
bug43338/bug: Support '*' servlet-name mapping at filter-mapping.
Patch provided by Keiichi Fujino. (pero)
/fix
+ fix
+bug41797/bug: CNFE/NPE thrown from function mapper when
externalizing
+Patch by Tuomas Kiviaho- tuomas.kiviahos at ikis fi
+ /fix
/changelog
/subsection
subsection name=Coyote
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r575945 - in /tomcat/tc6.0.x/trunk: java/org/apache/naming/resources/FileDirContext.java webapps/docs/changelog.xml
Author: funkman
Date: Sat Sep 15 10:42:01 2007
New Revision: 575945
URL: http://svn.apache.org/viewvc?rev=575945view=rev
Log:
undo 575332 (alias support) due to 2 vetos
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java?rev=575945r1=575944r2=575945view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
Sat Sep 15 10:42:01 2007
@@ -108,17 +108,6 @@
protected boolean allowLinking = false;
-/**
- * Aliases
- */
-protected String aliases;
-
-
-/**
- * Aliases in decoded form.
- */
-protected Alias[] pathAliases;
-
// - Properties
@@ -134,22 +123,22 @@
*/
public void setDocBase(String docBase) {
-// Validate the format of the proposed document root
-if (docBase == null)
-throw new IllegalArgumentException
-(sm.getString(resources.null));
+// Validate the format of the proposed document root
+if (docBase == null)
+throw new IllegalArgumentException
+(sm.getString(resources.null));
-// Calculate a File object referencing this document base directory
-base = new File(docBase);
+// Calculate a File object referencing this document base directory
+base = new File(docBase);
try {
base = base.getCanonicalFile();
} catch (IOException e) {
// Ignore
}
-// Validate that the document base is an existing directory
-if (!base.exists() || !base.isDirectory() || !base.canRead())
-throw new IllegalArgumentException
+// Validate that the document base is an existing directory
+if (!base.exists() || !base.isDirectory() || !base.canRead())
+throw new IllegalArgumentException
(sm.getString(fileResources.base, docBase));
this.absoluteBase = base.getAbsolutePath();
super.setDocBase(docBase);
@@ -188,69 +177,18 @@
return allowLinking;
}
-/**
- * Get the alias string in use.
- */
-public String getAliases(String aliases) {
-return aliases;
-}
+
+// - Public Methods
/**
- * Set files system aliases. Aliases are of the form
- * preprefix=path,prefix2=path2/pre
- * For example:
- * pre
- * /images/=/tmp/images/,
- * /pdf/=/usr/local/data/pdfs/
- * /pre
+ * Release any resources allocated for this directory context.
*/
-public void setAliases(String aliases) {
-this.aliases = aliases;
-
-pathAliases = null;
-if (this.aliases!=null) {
-this.aliases = this.aliases.trim();
-}
-if (this.aliases==null||this.aliases.length()==0) {
-this.aliases=null;
-return;
-}
-
-String[] split1 = this.aliases.split(,);
-ArrayList aliasList = new ArrayList();
-for (int i=0; split1!=null isplit1.length; i++) {
-String[] kvp = split1[i].split(=);
-if (kvp!=nullkvp.length==2) {
-kvp[0] = kvp[0].trim();
-kvp[1] = kvp[1].trim();
-
-if (kvp[0].length()0 kvp[1].length()0) {
-Alias alias = new Alias();
-alias.prefix=kvp[0];
-alias.basePath= new File(kvp[1]);
-alias.absPath=alias.basePath.getAbsolutePath();
-aliasList.add(alias);
-}
-}
-}
-
-if (aliasList.size()0) {
-pathAliases = new Alias[aliasList.size()];
-for (int i=0; ialiasList.size(); i++) {
-pathAliases[i] = (Alias)aliasList.get(i);
-}
-} else {
-this.aliases=null;
-}
+public void release() {
+super.release();
}
-// - Public Methods
-
-
-
-
// Context Methods
@@ -335,20 +273,7 @@
throw new NamingException
(sm.getString(resources.notFound, oldName));
-File baseDir = base;
-String absoluteBaseDir = absoluteBase;
-
-if (pathAliases!=null) {
-for (int i=0; ipathAliases.length; i++) {
-if (newName.startsWith(pathAliases[i].prefix)) {
-baseDir = pathAliases[i].basePath;
-newName
svn commit: r575332 - in /tomcat/tc6.0.x/trunk: java/org/apache/naming/resources/FileDirContext.java webapps/docs/changelog.xml
Author: funkman
Date: Thu Sep 13 08:19:59 2007
New Revision: 575332
URL: http://svn.apache.org/viewvc?rev=575332view=rev
Log:
Allow for Aliases at the resource level.
This is to prevent situations of relying on symlinks, or Filters
while still make outside directories appear as part of the webapp.
(A common feature request seen on the user list)
Example usage:
Context ...
Resources className=org.apache.naming.resources.FileDirContext
aliases=/doh/=C:/tmp/woohoo/,
/mm/=C:/opt/data/doughnuts/ /
/Context
If the feature is NOT used - there is no additional overhead.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java?rev=575332r1=575331r2=575332view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
Thu Sep 13 08:19:59 2007
@@ -108,6 +108,17 @@
protected boolean allowLinking = false;
+/**
+ * Aliases
+ */
+protected String aliases;
+
+
+/**
+ * Aliases in decoded form.
+ */
+protected Alias[] pathAliases;
+
// - Properties
@@ -123,22 +134,22 @@
*/
public void setDocBase(String docBase) {
-// Validate the format of the proposed document root
-if (docBase == null)
-throw new IllegalArgumentException
-(sm.getString(resources.null));
+// Validate the format of the proposed document root
+if (docBase == null)
+throw new IllegalArgumentException
+(sm.getString(resources.null));
-// Calculate a File object referencing this document base directory
-base = new File(docBase);
+// Calculate a File object referencing this document base directory
+base = new File(docBase);
try {
base = base.getCanonicalFile();
} catch (IOException e) {
// Ignore
}
-// Validate that the document base is an existing directory
-if (!base.exists() || !base.isDirectory() || !base.canRead())
-throw new IllegalArgumentException
+// Validate that the document base is an existing directory
+if (!base.exists() || !base.isDirectory() || !base.canRead())
+throw new IllegalArgumentException
(sm.getString(fileResources.base, docBase));
this.absoluteBase = base.getAbsolutePath();
super.setDocBase(docBase);
@@ -177,18 +188,69 @@
return allowLinking;
}
-
-// - Public Methods
+/**
+ * Get the alias string in use.
+ */
+public String getAliases(String aliases) {
+return aliases;
+}
/**
- * Release any resources allocated for this directory context.
+ * Set files system aliases. Aliases are of the form
+ * preprefix=path,prefix2=path2/pre
+ * For example:
+ * pre
+ * /images/=/tmp/images/,
+ * /pdf/=/usr/local/data/pdfs/
+ * /pre
*/
-public void release() {
-super.release();
+public void setAliases(String aliases) {
+this.aliases = aliases;
+
+pathAliases = null;
+if (this.aliases!=null) {
+this.aliases = this.aliases.trim();
+}
+if (this.aliases==null||this.aliases.length()==0) {
+this.aliases=null;
+return;
+}
+
+String[] split1 = this.aliases.split(,);
+ArrayList aliasList = new ArrayList();
+for (int i=0; split1!=null isplit1.length; i++) {
+String[] kvp = split1[i].split(=);
+if (kvp!=nullkvp.length==2) {
+kvp[0] = kvp[0].trim();
+kvp[1] = kvp[1].trim();
+
+if (kvp[0].length()0 kvp[1].length()0) {
+Alias alias = new Alias();
+alias.prefix=kvp[0];
+alias.basePath= new File(kvp[1]);
+alias.absPath=alias.basePath.getAbsolutePath();
+aliasList.add(alias);
+}
+}
+}
+
+if (aliasList.size()0) {
+pathAliases = new Alias[aliasList.size()];
+for (int i=0; ialiasList.size(); i++) {
+pathAliases[i] = (Alias)aliasList.get(i);
+}
+} else {
+this.aliases=null;
+}
}
+// - Public Methods
+
+
+
+
// Context
svn commit: r575385 - /tomcat/tc6.0.x/trunk/webapps/docs/deployer-howto.xml
Author: funkman Date: Thu Sep 13 10:57:17 2007 New Revision: 575385 URL: http://svn.apache.org/viewvc?rev=575385view=rev Log: BZ 43057 - Trivail doc fix Modified: tomcat/tc6.0.x/trunk/webapps/docs/deployer-howto.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/deployer-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/deployer-howto.xml?rev=575385r1=575384r2=575385view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/deployer-howto.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/deployer-howto.xml Thu Sep 13 10:57:17 2007 @@ -121,7 +121,7 @@ /p p Context Descriptors not only help Tomcat to know how to configure -Contexts but other tools such as the Tomcat Manager and TDC often use +Contexts but other tools such as the Tomcat Manager and TCD often use these Context Descriptors to perform their roles properly. /p p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r575390 - /tomcat/tc6.0.x/trunk/dist.xml
Author: funkman
Date: Thu Sep 13 11:16:23 2007
New Revision: 575390
URL: http://svn.apache.org/viewvc?rev=575390view=rev
Log:
Bug 42831
Permissions aren't set correctly on $CATALINA_HOME/bin/version.sh
Modified:
tomcat/tc6.0.x/trunk/dist.xml
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=575390r1=575389r2=575390view=diff
==
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Thu Sep 13 11:16:23 2007
@@ -573,6 +573,7 @@
include name=bin/tool-wrapper-using-launcher.sh /
include name=bin/shutdown-using-launcher.sh /
include name=bin/startup-using-launcher.sh /
+include name=bin/version.sh /
/tarfileset
tarfileset dir=${tomcat.dist} mode=600 prefix=${final.name}
include name=conf/** /
@@ -602,6 +603,7 @@
exclude name=bin/tool-wrapper-using-launcher.sh /
exclude name=bin/shutdown-using-launcher.sh /
exclude name=bin/startup-using-launcher.sh /
+exclude name=bin/version.sh /
exclude name=conf/** /
exclude name=src/** /
exclude name=webapps/admin/** /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: [VOTE] Send trunk to the sandbox
Remy Maucherat wrote: Yeah right. So to summarize, we have 3 committers who are happy campers (2 of them which don't contribute much, as far as I know), and the rest of the committers are either do not care or are unhappy. Most also want a change in the development process, and as long as there's agreement on that and it respects the ASF principles, we should be able to do that. Bah. In neither angry nor happy. My impression was trunk was going to be wacky new stuff which broke existing api's and configurations with 6.0. Much like 5.0 -- 5.5. In reality that didn't happen - we just got some comet changes. (I'm not saying this is good or bad - it's just and observation) Now we are in a technical debate between comet implementation between Remy and Filips designs. This has seemed to migrate into a personal attack in a subtle manner. Such is life when coding. Disagreements occur, feeling are hurt and email is the worst method of communicating an emotional topic since words are amplified. (Sometime on purpose, other times by accident). My hope is this too shall pass and all is good again. Personally - I am not very clueful on comet other than the basics. I'd love to get the clue - but I can't find and work related projects to justify the time. That leaves me out in the cold due to this conversation. I feel any vote by me would be a bad vote because of my ignorance on the topic. It seems others are in the same situation. All that being said - I'd love to see Remy and Filip agree on comet and remove trunk. It would be a shame to see either leave due to these disputes. -Tim (Away for training in Boston this week (Kendall Square)) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r568345 - /tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml
Author: funkman Date: Tue Aug 21 17:59:43 2007 New Revision: 568345 URL: http://svn.apache.org/viewvc?rev=568345view=rev Log: BZ - 20068 Patch by Wendy Smoak wsmoak at apache org Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml?rev=568345r1=568344r2=568345view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml Tue Aug 21 17:59:43 2007 @@ -75,7 +75,7 @@ host/li liin individual files (with a .xml extension) in the code$CATALINA_HOME/conf/[enginename]/[hostname]//code directory. - The name of the file (less the .xml) extension will be used as the + The name of the file (less the .xml extension) will be used as the context path. Multi-level context paths may be defined using #, e.g. codecontext#path.xml/code. The default web application may be defined by using a file called codeROOT.xml/code./li @@ -95,9 +95,9 @@ blockquoteem pThe description below uses the variable name $CATALINA_HOME -to refer to the directory into which you have installed Tomcat 5, +to refer to the directory into which you have installed Tomcat 6, and is the base directory against which most relative paths are -resolved. However, if you have configured Tomcat 5 for multiple +resolved. However, if you have configured Tomcat 6 for multiple instances by setting a CATALINA_BASE directory, you should use $CATALINA_BASE instead of $CATALINA_HOME for each of these references./p @@ -607,7 +607,9 @@ nesting a strongListener/strong element inside this element. The class name you specify must implement the codeorg.apache.catalina.LifecycleListener/code interface, and -it will be notified about the occurrence of the coresponding +the class must be packaged in a jar and placed in the +code$CATALINA_HOME/lib/code directory. +It will be notified about the occurrence of the corresponding lifecycle events. Configuration of such a listener looks like this:/p source - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r568346 - /tomcat/trunk/webapps/docs/config/context.xml
Author: funkman Date: Tue Aug 21 18:02:01 2007 New Revision: 568346 URL: http://svn.apache.org/viewvc?rev=568346view=rev Log: BZ - 20068 Patch by Wendy Smoak wsmoak at apache org Modified: tomcat/trunk/webapps/docs/config/context.xml Modified: tomcat/trunk/webapps/docs/config/context.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/context.xml?rev=568346r1=568345r2=568346view=diff == --- tomcat/trunk/webapps/docs/config/context.xml (original) +++ tomcat/trunk/webapps/docs/config/context.xml Tue Aug 21 18:02:01 2007 @@ -1,4 +1,20 @@ ?xml version=1.0? +!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the License); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-- !DOCTYPE document [ !ENTITY project SYSTEM project.xml ] @@ -59,7 +75,7 @@ host/li liin individual files (with a .xml extension) in the code$CATALINA_HOME/conf/[enginename]/[hostname]//code directory. - The name of the file (less the .xml) extension will be used as the + The name of the file (less the .xml extension) will be used as the context path. Multi-level context paths may be defined using #, e.g. codecontext#path.xml/code. The default web application may be defined by using a file called codeROOT.xml/code./li @@ -79,9 +95,9 @@ blockquoteem pThe description below uses the variable name $CATALINA_HOME -to refer to the directory into which you have installed Tomcat 5, +to refer to the directory into which you have installed Tomcat 6, and is the base directory against which most relative paths are -resolved. However, if you have configured Tomcat 5 for multiple +resolved. However, if you have configured Tomcat 6 for multiple instances by setting a CATALINA_BASE directory, you should use $CATALINA_BASE instead of $CATALINA_HOME for each of these references./p @@ -591,7 +607,9 @@ nesting a strongListener/strong element inside this element. The class name you specify must implement the codeorg.apache.catalina.LifecycleListener/code interface, and -it will be notified about the occurrence of the coresponding +the class must be packaged in a jar and placed in the +code$CATALINA_HOME/lib/code directory. +It will be notified about the occurrence of the corresponding lifecycle events. Configuration of such a listener looks like this:/p source - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r568353 - /tomcat/tc6.0.x/trunk/webapps/ROOT/index.html
Author: funkman Date: Tue Aug 21 18:19:22 2007 New Revision: 568353 URL: http://svn.apache.org/viewvc?rev=568353view=rev Log: 42569 Small grammar correction on default Tomcat index.html page Modified: tomcat/tc6.0.x/trunk/webapps/ROOT/index.html Modified: tomcat/tc6.0.x/trunk/webapps/ROOT/index.html URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/ROOT/index.html?rev=568353r1=568352r2=568353view=diff == --- tomcat/tc6.0.x/trunk/webapps/ROOT/index.html (original) +++ tomcat/tc6.0.x/trunk/webapps/ROOT/index.html Tue Aug 21 18:19:22 2007 @@ -182,7 +182,7 @@ pAs you may have guessed by now, this is the default Tomcat home page. It can be found on the local filesystem at:/p p class=code$CATALINA_HOME/webapps/ROOT/index.html/p - pwhere $CATALINA_HOME is the root of the Tomcat installation directory. If you're seeing this page, and you don't think you should be, then either you're either a user who has arrived at new installation of Tomcat, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the a href=docsTomcat Documentation/a for more detailed setup and administration information than is found in the INSTALL file./p + pwhere $CATALINA_HOME is the root of the Tomcat installation directory. If you're seeing this page, and you don't think you should be, then you're either a user who has arrived at new installation of Tomcat, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the a href=docsTomcat Documentation/a for more detailed setup and administration information than is found in the INSTALL file./p pbNOTE: For security reasons, using the administration webapp is restricted to users with role admin. The manager webapp - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r568355 - /tomcat/trunk/webapps/ROOT/index.html
Author: funkman Date: Tue Aug 21 18:20:17 2007 New Revision: 568355 URL: http://svn.apache.org/viewvc?rev=568355view=rev Log: 42569 Small grammar correction on default Tomcat index.html page Modified: tomcat/trunk/webapps/ROOT/index.html Modified: tomcat/trunk/webapps/ROOT/index.html URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/ROOT/index.html?rev=568355r1=568354r2=568355view=diff == --- tomcat/trunk/webapps/ROOT/index.html (original) +++ tomcat/trunk/webapps/ROOT/index.html Tue Aug 21 18:20:17 2007 @@ -166,7 +166,7 @@ pAs you may have guessed by now, this is the default Tomcat home page. It can be found on the local filesystem at:/p p class=code$CATALINA_HOME/webapps/ROOT/index.html/p - pwhere $CATALINA_HOME is the root of the Tomcat installation directory. If you're seeing this page, and you don't think you should be, then either you're either a user who has arrived at new installation of Tomcat, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the a href=docsTomcat Documentation/a for more detailed setup and administration information than is found in the INSTALL file./p + pwhere $CATALINA_HOME is the root of the Tomcat installation directory. If you're seeing this page, and you don't think you should be, then you're either a user who has arrived at new installation of Tomcat, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the a href=docsTomcat Documentation/a for more detailed setup and administration information than is found in the INSTALL file./p pbNOTE: For security reasons, using the administration webapp is restricted to users with role admin. The manager webapp - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r568357 - /tomcat/trunk/bin/catalina.sh
Author: funkman Date: Tue Aug 21 18:25:09 2007 New Revision: 568357 URL: http://svn.apache.org/viewvc?rev=568357view=rev Log: 43155 remove commons-logging-api.jar since it ain't there Modified: tomcat/trunk/bin/catalina.sh Modified: tomcat/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=568357r1=568356r2=568357view=diff == --- tomcat/trunk/bin/catalina.sh (original) +++ tomcat/trunk/bin/catalina.sh Tue Aug 21 18:25:09 2007 @@ -116,7 +116,7 @@ # 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 if [ -r $CATALINA_HOME/bin/setclasspath.sh ]; then BASEDIR=$CATALINA_HOME @@ -132,7 +132,7 @@ if [ -n $JSSE_HOME ]; then CLASSPATH=$CLASSPATH:$JSSE_HOME/lib/jcert.jar:$JSSE_HOME/lib/jnet.jar:$JSSE_HOME/lib/jsse.jar fi -CLASSPATH=$CLASSPATH:$CATALINA_HOME/bin/bootstrap.jar:$CATALINA_HOME/bin/commons-logging-api.jar +CLASSPATH=$CLASSPATH:$CATALINA_HOME/bin/bootstrap.jar if [ -z $CATALINA_BASE ] ; then CATALINA_BASE=$CATALINA_HOME - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r568359 - /tomcat/tc6.0.x/trunk/bin/catalina.sh
Author: funkman Date: Tue Aug 21 18:26:43 2007 New Revision: 568359 URL: http://svn.apache.org/viewvc?rev=568359view=rev Log: 43155 remove commons-logging-api.jar since it ain't there Modified: tomcat/tc6.0.x/trunk/bin/catalina.sh Modified: tomcat/tc6.0.x/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.sh?rev=568359r1=568358r2=568359view=diff == --- tomcat/tc6.0.x/trunk/bin/catalina.sh (original) +++ tomcat/tc6.0.x/trunk/bin/catalina.sh Tue Aug 21 18:26:43 2007 @@ -148,7 +148,7 @@ if [ -n $JSSE_HOME ]; then CLASSPATH=$CLASSPATH:$JSSE_HOME/lib/jcert.jar:$JSSE_HOME/lib/jnet.jar:$JSSE_HOME/lib/jsse.jar fi -CLASSPATH=$CLASSPATH:$CATALINA_HOME/bin/bootstrap.jar:$CATALINA_HOME/bin/commons-logging-api.jar +CLASSPATH=$CLASSPATH:$CATALINA_HOME/bin/bootstrap.jar if [ -z $CATALINA_BASE ] ; then CATALINA_BASE=$CATALINA_HOME - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r568366 - /tomcat/tc6.0.x/trunk/webapps/docs/config/globalresources.xml
Author: funkman Date: Tue Aug 21 18:39:17 2007 New Revision: 568366 URL: http://svn.apache.org/viewvc?rev=568366view=rev Log: 42466 globalresources.xml has a wrong link patch from Takayoshi Kimura takayoshi at gmails dt com Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/globalresources.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/globalresources.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/globalresources.xml?rev=568366r1=568365r2=568366view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/config/globalresources.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/config/globalresources.xml Tue Aug 21 18:39:17 2007 @@ -221,7 +221,7 @@ per-web-application contexts. Here is an example of making a custom factory available to all applications in the server, based on the example definition in the -a href=../jndi-resource-howto.html#Generic JavaBean Resources +a href=../jndi-resources-howto.html#Generic JavaBean Resources JNDI Resource HOW-TO/a: /p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r568367 - /tomcat/trunk/webapps/docs/config/globalresources.xml
Author: funkman Date: Tue Aug 21 18:42:35 2007 New Revision: 568367 URL: http://svn.apache.org/viewvc?rev=568367view=rev Log: 42466 globalresources.xml has a wrong link patch from Takayoshi Kimura takayoshi at gmails dt com Modified: tomcat/trunk/webapps/docs/config/globalresources.xml Modified: tomcat/trunk/webapps/docs/config/globalresources.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/globalresources.xml?rev=568367r1=568366r2=568367view=diff == --- tomcat/trunk/webapps/docs/config/globalresources.xml (original) +++ tomcat/trunk/webapps/docs/config/globalresources.xml Tue Aug 21 18:42:35 2007 @@ -205,7 +205,7 @@ per-web-application contexts. Here is an example of making a custom factory available to all applications in the server, based on the example definition in the -a href=../jndi-resource-howto.html#Generic JavaBean Resources +a href=../jndi-resources-howto.html#Generic JavaBean Resources JNDI Resource HOW-TO/a: /p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r543460 - in /tomcat/site/trunk: docs/faq/connectors.html docs/faq/printer/connectors.html xdocs-faq/connectors.xml
Author: funkman Date: Fri Jun 1 04:28:14 2007 New Revision: 543460 URL: http://svn.apache.org/viewvc?view=revrev=543460 Log: jk2 update and other legacy cleanup Modified: tomcat/site/trunk/docs/faq/connectors.html tomcat/site/trunk/docs/faq/printer/connectors.html tomcat/site/trunk/xdocs-faq/connectors.xml Modified: tomcat/site/trunk/docs/faq/connectors.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/faq/connectors.html?view=diffrev=543460r1=543459r2=543460 == --- tomcat/site/trunk/docs/faq/connectors.html (original) +++ tomcat/site/trunk/docs/faq/connectors.html Fri Jun 1 04:28:14 2007 @@ -13,7 +13,11 @@ /p p -a href=http://tomcat.apache.org/connectors-doc/;JK docs./a +Here is a link to the a href=http://tomcat.apache.org/connectors-doc/;JK Connectors./a It contains +more configuration and installation information. + /p + p +strongPlease note, jk2 is no longer supported. Please use mod_jk instead./strong /p /blockquote/td/tr/tabletable cellpadding=2 cellspacing=0 border=0trtd bgcolor=#525D76font face=arial,helvetica.sanserif color=#ffa name=QuestionsstrongQuestions/strong/a/font/td/trtrtdblockquote p @@ -38,14 +42,6 @@ At boot, is order of start up (Apache vs Tomcat) important? /a /li -li - a href=#jkloc - JK2 doesn't seem to be using my settings in my - codeworkers2.properties/code file - such as creating the shm file or mapping the URIs listed to Tomcat, - what's wrong? - /a -/li li a href=#generated @@ -111,12 +107,14 @@ The alternative is mod_jk or mod_proxy_ajp. /li li -bmod_jk is great and should be used for production. It is getting -fixes as needed (which is now rare). /b +strongmod_jk is great and should be used for production. /strong +It is still under active +development and also works for the apache 2.X series for cases where +you do not want to use mod_proxy_ajp. /li limod_proxy. A cheap way to proxy without the hassles of configuring JK. This solution lacks sticky session load balancing. If you don't -need some of the features of jk, jk2 - this is a very simple +need some of the features of jk - this is a very simple alternative. /li limod_proxy_ajp. With apache 2.2, mod_proxy was rewritten to support @@ -137,7 +135,7 @@ reasons why it should not be done too. Needless to say, everyone will disagree with the opinions here. -With the upcoming performance of Tomcat 5, performance reasons +With the performance of Tomcat 5 and 6, performance reasons become harder to justify. So here are the issues to discuss in integrating vs not. brbr @@ -202,11 +200,6 @@ packets, invalid requests from invalid IP's, Apache does a better job at dropping these error conditions than JVM based program. (YMMV) /li -li -a href=http://marc.theaimsgroup.com/?l=tomcat-userm=104874913017036w=2;Here /a -is a great response from Craig R. McClanahan. If you have free time, -read emails by him in any of the list archives. You'll learn a lot. -/li /ul /divbr @@ -221,30 +214,6 @@ /divbr b style=font-size: larger -a name=jkloc - JK2 doesn't seem to be using my settings in my - codeworkers2.properties/code file - such as creating the shm file or mapping the URIs listed to Tomcat, - what's wrong? -/a - /b - div style=padding-left : 20px; -JK2 is not finding your codeworkers2.properties/code file. -Specify it's location in your codehttpd.conf/code file by adding: - -brbr -code -JkSet config.file /full/system/path/to/workers2.properties -/code -brbr -a href=http://marc.theaimsgroup.com/?t=10578489323r=1w=2; -Thread which spawned this question. -/a br -bPlease note the JK2 is unsupported./b - /divbr - - - b style=font-size: larger a name=generated Is there any way to control the content of automatically generated codemod_jk.conf-auto/code? I need my own specific commands added @@ -303,7 +272,7 @@ /a /b div style=padding-left : 20px; -In tomcat 5 - does your connector have Connector declaration have +Since tomcat 5 - does your connector have Connector declaration have ttURIEncoding=UTF-8/tt. For example: pre lt;Connector port=80 Modified: tomcat/site/trunk/docs/faq/printer/connectors.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/faq/printer/connectors.html?view=diffrev=543460r1=543459r2=543460 == --- tomcat/site/trunk/docs/faq/printer/connectors.html (original) +++ tomcat/site/trunk/docs/faq/printer/connectors.html Fri Jun 1 04:28:14 2007 @@ -12,7 +12,11 @@ /p p
svn commit: r539787 - in /tomcat/tc6.0.x/trunk: java/org/apache/catalina/valves/AccessLogValve.java webapps/docs/changelog.xml
Author: funkman
Date: Sat May 19 11:31:09 2007
New Revision: 539787
URL: http://svn.apache.org/viewvc?view=revrev=539787
Log:
bug 42444: prevent NPE
Patch provided by Nils Hammar (funkman)
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java?view=diffrev=539787r1=539786r2=539787
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
Sat May 19 11:31:09 2007
@@ -1035,7 +1035,6 @@
buf.append(request.getProtocol());
} else {
buf.append(- - );
-buf.append(request.getProtocol());
}
}
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diffrev=539787r1=539786r2=539787
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat May 19 11:31:09 2007
@@ -18,6 +18,10 @@
subsection name=Catalina
changelog
fix
+ bug42444/bug: prevent NPE
+ Patch provided by Nils Hammar (funkman)
+ /fix
+ fix
bug42361/bug: Handle multi-part forms when saving requests during
FORM authentication process. Patch provided by Peter Runge. (markt)
/fix
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r536554 - in /tomcat/tc6.0.x/trunk/webapps/ROOT: index.html index.jsp
Author: funkman Date: Wed May 9 07:53:40 2007 New Revision: 536554 URL: http://svn.apache.org/viewvc?view=revrev=536554 Log: bad link : s/tomcat-docs/docs/ Modified: tomcat/tc6.0.x/trunk/webapps/ROOT/index.html tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp Modified: tomcat/tc6.0.x/trunk/webapps/ROOT/index.html URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/ROOT/index.html?view=diffrev=536554r1=536553r2=536554 == --- tomcat/tc6.0.x/trunk/webapps/ROOT/index.html (original) +++ tomcat/tc6.0.x/trunk/webapps/ROOT/index.html Wed May 9 07:53:40 2007 @@ -166,7 +166,7 @@ pAs you may have guessed by now, this is the default Tomcat home page. It can be found on the local filesystem at:/p p class=code$CATALINA_HOME/webapps/ROOT/index.html/p - pwhere $CATALINA_HOME is the root of the Tomcat installation directory. If you're seeing this page, and you don't think you should be, then either you're either a user who has arrived at new installation of Tomcat, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the a href=tomcat-docsTomcat Documentation/a for more detailed setup and administration information than is found in the INSTALL file./p + pwhere $CATALINA_HOME is the root of the Tomcat installation directory. If you're seeing this page, and you don't think you should be, then either you're either a user who has arrived at new installation of Tomcat, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the a href=docsTomcat Documentation/a for more detailed setup and administration information than is found in the INSTALL file./p pbNOTE: For security reasons, using the administration webapp is restricted to users with role admin. The manager webapp Modified: tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp?view=diffrev=536554r1=536553r2=536554 == --- tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp (original) +++ tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp Wed May 9 07:53:40 2007 @@ -180,7 +180,7 @@ pAs you may have guessed by now, this is the default Tomcat home page. It can be found on the local filesystem at:/p p class=code$CATALINA_HOME/webapps/ROOT/index.jsp/p - pwhere $CATALINA_HOME is the root of the Tomcat installation directory. If you're seeing this page, and you don't think you should be, then either you're either a user who has arrived at new installation of Tomcat, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the a href=tomcat-docsTomcat Documentation/a for more detailed setup and administration information than is found in the INSTALL file./p + pwhere $CATALINA_HOME is the root of the Tomcat installation directory. If you're seeing this page, and you don't think you should be, then either you're either a user who has arrived at new installation of Tomcat, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the a href=docsTomcat Documentation/a for more detailed setup and administration information than is found in the INSTALL file./p pbNOTE: For security reasons, using the administration webapp is restricted to users with role admin. The manager webapp - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r513752 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: funkman Date: Fri Mar 2 05:37:24 2007 New Revision: 513752 URL: http://svn.apache.org/viewvc?view=revrev=513752 Log: fix gump complaint for xsl Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diffrev=513752r1=513751r2=513752 == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Mar 2 05:37:24 2007 @@ -22,6 +22,7 @@ value of zero. These are now the first servlets to be started. (markt) /fix /changelog + /subsection subsection name=Coyote changelog update @@ -40,7 +41,7 @@ Fix previous update to servlet 2.5 xsd to use correct declaration. (markt) /fix -/changelog +/changelog /subsection /section section name=Tomcat 6.0.10 (remm) @@ -116,15 +117,15 @@ Chris Halstead. (markt) /fix fix -bug40524/bug: request.getAuthType() now returns CLIENT_CERT rather +bug40524/bug: request.getAuthType() now returns CLIENT_CERT rather than CLIENT-CERT. (markt) /fix fix -bug40526/bug: Return support for JPDA_OPTS to catalina.bat and add +bug40526/bug: Return support for JPDA_OPTS to catalina.bat and add a new option JPDA_SUSPEND, submitted by by Kurt Roy. (markt) /fix fix -bug41265/bug: In embedded, remove the code that resets checkInterval +bug41265/bug: In embedded, remove the code that resets checkInterval values of zero to 300. (markt) /fix /changelog @@ -156,7 +157,7 @@ subsection name=Cluster changelog fix -bug41466/bug: When using the NioChannel and SecureNioChannel its +bug41466/bug: When using the NioChannel and SecureNioChannel its important to use the channels buffers. (fhanik) /fix /changelog @@ -415,7 +416,7 @@ Add xsds for JSP 2.1 (remm) /fix fix -bug41106/bug: Update validation checks for EL to also include +bug41106/bug: Update validation checks for EL to also include legacy 1.2 tags (remm) /fix /changelog @@ -456,7 +457,7 @@ Fix passing of the keystore password for the NIO connector (fhanik) /fix /changelog - /subsection + /subsection /section section name=Tomcat 6.0.1 (remm) subsection name=General @@ -493,7 +494,7 @@ validation, bom encoding support (remm) /update /changelog - /subsection + /subsection subsection name=Coyote changelog update @@ -509,7 +510,7 @@ Implement explicit flushing in AJP (mturk) /update /changelog - /subsection + /subsection /section section name=Tomcat 6.0.0 (remm) subsection name=Catalina @@ -534,7 +535,7 @@ Unifed EL 2.1 support (jhook) /add /changelog - /subsection + /subsection subsection name=Coyote changelog add @@ -548,18 +549,18 @@ resources (costin) /update /changelog - /subsection + /subsection subsection name=Cluster changelog add New cluster configuration and new documentation (fhanik) /add /changelog - /subsection + /subsection subsection name=Webapps changelog /changelog - /subsection + /subsection /section /body /document - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r513284 [2/2] - in /tomcat/site/trunk: docs/faq/ docs/faq/printer/ xdocs-faq/
Modified: tomcat/site/trunk/docs/faq/misc.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/faq/misc.html?view=diffrev=513284r1=513283r2=513284
==
--- tomcat/site/trunk/docs/faq/misc.html (original)
+++ tomcat/site/trunk/docs/faq/misc.html Thu Mar 1 03:37:31 2007
@@ -1,7 +1,7 @@
htmlheadMETA http-equiv=Content-Type content=text/html;
charset=iso-8859-1titleTomcat FAQ - Miscellaneous Questions/titlemeta
value=Tim Funk name=authormeta value=[EMAIL PROTECTED]
name=emailmeta value=Yoav Shapira name=authormeta value=[EMAIL
PROTECTED] name=emailstyle
dt { font-size : larger; font-weight : bold }
dd {padding-bottom : 10px;}
-/style/headbody vlink=#525D76 alink=#525D76 link=#525D76
text=#00 bgcolor=#fftable cellspacing=0 width=100%
border=0!--PAGE HEADER--trtd!--PROJECT LOGO--a
href=http://tomcat.apache.org/;img border=0 alt=Tomcat Logo align=left
src=/images/tomcat.gif/a/tdtdfont
face=arial,helvetica,sanserifh1Apache
Tomcat/h1/font/tdtd!--APACHE LOGO--a
href=http://www.apache.org/;img border=0 alt=Apache Logo align=right
src=http://www.apache.org/images/asf-logo.gif;/a/td/tr/tabletable
cellspacing=4 width=100% border=0!--HEADER SEPARATOR--trtd
colspan=2hr size=1 noshade=/td/trtr!--LEFT SIDE
NAVIGATION--td nowrap=true valign=top
width=20%pstrongLinks/strong/pullia href=..Tomcat
Home/a/lilia href=index.htmlFAQ
Home/a/li/ulpstrongContents/strong/pullia
href=bugs.htmlBugs/a/lilia href=classnotfound.htmlClass
Not Found/a/lilia href=cluster.htmlClustering/a/lilia
href=connectors.htmlConnectors/a/lilia
href=database.htmlDatabase/a/lilia
href=deployment.htmlDeployment/a/lilia
href=development.htmlDevelopment/a/lilia
href=fda-validation.htmlFDA Validation/a/lilia
href=http://wiki.apache.org/tomcat/HowTo;How do I/a/lilia
href=unix.htmlLinux / Unix/a/lilia
href=otherOperatingSystems.htmlOther Operating Systems/a/lilia
href=logging.htmlLogging/a/lilia
href=memory.htmlMemory/a/lilia href=meta.htmlMeta/a/lilia
href=misc.htmlMiscellaneous/a/lilia
href=performance.htmlMonitoring / Performance/a/lilia
href=http://wiki.apache.org/tomcat/UsefulLinks;Other Resources/a/lilia
href=security.htmlSecurity/a/lilia href=version.htmlWhich
Version/a/lilia href=tomcatuser.htmlTomcat User List/a/lilia
href=http://wiki.apa
che.org/tomcat/Wiki/a/lilia
href=windows.htmlWindows/a/li/ul/td!--RIGHT SIDE MAIN BODY--td
align=left valign=top width=80%table cellspacing=4 width=100%
border=0trtd nowrap=true valign=top align=lefth1Tomcat
FAQ/h1h2Miscellaneous Questions/h2/tdtd nowrap=true valign=top
align=rightsmalla href=printer/misc.htmlimg alt=Printer Friendly
Version border=0 src=../images/printer.gifbrprint-friendlybrversion
+/style/headbody vlink=#525D76 alink=#525D76 link=#525D76
text=#00 bgcolor=#fftable cellspacing=0 width=100%
border=0!--PAGE HEADER--trtd!--PROJECT LOGO--a
href=http://tomcat.apache.org/;img border=0 alt=Tomcat Logo align=left
src=/images/tomcat.gif/a/tdtdfont
face=arial,helvetica,sanserifh1Apache
Tomcat/h1/font/tdtd!--APACHE LOGO--a
href=http://www.apache.org/;img border=0 alt=Apache Logo align=right
src=http://www.apache.org/images/asf-logo.gif;/a/td/tr/tabletable
cellspacing=4 width=100% border=0!--HEADER SEPARATOR--trtd
colspan=2hr size=1 noshade=/td/trtr!--LEFT SIDE
NAVIGATION--td nowrap=true valign=top
width=20%pstrongLinks/strong/pullia href=..Tomcat
Home/a/lilia href=index.htmlFAQ
Home/a/li/ulpstrongContents/strong/pullia
href=bugs.htmlBugs/a/lilia href=classnotfound.htmlClass
Not Found/a/lilia href=cluster.htmlClustering/a/lilia
href=connectors.htmlConnectors/a/lilia
href=database.htmlDatabase/a/lilia
href=deployment.htmlDeployment/a/lilia
href=development.htmlDevelopment/a/lilia
href=fda-validation.htmlFDA Validation/a/lilia
href=http://wiki.apache.org/tomcat/HowTo;How do I/a/lilia
href=unix.htmlLinux / Unix/a/lilia
href=otherOperatingSystems.htmlOther Operating Systems/a/lilia
href=logging.htmlLogging/a/lilia
href=memory.htmlMemory/a/lilia href=meta.htmlMeta/a/lilia
href=misc.htmlMiscellaneous/a/lilia
href=performance.htmlMonitoring / Performance/a/lilia
href=http://wiki.apache.org/tomcat/UsefulLinks;Other Resources/a/lilia
href=security.htmlSecurity/a/lilia href=/whichversion.htmlWhich
Version/a/lilia href=tomcatuser.htmlTomcat User List/a/lilia
href=http://wi
ki.apache.org/tomcat/Wiki/a/lilia
href=windows.htmlWindows/a/li/ul/td!--RIGHT SIDE MAIN BODY--td
align=left valign=top width=80%table cellspacing=4 width=100%
border=0trtd nowrap=true valign=top align=lefth1Tomcat
FAQ/h1h2Miscellaneous Questions/h2/tdtd nowrap=true valign=top
align=rightsmalla href=printer/misc.htmlimg alt=Printer Friendly
Version border=0 src=../images/printer.gifbrprint-friendlybrversion
/a/small/td/tr/tabletable cellpadding=2
cellspacing=0 border=0trtd bgcolor=#525D76font
face=arial,helvetica.sanserif
svn commit: r513286 - in /tomcat/site/trunk: docs/whichversion.html xdocs/whichversion.xml
Author: funkman Date: Thu Mar 1 03:49:48 2007 New Revision: 513286 URL: http://svn.apache.org/viewvc?view=revrev=513286 Log: Brief placeholder description about Tomcat 6 Modified: tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/xdocs/whichversion.xml Modified: tomcat/site/trunk/docs/whichversion.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?view=diffrev=513286r1=513285r2=513286 == --- tomcat/site/trunk/docs/whichversion.html (original) +++ tomcat/site/trunk/docs/whichversion.html Thu Mar 1 03:49:48 2007 @@ -3,20 +3,20 @@ html head titleApache Tomcat - Apache Tomcat -- Which Version Do I Want?/title -meta name=author value=Marc A. Saegesser/ -meta name=email value=[EMAIL PROTECTED]/ -meta name=author value=Yoav Shapira/ -meta name=email value=[EMAIL PROTECTED]/ -link type=text/css href=stylesheets/tomcat.css rel=stylesheet/ +meta value=Marc A. Saegesser name=author / +meta value=[EMAIL PROTECTED] name=email / +meta value=Yoav Shapira name=author / +meta value=[EMAIL PROTECTED] name=email / +link rel=stylesheet href=stylesheets/tomcat.css type=text/css / /head -body bgcolor=#ff text=#00 link=#525D76 alink=#525D76 vlink=#525D76 -table border=0 width=100% cellspacing=0 +body vlink=#525D76 alink=#525D76 link=#525D76 text=#00 bgcolor=#ff +table cellspacing=0 width=100% border=0 !--PAGE HEADER-- tr td !--PROJECT LOGO-- a href=http://tomcat.apache.org/; -img src=./images/tomcat.gif align=left alt=Tomcat Logo border=0/ +img border=0 alt=Tomcat Logo align=left src=./images/tomcat.gif / /a /td td @@ -27,28 +27,28 @@ td !--APACHE LOGO-- a href=http://www.apache.org/; -img src=http://www.apache.org/images/asf-logo.gif; align=right alt=Apache Logo border=0/ +img border=0 alt=Apache Logo align=right src=http://www.apache.org/images/asf-logo.gif; / /a /td /tr /table div class=searchbox -form action=http://www.google.com/search; method=get -input value=tomcat.apache.org name=sitesearch type=hidden/ -input value=Search the Site size=25 name=q id=query type=text/ -input name=Search value=Search Site type=submit/ +form method=get action=http://www.google.com/search; +input type=hidden name=sitesearch value=tomcat.apache.org / +input type=text id=query name=q size=25 value=Search the Site / +input type=submit value=Search Site name=Search / /form /div -table border=0 width=100% cellspacing=4 +table cellspacing=4 width=100% border=0 !--HEADER SEPARATOR-- tr td colspan=2 -hr noshade= size=1/ +hr size=1 noshade= / /td /tr tr !--LEFT SIDE NAVIGATION-- -td width=20% valign=top nowrap=true +td nowrap=true valign=top width=20% p strongApache Tomcat/strong /p @@ -171,11 +171,11 @@ /ul /td !--RIGHT SIDE MAIN BODY-- -td width=80% valign=top align=left -table border=0 cellspacing=0 cellpadding=2 width=100% +td align=left valign=top width=80% +table width=100% cellpadding=2 cellspacing=0 border=0 tr td bgcolor=#525D76 -font color=#ff face=arial,helvetica,sanserif +font face=arial,helvetica,sanserif color=#ff a name=Apache Tomcat Versions strongApache Tomcat Versions/strong /a @@ -193,59 +193,59 @@ table class=detail-table tr - td bgcolor=#039acc valign=top -font color=#00 size=-1 face=arial,helvetica,sanserif + td valign=top bgcolor=#039acc +font face=arial,helvetica,sanserif size=-1 color=#00 strongServlet/JSP Spec/strong /font /td - td bgcolor=#039acc valign=top -font color=#00 size=-1 face=arial,helvetica,sanserif + td valign=top bgcolor=#039acc +font face=arial,helvetica,sanserif size=-1 color=#00 strongApache Tomcat version/strong /font /td /tr tr - td bgcolor=#a0ddf0 valign=top align=left -font color=#00 size=-1 face=arial,helvetica,sanserif2.5/2.1/font + td align=left valign=top bgcolor=#a0ddf0 +font face=arial,helvetica,sanserif size=-1 color=#002.5/2.1/font /td - td bgcolor=#a0ddf0 valign=top align=left -font color=#00 size=-1 face=arial,helvetica,sanserif6.0.x/font + td align=left valign=top bgcolor=#a0ddf0 +font face=arial,helvetica,sanserif size=-1 color=#006.0.x/font /td /tr tr - td bgcolor=#a0ddf0 valign=top align=left -font color=#00 size=-1 face=arial,helvetica,sanserif2.4/2.0/font + td align=left valign=top bgcolor=#a0ddf0 +font face=arial,helvetica,sanserif size=-1 color=#002.4/2.0/font /td - td bgcolor=#a0ddf0 valign=top align=left -font color=#00 size=-1 face=arial,helvetica,sanserif5.5.x/font + td align=left valign=top bgcolor=#a0ddf0 +font face=arial,helvetica,sanserif size=-1 color=#005.5.x/font /td /tr tr - td bgcolor=#a0ddf0 valign=top align=left -font color=#00 size=-1 face=arial,helvetica,sanserif2.3/1.2/font + td align=left valign=top bgcolor=#a0ddf0 +font face=arial,helvetica,sanserif size=-1 color=#002.3/1.2/font /td - td bgcolor=#a0ddf0 valign=top align=left -font color=#00 size=-1 face=arial,helvetica
svn commit: r492112 - in /tomcat/tc6.0.x/trunk/java/org/apache: catalina/loader/VirtualWebappLoader.java naming/resources/VirtualDirContext.java
Author: funkman
Date: Wed Jan 3 03:59:32 2007
New Revision: 492112
URL: http://svn.apache.org/viewvc?view=revrev=492112
Log:
Update on http://issues.apache.org/bugzilla/show_bug.cgi?id=41260
Added warnings this should be for dev IDEs, not production.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java?view=diffrev=492112r1=492111r2=492112
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
Wed Jan 3 03:59:32 2007
@@ -34,6 +34,14 @@
* virtualClasspath=\dir\classes;\somedir\somejar.jar/
* lt;/Context
* /code
+ *
+ *
+ * strongThis is not meant to be used for production.
+ * Its meant to ease development with IDE's without the
+ * need for fully republishing jars in WEB-INF/lib/strong
+ *
+ *
+ *
* @author Fabrizio Giustina
* @version $Id: $
*/
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java?view=diffrev=492112r1=492111r2=492112
==
---
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
Wed Jan 3 03:59:32 2007
@@ -45,6 +45,13 @@
* virtualClasspath=\dir\classes;\somedir\somejar.jar/
* lt;/Resources
* /code
+ *
+ *
+ * strongThis is not meant to be used for production.
+ * Its meant to ease development with IDE's without the
+ * need for fully republishing jars in WEB-INF/lib/strong
+ *
+ *
* @author Fabrizio Giustina
* @version $Id: $
*/
@@ -57,6 +64,12 @@
private MapString, File virtualMappings;
/**
+ * Map containing a mapping for tag files that should be loaded from the
+ * META-INF dir of referenced jar files.
+ */
+private MapString, File tagfileMappings;
+
+/**
* code;/code separated list of virtual path elements.
*/
private String virtualClasspath;
@@ -79,6 +92,7 @@
super.allocate();
virtualMappings = new HashtableString, File();
+tagfileMappings = new HashtableString, File();
// looks into any META-INF dir found in classpath entries for tld
files.
StringTokenizer tkn = new StringTokenizer(virtualClasspath, ;);
@@ -110,6 +124,23 @@
if (virtualMappings.containsKey(tldName)) {
return new
FileResourceAttributes(virtualMappings.get(tldName));
}
+} else if (name.startsWith(/META-INF/tags) name.endsWith(.tag)
+|| name.endsWith(.tagx)) {
+
+// already loaded tag file
+if (tagfileMappings.containsKey(name)) {
+return new FileResourceAttributes(tagfileMappings.get(name));
+}
+
+// unknown tagfile, search for it in virtualClasspath
+StringTokenizer tkn = new StringTokenizer(virtualClasspath, ;);
+while (tkn.hasMoreTokens()) {
+File file = new File(tkn.nextToken(), name);
+if (file.exists()) {
+tagfileMappings.put(name, file);
+return new FileResourceAttributes(file);
+}
+}
}
return super.getAttributes(name);
@@ -136,6 +167,15 @@
String tldName = name.substring(name.lastIndexOf(/) + 1);
if (virtualMappings.containsKey(tldName)) {
return new FileResource(virtualMappings.get(tldName));
+}
+} else if (name.startsWith(/META-INF/tags) name.endsWith(.tag)
+|| name.endsWith(.tagx)) {
+
+// already loaded tag file: we are sure that getAttributes() has
+// already been called if we are here
+File tagFile = tagfileMappings.get(name);
+if (tagFile != null) {
+return new FileResource(tagFile);
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r491805 - /tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings.properties
Author: funkman
Date: Tue Jan 2 06:53:35 2007
New Revision: 491805
URL: http://svn.apache.org/viewvc?view=revrev=491805
Log:
Formatting bug with javax/el/LocalStrings.properties
http://issues.apache.org/bugzilla/show_bug.cgi?id=39409
patch by Jan Bartel janbs a t mortbay com
Modified:
tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings.properties
Modified: tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings.properties?view=diffrev=491805r1=491804r2=491805
==
--- tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings.properties (original)
+++ tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings.properties Tue Jan 2
06:53:35 2007
@@ -16,9 +16,9 @@
# Default localized string information
# Localized for Locale en_US
-propertyNotFound=Property '{1}' not found on type {0}
-propertyNotReadable=Property '{1}' not readable on type {0}
-propertyNotWritable=Property '{1}' not writable on type {0}
-propertyReadError=Error reading '{1}' on type {0}
-propertyWriteError=Error writing '{1}' on type {0}
-resolverNotWritable=ELResolver not writable for type {0}
\ No newline at end of file
+propertyNotFound=Property ''{1}' not found on type {0}
+propertyNotReadable=Property ''{1}'' not readable on type {0}
+propertyNotWritable=Property ''{1}'' not writable on type {0}
+propertyReadError=Error reading ''{1}'' on type {0}
+propertyWriteError=Error writing ''{1}'' on type {0}
+resolverNotWritable=ELResolver not writable for type {0}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r491813 - /tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings.properties
Author: funkman
Date: Tue Jan 2 07:16:10 2007
New Revision: 491813
URL: http://svn.apache.org/viewvc?view=revrev=491813
Log:
doh - missed a '
-This line, and those below, will be ignored--
MLocalStrings.properties
Modified:
tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings.properties
Modified: tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings.properties?view=diffrev=491813r1=491812r2=491813
==
--- tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings.properties (original)
+++ tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings.properties Tue Jan 2
07:16:10 2007
@@ -16,7 +16,7 @@
# Default localized string information
# Localized for Locale en_US
-propertyNotFound=Property ''{1}' not found on type {0}
+propertyNotFound=Property ''{1}'' not found on type {0}
propertyNotReadable=Property ''{1}'' not readable on type {0}
propertyNotWritable=Property ''{1}'' not writable on type {0}
propertyReadError=Error reading ''{1}'' on type {0}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r491990 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JasperListener.java
Author: funkman
Date: Tue Jan 2 16:36:57 2007
New Revision: 491990
URL: http://svn.apache.org/viewvc?view=revrev=491990
Log:
http://issues.apache.org/bugzilla/show_bug.cgi?id=40820
Default JSP factory not initialized early enough
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JasperListener.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JasperListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JasperListener.java?view=diffrev=491990r1=491989r2=491990
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JasperListener.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JasperListener.java Tue
Jan 2 16:36:57 2007
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the License); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -46,7 +46,7 @@
protected StringManager sm =
StringManager.getManager(Constants.Package);
-
+
// -- LifecycleListener Methods
@@ -60,8 +60,9 @@
if (Lifecycle.INIT_EVENT.equals(event.getType())) {
try {
// Set JSP factory
-this.getClass().getClassLoader().loadClass
-(org.apache.jasper.compiler.JspRuntimeContext);
+Class.forName(org.apache.jasper.compiler.JspRuntimeContext,
+ true,
+ this.getClass().getClassLoader());
} catch (Throwable t) {
// Should not occur, obviously
log.warn(Couldn't initialize Jasper, t);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r491995 - in /tomcat/tc6.0.x/trunk/java/org/apache: catalina/loader/VirtualWebappLoader.java naming/resources/VirtualDirContext.java
Author: funkman
Date: Tue Jan 2 16:51:31 2007
New Revision: 491995
URL: http://svn.apache.org/viewvc?view=revrev=491995
Log:
http://issues.apache.org/bugzilla/show_bug.cgi?id=41260
[Contribution] WebAppLoader and DirContext implementations
for handling with expanded webapp during development
by Fabrizio Giustina
Added:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
(with props)
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
(with props)
Added:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java?view=autorev=491995
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
(added)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
Tue Jan 2 16:51:31 2007
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.loader;
+
+import java.io.File;
+import java.util.StringTokenizer;
+
+import org.apache.catalina.LifecycleException;
+
+/**
+ * Simple webapp classloader that allows a customized classpath to be added
+ * through configuration in context xml. Any additional classpath entry will be
+ * added to the default webapp classpath, making easy to emulate a standard
+ * webapp without the need for assembly all the webapp dependencies as jars in
+ * WEB-INF/lib.
+ *
+ * code
+ * lt;Context docBase=\webapps\mydocbase
+ * lt;Loader className=org.apache.catalina.loader.VirtualWebappLoader
+ * virtualClasspath=\dir\classes;\somedir\somejar.jar/
+ * lt;/Context
+ * /code
+ * @author Fabrizio Giustina
+ * @version $Id: $
+ */
+public class VirtualWebappLoader extends WebappLoader {
+
+/**
+ * code;/code separated list of additional path elements.
+ */
+private String virtualClasspath;
+
+/**
+ * Construct a new WebappLoader with no defined parent class loader (so
that
+ * the actual parent will be the system class loader).
+ */
+public VirtualWebappLoader() {
+super();
+}
+
+/**
+ * Construct a new WebappLoader with the specified class loader to be
+ * defined as the parent of the ClassLoader we ultimately create.
+ *
+ * @param parent The parent class loader
+ */
+public VirtualWebappLoader(ClassLoader parent) {
+super(parent);
+}
+
+/**
+ * codevirtualClasspath/code attribute that will be automatically set
+ * from the codeContext/code codevirtualClasspath/code attribute
+ * from the context xml file.
+ * @param path code;/code separated list of path elements.
+ */
+public void setVirtualClasspath(String path) {
+virtualClasspath = path;
+}
+
+@Override
+public void start() throws LifecycleException {
+
+// just add any jar/directory set in virtual classpath to the
+// repositories list before calling start on the standard WebappLoader
+StringTokenizer tkn = new StringTokenizer(virtualClasspath, ;);
+while (tkn.hasMoreTokens()) {
+File file = new File(tkn.nextToken());
+if (!file.exists()) {
+continue;
+}
+if (file.isDirectory()) {
+addRepository(file:/ + file.getAbsolutePath() + /);
+} else {
+addRepository(file:/ + file.getAbsolutePath());
+}
+}
+
+super.start();
+}
+
+}
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
--
svn:eol-style = native
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
--
svn:executable = *
Added:
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
svn commit: r481230 - in /tomcat/tc6.0.x/trunk/java/org/apache/jasper: compiler/ImplicitTagLibraryInfo.java compiler/PageDataImpl.java compiler/Validator.java resources/LocalStrings.properties resourc
Author: funkman
Date: Fri Dec 1 04:14:23 2006
New Revision: 481230
URL: http://svn.apache.org/viewvc?view=revrev=481230
Log:
Bug 41089 and JSP.6.3.2
Table JSP.6-2 Attributes for the jsp:root standard action
version (required) The version of the JSP specification used in this
page. Valid values are 1.2, 2.0, and 2.1. It is a
translation error if the container does not support the
specified version.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java?view=diffrev=481230r1=481229r2=481230
==
---
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
Fri Dec 1 04:14:23 2006
@@ -48,7 +48,7 @@
private static final String TAGX_FILE_SUFFIX = .tagx;
private static final String TAGS_SHORTNAME = tags;
private static final String TLIB_VERSION = 1.0;
-private static final String JSP_VERSION = 2.0;
+private static final String JSP_VERSION = 2.1;
private static final String IMPLICIT_TLD = implicit.tld;
// Maps tag names to tag file paths
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java?view=diffrev=481230r1=481229r2=481230
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java Fri
Dec 1 04:14:23 2006
@@ -48,7 +48,7 @@
*/
class PageDataImpl extends PageData implements TagConstants {
-private static final String JSP_VERSION = 2.0;
+private static final String JSP_VERSION = 2.1;
private static final String CDATA_START_SECTION = ![CDATA[\n;
private static final String CDATA_END_SECTION = ]]\n;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java?view=diffrev=481230r1=481229r2=481230
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java Fri Dec
1 04:14:23 2006
@@ -509,7 +509,7 @@
public void visit(Node.JspRoot n) throws JasperException {
JspUtil.checkAttributes(Jsp:root, n, jspRootAttrs, err);
String version = n.getTextAttribute(version);
-if (!version.equals(1.2) !version.equals(2.0)) {
+if (!version.equals(1.2) !version.equals(2.0)
!version.equals(2.1)) {
err.jspError(n, jsp.error.jsproot.version.invalid, version);
}
visitBody(n);
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties?view=diffrev=481230r1=481229r2=481230
==
---
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
Fri Dec 1 04:14:23 2006
@@ -93,7 +93,7 @@
jsp.error.unable.rename=Unable to rename class file {0} to {1}
jsp.error.mandatory.attribute={0}: Mandatory attribute {1} missing
jsp.error.flush=Exception occurred when flushing data
-jsp.engine.info=Jasper JSP 2.0 Engine
+jsp.engine.info=Jasper JSP 2.1 Engine
jsp.error.invalid.expression={0} contains invalid expression(s): {1}
jsp.error.invalid.attribute={0} has invalid attribute: {1}
jsp.error.usebean.class.notfound=Class: {0} not found
@@ -410,7 +410,7 @@
jsp.error.variable.alias=Both or none of the name-from-attribute and alias
attributes must be specified in a variable directive
jsp.error.attribute.null_name=Null attribute name
jsp.error.jsptext.badcontent=\'lt;\', when appears in the body of
lt;jsp:textgt;, must be encapsulated within a CDATA
-jsp.error.jsproot.version.invalid=Invalid version number: \{0}\, must be
\1.2\ or \2.0\
+jsp.error.jsproot.version.invalid=Invalid version number: \{0
svn commit: r475232 - /tomcat/tc6.0.x/trunk/webapps/docs/index.xml
Author: funkman Date: Wed Nov 15 05:37:51 2006 New Revision: 475232 URL: http://svn.apache.org/viewvc?view=revrev=475232 Log: tomcat - s/5.5/6/ servlet spec s/2.3/2.4/ jsp verion s/2.0/2.1/ Modified: tomcat/tc6.0.x/trunk/webapps/docs/index.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/index.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/index.xml?view=diffrev=475232r1=475231r2=475232 == --- tomcat/tc6.0.x/trunk/webapps/docs/index.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/index.xml Wed Nov 15 05:37:51 2006 @@ -18,9 +18,9 @@ section name=Introduction pThis is the top-level entry point of the documentation bundle for the -strongApache Tomcat/strong Servlet/JSP container. Apache Tomcat version 5.5 +strongApache Tomcat/strong Servlet/JSP container. Apache Tomcat version 6.0 implements the -Servlet 2.4 and JavaServer Pages 2.0 specifications from the +Servlet 2.5 and JavaServer Pages 2.1 specifications from the a href=http://www.jcp.org;Java Community Process/a, and includes many additional features that make it a useful platform for developing and deploying web applications and web services./p @@ -35,7 +35,7 @@ section name=Apache Tomcat User Guide pThe following documents will assist you in downloading, installing -Apache Tomcat 5, and using many of the Apache Tomcat features./p +Apache Tomcat 6, and using many of the Apache Tomcat features./p ol lia href=introduction.htmlstrongIntroduction/strong/a - A @@ -45,7 +45,7 @@ lia href=appdev/index.htmlstrongFirst web application/strong/a - An introduction to the concepts of a emweb application/em as defined in the a href=http://java.sun.com/products/servlet/download.html;Servlet -2.3 Specification/a. Covers basic organization of your web application +2.4 Specification/a. Covers basic organization of your web application source tree, the structure of a web application archive, and an introduction to the web application deployment descriptor (code/WEB-INF/web.xml/code)./li @@ -110,7 +110,7 @@ section name=Reference pThe following documents are aimed at emSystem Administrators/em who -are responsible for installing, configuring, and operating a Apache Tomcat 5 server. +are responsible for installing, configuring, and operating a Apache Tomcat 6 server. /p ul lia href=RELEASE-NOTES.txtstrongRelease notes/strong/a @@ -118,7 +118,7 @@ /li lia href=config/index.htmlstrongApache Tomcat Server Configuration Reference/strong/a - Reference manual that documents all available elements and attributes - that may be placed into a Apache Tomcat 5 codeconf/server.xml/code file. + that may be placed into a Apache Tomcat 6 codeconf/server.xml/code file. /li lia href=http://tomcat.apache.org/connectors-doc/index.html;strongJK Documentation/strong/a - Complete documentation and HOWTOs on the JK native webserver connector, @@ -138,15 +138,15 @@ pThe following documents are for Java developers who wish to contribute to the development of the emApache Tomcat/em project./p ul -lia href=building.htmlstrongBuilding from Source/strong/a - -Details the steps necessary to download Apache Tomcat 5 source code (and the -other packages that it depends on), and build a binary distribution from +lia href=building.htmlstrongBuilding from Source/strong/a - +Details the steps necessary to download Apache Tomcat 6 source code (and the +other packages that it depends on), and build a binary distribution from those sources. /li lia href=changelog.htmlstrongChangelog/strong/a - Details the changes made to Apache Tomcat. /li -lia href=status.htmlstrongStatus/strong/a - Apache Tomcat development +lia href=status.htmlstrongStatus/strong/a - Apache Tomcat development status. /li lia href=developers.htmlstrongDevelopers/strong/a - List of active @@ -154,16 +154,16 @@ /li lia href=catalina/funcspecs/index.htmlstrongFunctional Specifications/strong/a - Requirements specifications for features of the emCatalina/em servlet -container portion of Apache Tomcat 5./li +container portion of Apache Tomcat 6./li lia href=catalina/docs/api/index.htmlstrongCatalina Javadocs/strong/a - Javadoc API documentation for the emCatalina/em servlet container and its dependencies./li lia href=jasper/docs/api/index.htmlstrongJasper Javadocs/strong/a - Javadoc API documentation for the emJasper/em JSP container -portion of Apache Tomcat 5./li +portion of Apache Tomcat 6./li lia href=architecture/index.htmlstrongApache Tomcat Architecture/strong/a - Documentation of the Apache Tomcat Server Architecture./li - + /ul /section - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
