svn commit: r898779 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: yoavs Date: Wed Jan 13 14:45:18 2010 New Revision: 898779 URL: http://svn.apache.org/viewvc?rev=898779view=rev Log: Add my votes pre 6.0.23 release. 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=898779r1=898778r2=898779view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 13 14:45:18 2010 @@ -72,7 +72,7 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47774 Ensure web application class loader is used when calling session listeners http://svn.apache.org/viewvc?rev=898555view=rev - +1: markt, kkolinko + +1: markt, kkolinko, yoavs -1: * Fix second part of https://issues.apache.org/bugzilla/show_bug.cgi?id=47413#c8 @@ -127,7 +127,7 @@ http://svn.apache.org/viewvc?rev=712053view=rev Complete patch applicable to TC6: http://people.apache.org/~rjung/patches/tc6-version_filter.patch - +1: rjung + +1: rjung, yoavs -1: kkolinko: ( -0 for changes of the *.txt files: @@ -158,14 +158,14 @@ https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/test/org/apache/el/TestELEvaluation.java svn copy https://svn.apache.org/repos/asf/tomcat/trunk/test/org/apache/el/TesterFunctions.java https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/test/org/apache/el/TesterFunctions.java - +1: markt, jim + +1: markt, jim, yoavs -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47977 Using a body with a tag that has an empty body should cause an error http://svn.apache.org/viewvc?rev=898126view=rev http://svn.apache.org/viewvc?rev=898256view=rev (case insensitivity) - +1: markt, jim + +1: markt, jim, yoavs -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48421 @@ -174,5 +174,5 @@ I haven't figured out why, but this also prevents buffered log messages being lost on stop when running as a service. http://svn.apache.org/viewvc?rev=898468view=rev - +1: markt + +1: markt, yoavs -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r718037 - /tomcat/current/tc4.1.x/STATUS.txt
Author: yoavs Date: Sun Nov 16 06:34:42 2008 New Revision: 718037 URL: http://svn.apache.org/viewvc?rev=718037view=rev Log: Add my +1 to the wininstaller patch. 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=718037r1=718036r2=718037view=diff == --- tomcat/current/tc4.1.x/STATUS.txt (original) +++ tomcat/current/tc4.1.x/STATUS.txt Sun Nov 16 06:34:42 2008 @@ -28,5 +28,5 @@ * Fix installer packaging - only include the files we meant to http://people.apache.org/~markt/patches/2008-10-31-tc4-wininstaller.patch - +1: markt, jfclere + +1: markt, jfclere, yoavs -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r681087 - /tomcat/current/tc5.5.x/STATUS.txt
Author: yoavs Date: Wed Jul 30 08:46:57 2008 New Revision: 681087 URL: http://svn.apache.org/viewvc?rev=681087view=rev Log: Reviewed Tomcat 5.5 patches and added my comments in status.txt 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=681087r1=681086r2=681087view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 30 08:46:57 2008 @@ -30,21 +30,22 @@ http://svn.apache.org/viewvc?rev=616953view=rev (less the generics stuff) +1: markt, fhanik -1: + 0: yoavs (because I think there might be a bug when we're only diong the work if log.isTraceEnabled) * Fix ArrayIndexOutOfBoundsException when empty URL is requested http://svn.apache.org/viewvc?rev=627883view=rev - +1: markt, fhanik + +1: markt, fhanik, yoavs -1: * 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, fhanik + +1: markt, fhanik, yoavs -1: * Fix docs re use of maxActive http://svn.apache.org/viewvc?rev=639842view=rev - +1: rjung, markt, fhanik + +1: rjung, markt, fhanik, yoavs -1: * Port fix for regression in 5.5.26 (and 4.1.37) that limited uploads to 8k @@ -56,18 +57,18 @@ * Fix ServletInputStream still readable when closed https://issues.apache.org/bugzilla/show_bug.cgi?id=44673 http://svn.apache.org/viewvc?rev=641076view=rev - +1: markt, fhanik + +1: markt, fhanik, yoavs -1: * Fix CGI servlet for vista http://people.apache.org/~markt/patches/2008-03-28-cgi-env.patch - +1: markt, fhanik + +1: markt, fhanik, yoavs -1: * No roles (deny all) trumps no auth-constraint (allow all) https://issues.apache.org/bugzilla/show_bug.cgi?id=44529 http://svn.apache.org/viewvc?rev=642542view=rev - +1: markt, fhanik + +1: markt, fhanik, yoavs -1: * Fix reading of multi-byte request data @@ -83,7 +84,7 @@ * Document missing secret attributes https://issues.apache.org/bugzilla/show_bug.cgi?id=44715 http://svn.apache.org/viewvc?rev=643497view=rev - +1: mark, fhanik + +1: mark, fhanik,yoavs -1: * Final fixes for https://issues.apache.org/bugzilla/show_bug.cgi?id=44494 @@ -93,23 +94,23 @@ http://svn.apache.org/viewvc?rev=645719view=rev (Remy's resizing fix) http://svn.apache.org/viewvc?rev=645722view=rev (mark/reset fix) +1: markt - -1: fhanik - trunk patches wont work in 5.5, rainer has a backport, I'll review those + -1: fhanik - trunk patches won't work in 5.5, rainer has a backport, I'll review those * Better handling of lack of permission for context specific logging http://svn.apache.org/viewvc?rev=646543view=rev +1: markt - 0: fhanik - silently swallow an error, and default to the default config file + 0: fhanik - silently swallow an error, and default to the default config file, yoavs: don't like silent swallowing -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45293 Additional permission required to read JDK logging config http://svn.apache.org/viewvc?rev=646550view=rev - +1: markt, fhanik + +1: markt, fhanik, yoavs -1: * Change of jar name for policy file http://people.apache.org/~markt/patches/2008-04-09-policy.patch - +1: markt, fhanik + +1: markt, fhanik, yoavs -1: * Another fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=44494 @@ -129,45 +130,45 @@ Create digesters and parsers earlier so we aren't using the webapp class loader when we create them. http://svn.apache.org/viewvc?rev=649974view=rev - +1: markt, fhanik + +1: markt, fhanik, yoavs -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=31257 Quote endorsed dirs if they contain a space http://svn.apache.org/viewvc?rev=649993view=rev - +1: markt, fhanik + +1: markt, fhanik, yoavs -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43578 http://svn.apache.org/viewvc?rev=651713view=rev Tomcat doesn't start if installation path contains a space Patch provided by Ray Sauers - +1: markt + +1: markt, yoavs -1: * Log errors for AJP signoffs at DEBUG level, since it is harmless if mod_jk has hung up the phone. http://svn.apache.org/viewvc?rev=651792view=rev - +1: billbarker, markt, fhanik + +1: billbarker, markt, fhanik, yoavs -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44877 Prevent collisions in tag pool names http://svn.apache.org/viewvc?rev=651984view=rev - +1: markt, fhanik + +1: markt, fhanik, yoavs -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43191 - No way to turn off compression for some miime-types + No way to turn off compression for some MIME types Based on a patch by Len Popp
svn commit: r681128 - /tomcat/current/tc4.1.x/STATUS.txt
Author: yoavs Date: Wed Jul 30 10:17:26 2008 New Revision: 681128 URL: http://svn.apache.org/viewvc?rev=681128view=rev Log: Reviewed pending commits for Tomcat 4.1 in STATUS.txt, added my votes. 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=681128r1=681127r2=681128view=diff == --- tomcat/current/tc4.1.x/STATUS.txt (original) +++ tomcat/current/tc4.1.x/STATUS.txt Wed Jul 30 10:17:26 2008 @@ -28,25 +28,25 @@ * 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 + +1: markt, yoavs -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 + +1: markt, yoavs -1: * Fix docs re use of maxActive http://svn.apache.org/viewvc?rev=639842view=rev - +1: rjung, markt + +1: rjung, markt, yoavs -1: rjung: Didn't check though, if this is actually true for the 4.1 bundled DBCP. markt: It is * Fix docs: don't include dev snapshots of JK docs, link to released version instead http://people.apache.org/~rjung/patches/tc4_1-jk-docs.patch - +1: rjung, markt + +1: rjung, markt, yoavs -1: rjung: Mark, I didn't actually try to build it. I guess it's much easier for you :) markt: Yep. Your patch is fine. I can't believe there was still a ref to the jk2 docs! @@ -54,5 +54,5 @@ * 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 + +1: markt, yoavs -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r674089 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: yoavs Date: Fri Jul 4 09:54:17 2008 New Revision: 674089 URL: http://svn.apache.org/viewvc?rev=674089view=rev Log: approve patch for Bugzilla 36155. 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=674089r1=674088r2=674089view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jul 4 09:54:17 2008 @@ -45,7 +45,7 @@ * Fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=45317 http://svn.apache.org/viewvc?rev=673487view=rev Properly document and print out the value of the state transfer timeout setting - +1: fhanik, markt + +1: fhanik, markt, yoavs -1: * Supposedly Windows should be used with osfamily too. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r657923 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: yoavs
Date: Mon May 19 12:12:01 2008
New Revision: 657923
URL: http://svn.apache.org/viewvc?rev=657923view=rev
Log:
add my vote on proposed patches
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=657923r1=657922r2=657923view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon May 19 12:12:01 2008
@@ -42,7 +42,7 @@
* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44282
Do call to getClassLoader() in a privileged block.
http://svn.apache.org/viewvc?rev=616953view=rev
- +1: markt, fhanik
+ +1: markt, fhanik, yoavs
+0: remm: do we really want to fix these sort of bugs ?
-1:
@@ -54,12 +54,12 @@
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44955
Use correct location for endorsed dir
http://svn.apache.org/viewvc?rev=654632view=rev
- +1: markt, remm
+ +1: markt, remm, yoavs
-1:
* Fix NPE in patch for bug 44986
http://svn.apache.org/viewvc?rev=657149view=rev
- +1: markt, remm
+ +1: markt, remm, yoavs
-1:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45015
@@ -73,12 +73,12 @@
Correct BNF grammar so ${0 lt a ? 1 lt a ? many: one: none} works
http://svn.apache.org/viewvc?rev=657404view=rev
Note patch is larger than strictly necessary due to autogenerated code
- +1: markt
+ +1: markt, yoavs
-1:
* Additional patch from
https://issues.apache.org/bugzilla/show_bug.cgi?id=43094
Allow configuration of JSSE providers
Based on a patch by Bruno Harbulot
http://svn.apache.org/viewvc?rev=657449view=rev
- +1: markt
+ +1: markt, yoavs
-1:
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r611002 - /tomcat/current/tc4.1.x/STATUS.txt
Author: yoavs Date: Thu Jan 10 17:04:45 2008 New Revision: 611002 URL: http://svn.apache.org/viewvc?rev=611002view=rev Log: I've finally had a chance to review proposed patches for Tomcat 4.1, and they look good. 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=611002r1=611001r2=611002view=diff == --- tomcat/current/tc4.1.x/STATUS.txt (original) +++ tomcat/current/tc4.1.x/STATUS.txt Thu Jan 10 17:04:45 2008 @@ -27,24 +27,24 @@ * Fix important vulnerability when webdav is enabled for write Patch: http://marc.info/?l=tomcat-devm=119245116910632w=2 - +1: markt + +1: markt, yoavs -1: * Improve fix for webdav vulnerability to workaround what looks like a parser bug http://people.apache.org/~markt/patches/2007-10-20-webdav.patch - +1: markt + +1: markt, yoavs -1: * Add feature to use system properties in server.xml. TC 5.0/5.5/6.0 already can do this, and since commons-digester in TC 4.1 is recent enough, it's easy for TC 4.1 to. http://people.apache.org/~rjung/patches/replace_system_properties_20071018a.patch - +1: rjung + +1: rjung, yoavs -1: * Update TC4 with the new Cookie handling code from TC6. Request/Response only. http://svn.apache.org/viewvc?view=revrevision=594968 - +1: markt - -1: \ No newline at end of file + +1: markt, yoavs + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r607128 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: yoavs Date: Thu Dec 27 14:16:26 2007 New Revision: 607128 URL: http://svn.apache.org/viewvc?rev=607128view=rev Log: Add my votes for current patches, now that I've finally reviewd them. 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=607128r1=607127r2=607128view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Dec 27 14:16:26 2007 @@ -33,60 +33,60 @@ * Smallest fix to the above patches. http://people.apache.org/~jfclere/patches/Request.patch - +1: jfclere, fhanik, markt + +1: jfclere, fhanik, markt, yoavs -1: * Fix CVE-2007-5342 JULI permissions need to be restricted http://svn.apache.org/viewvc?rev=606594view=rev - +1: markt,funkman, pero + +1: markt,funkman, pero, yoavs -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,funkman + +1: markt,funkman, yoavs -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,funkman + +1: markt,funkman, yoavs -1: * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43944 Use a message that exists to prevent a MissingResourceException http://svn.apache.org/viewvc?rev=606704view=rev - +1: markt,funkman + +1: markt,funkman, yoavs -1: * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43909 Make sure locale maps to wrapped ELContext. Patch provided by Tuomas Kiviaho. http://svn.apache.org/viewvc?rev=606728view=rev - +1: markt,funkman + +1: markt,funkman, yoavs -1: * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43839 URL based session tracking fails when session cookie from parent context is present. Based on a patch by Yuan Qingyun. http://svn.apache.org/viewvc?rev=606944view=rev - +1: markt,funkman, pero + +1: markt,funkman, pero, yoavs -1: * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43914 Location headers must be encoded. Patch provided by Ivan Todoroski. http://svn.apache.org/viewvc?rev=606952view=rev - +1: markt,funkman, pero + +1: markt,funkman, pero, yoavs -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, markt, pero + +1: funkman, markt, pero, yoavs -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, markt, pero + +1: funkman, markt, pero, yoavs -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r592478 - /tomcat/site/trunk/docs/
Author: yoavs Date: Tue Nov 6 08:22:09 2007 New Revision: 592478 URL: http://svn.apache.org/viewvc?rev=592478view=rev Log: Regenerate Tomcat site files with updated left-hand nav. 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/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 Modified: tomcat/site/trunk/docs/bugreport.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=592478r1=592477r2=592478view=diff == --- tomcat/site/trunk/docs/bugreport.html (original) +++ tomcat/site/trunk/docs/bugreport.html Tue Nov 6 08:22:09 2007 @@ -166,6 +166,12 @@ li a href=./legal.htmlLegal/a /li +li +a href=http://www.apache.org/foundation/sponsorship.html;Sponsorship/a +/li +li +a href=http://www.apache.org/foundation/thanks.html;Thanks/a +/li /ul /td !--RIGHT SIDE MAIN BODY-- Modified: tomcat/site/trunk/docs/contact.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/contact.html?rev=592478r1=592477r2=592478view=diff == --- tomcat/site/trunk/docs/contact.html (original) +++ tomcat/site/trunk/docs/contact.html Tue Nov 6 08:22:09 2007 @@ -164,6 +164,12 @@ li a href=./legal.htmlLegal/a /li +li +a href=http://www.apache.org/foundation/sponsorship.html;Sponsorship/a +/li +li +a href=http://www.apache.org/foundation/thanks.html;Thanks/a +/li /ul /td !--RIGHT SIDE MAIN BODY-- Modified: tomcat/site/trunk/docs/download-33.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-33.html?rev=592478r1=592477r2=592478view=diff == --- tomcat/site/trunk/docs/download-33.html (original) +++ tomcat/site/trunk/docs/download-33.html Tue Nov 6 08:22:09 2007 @@ -164,6 +164,12 @@ li a href=./legal.htmlLegal/a /li +li +a href=http://www.apache.org/foundation/sponsorship.html;Sponsorship/a +/li +li +a href=http://www.apache.org/foundation/thanks.html;Thanks/a +/li /ul /td !--RIGHT SIDE MAIN BODY-- Modified: tomcat/site/trunk/docs/download-41.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-41.html?rev=592478r1=592477r2=592478view=diff == --- tomcat/site/trunk/docs/download-41.html (original) +++ tomcat/site/trunk/docs/download-41.html Tue Nov 6 08:22:09 2007 @@ -164,6 +164,12 @@ li a href=./legal.htmlLegal/a /li +li +a href=http://www.apache.org/foundation/sponsorship.html;Sponsorship/a +/li +li +a href=http://www.apache.org/foundation/thanks.html;Thanks/a +/li /ul /td !--RIGHT SIDE MAIN BODY-- Modified: tomcat/site/trunk/docs/download-55.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-55.html?rev=592478r1=592477r2=592478view=diff == --- tomcat/site/trunk/docs/download-55.html (original) +++ tomcat/site/trunk/docs/download-55.html Tue Nov 6 08:22:09 2007 @@ -164,6 +164,12 @@ li a href=./legal.htmlLegal/a /li +li +a href=http://www.apache.org/foundation/sponsorship.html;Sponsorship/a +/li +li +a href=http://www.apache.org/foundation/thanks.html;Thanks/a +/li /ul /td !--RIGHT SIDE MAIN BODY-- Modified: tomcat/site/trunk/docs/download-60.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-60.html?rev=592478r1=592477r2=592478view=diff == --- tomcat/site/trunk/docs/download-60.html (original) +++ tomcat/site/trunk/docs/download-60.html Tue Nov 6 08:22:09 2007 @@ -164,6 +164,12 @@ li a href=./legal.htmlLegal/a /li +li +a href=http://www.apache.org/foundation/sponsorship.html;Sponsorship/a +/li +li +a href=http://www.apache.org/foundation/thanks.html;Thanks/a +/li /ul /td !--RIGHT SIDE MAIN BODY-- Modified: tomcat/site/trunk/docs/download-connectors.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download
svn commit: r592065 - in /tomcat/site/trunk: docs/lists.html docs/whoweare.html xdocs/lists.xml xdocs/stylesheets/project.xml xdocs/whoweare.xml
Author: yoavs Date: Mon Nov 5 08:24:10 2007 New Revision: 592065 URL: http://svn.apache.org/viewvc?rev=592065view=rev Log: Add links to ASF Sponsorship and Thanks pages on the left-hand side menu. Add link to MarkMail archives of Tomcat mailing lists on the mailing lists page. Update the Who We Are page to reflect change of PMC Chair. Modified: tomcat/site/trunk/docs/lists.html tomcat/site/trunk/docs/whoweare.html tomcat/site/trunk/xdocs/lists.xml tomcat/site/trunk/xdocs/stylesheets/project.xml tomcat/site/trunk/xdocs/whoweare.xml Modified: tomcat/site/trunk/docs/lists.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/lists.html?rev=592065r1=592064r2=592065view=diff == --- tomcat/site/trunk/docs/lists.html (original) +++ tomcat/site/trunk/docs/lists.html Mon Nov 5 08:24:10 2007 @@ -166,6 +166,12 @@ li a href=./legal.htmlLegal/a /li +li +a href=http://www.apache.org/foundation/sponsorship.html;Sponsorship/a +/li +li +a href=http://www.apache.org/foundation/thanks.html;Thanks/a +/li /ul /td !--RIGHT SIDE MAIN BODY-- @@ -193,8 +199,9 @@ helping with the development and debugging of the server./p pFormatted archives are available in several places including a href=http://mail-archives.apache.org/mod_mbox/;the Apache Mail -Archives/a, a href=http://marc.theaimsgroup.com/;MARC/a, and -a href=http://www.nabble.com/;Nabble/a. +Archives/a, a href=http://marc.theaimsgroup.com/;MARC/a, +a href=http://www.nabble.com/;Nabble/a, and +a href=http://tomcat.markmail.org/;MarkMail/a. You can also use the mail-to-news a href=nntp://news.gmane.org/;gateway/a offered by a href=http://news.gmane.org/index.php?match=gmane.comp.apache;GMANE/a to access most of the lists with a news reader./p Modified: tomcat/site/trunk/docs/whoweare.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whoweare.html?rev=592065r1=592064r2=592065view=diff == --- tomcat/site/trunk/docs/whoweare.html (original) +++ tomcat/site/trunk/docs/whoweare.html Mon Nov 5 08:24:10 2007 @@ -164,6 +164,12 @@ li a href=./legal.htmlLegal/a /li +li +a href=http://www.apache.org/foundation/sponsorship.html;Sponsorship/a +/li +li +a href=http://www.apache.org/foundation/thanks.html;Thanks/a +/li /ul /td !--RIGHT SIDE MAIN BODY-- @@ -238,11 +244,9 @@ h3PMC Chair/h3 p -bYoav Shapira/b (yoavs at apache.org)br/ +bMladen Turk/b (mturk at apache.org)br/ /p -Yoav Shapira contributes to numerous Apache and other -open-source projects: you can read more about him at -a href=http://www.yoavshapira.com;YoavShapira.com/a. + h3PMC Members amp; Committers/h3 @@ -312,12 +316,14 @@ p -bMark Thomas/b (markt at apache.org)br/ +bYoav Shapira/b (yoavs at apache.org)br/ /p - +Yoav Shapira contributes to numerous Apache and other +open-source projects: you can read more about him at +a href=http://www.yoavshapira.com;YoavShapira.com/a. p -bMladen Turk/b (mturk at apache.org)br/ +bMark Thomas/b (markt at apache.org)br/ /p Modified: tomcat/site/trunk/xdocs/lists.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/lists.xml?rev=592065r1=592064r2=592065view=diff == --- tomcat/site/trunk/xdocs/lists.xml (original) +++ tomcat/site/trunk/xdocs/lists.xml Mon Nov 5 08:24:10 2007 @@ -16,8 +16,9 @@ pFormatted archives are available in several places including a href=http://mail-archives.apache.org/mod_mbox/;the Apache Mail -Archives/a, a href=http://marc.theaimsgroup.com/;MARC/a, and -a href=http://www.nabble.com/;Nabble/a. +Archives/a, a href=http://marc.theaimsgroup.com/;MARC/a, +a href=http://www.nabble.com/;Nabble/a, and +a href=http://tomcat.markmail.org/;MarkMail/a. You can also use the mail-to-news a href=nntp://news.gmane.org/;gateway/a offered by a href=http://news.gmane.org/index.php?match=gmane.comp.apache;GMANE/a Modified: tomcat/site/trunk/xdocs/stylesheets/project.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/project.xml?rev=592065r1=592064r2=592065view=diff == --- tomcat/site/trunk/xdocs/stylesheets/project.xml (original) +++ tomcat/site/trunk/xdocs/stylesheets/project.xml Mon Nov 5 08:24:10 2007 @@ -52,7 +52,8 @@ item name=Resourceshref=/resources.html/ item name=Contact href=/contact.html/ item name=Legalhref=/legal.html/ +item name=Sponsorship href=http://www.apache.org/foundation/sponsorship.html/ +item name=Thanks href=http://www.apache.org/foundation/thanks.html/ /menu - -/body -/project \ No newline at end of file + /body +/project Modified: tomcat/site/trunk/xdocs/whoweare.xml URL: http
svn commit: r586122 - /tomcat/current/tc5.5.x/STATUS
Author: yoavs Date: Thu Oct 18 13:27:40 2007 New Revision: 586122 URL: http://svn.apache.org/viewvc?rev=586122view=rev Log: Add my +1s to STATUS Modified: tomcat/current/tc5.5.x/STATUS Modified: tomcat/current/tc5.5.x/STATUS URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS?rev=586122r1=586121r2=586122view=diff == --- tomcat/current/tc5.5.x/STATUS (original) +++ tomcat/current/tc5.5.x/STATUS Thu Oct 18 13:27:40 2007 @@ -32,15 +32,15 @@ * 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, billbarker + +1: pero, billbarker, yoavs -1: * Fix possible DoS condition for the experimental NIO/AJP module (reported by William Leung via email) http://issues.apache.org/bugzilla/show_bug.cgi?id=43621 - +1: billbarker + +1: billbarker, yoavs -1: * Backport fix for important vulnerability when webdav is enabled for write Patch: http://marc.info/?l=tomcat-devm=119245116910632w=2 - +1: markt + +1: markt, yoavs -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r586125 - /tomcat/tc6.0.x/trunk/STATUS
Author: yoavs Date: Thu Oct 18 13:30:46 2007 New Revision: 586125 URL: http://svn.apache.org/viewvc?rev=586125view=rev Log: Add my comments on STATUS 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=586125r1=586124r2=586125view=diff == --- tomcat/tc6.0.x/trunk/STATUS (original) +++ tomcat/tc6.0.x/trunk/STATUS Thu Oct 18 13:30:46 2007 @@ -29,17 +29,17 @@ * 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 + +1: fhanik, yoavs -1: * Add missing mbean descriptor http://people.apache.org/~fhanik/patches/loader-mbean.patch - +1: fhanik,funkman + +1: fhanik,funkman,yoavs -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,funkman + +1: fhanik,funkman, yoavs -1: * IcedTea support. Upcoming Linux distributions will package a (working) open source JRE, @@ -67,24 +67,25 @@ if [ -z $JAVA_HOME -a $1 = debug ]; then +1: - -1: + -1: + 0: yoavs * Fix multicasting bind address on multihomed computers http://issues.apache.org/bugzilla/show_bug.cgi?id=43641 - +1: fhanik, pero + +1: fhanik, pero, yoavs -1: * Warn if connector can not use external executors http://issues.apache.org/bugzilla/show_bug.cgi?id=43643 - +1: fhanik, pero + +1: fhanik, pero, yoavs -1: * Fix SSL buffer bug http://issues.apache.org/bugzilla/show_bug.cgi?id=43653 - +1: fhanik + +1: fhanik, yoavs -1: * Add a working ANT script that signs and publishes JARs to a maven repo http://people.apache.org/~fhanik/patches/maven-publish.patch - +1: fhanik + +1: fhanik, yoavs -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r565477 - in /tomcat/site/trunk: docs/resources.html xdocs/resources.xml
Author: yoavs Date: Mon Aug 13 11:58:44 2007 New Revision: 565477 URL: http://svn.apache.org/viewvc?view=revrev=565477 Log: Add a couple of links to resources.xml: Professional Apache Tomcat 6 book, and Filip's recent blog entry. Modified: tomcat/site/trunk/docs/resources.html tomcat/site/trunk/xdocs/resources.xml Modified: tomcat/site/trunk/docs/resources.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/resources.html?view=diffrev=565477r1=565476r2=565477 == --- tomcat/site/trunk/docs/resources.html (original) +++ tomcat/site/trunk/docs/resources.html Mon Aug 13 11:58:44 2007 @@ -232,6 +232,13 @@ ul li b +a href=http://blog.covalent.net/roller/covalent/entry/20070308; + Can Servlet Containers Scale? 16,000 Concurrent Connections using Tomcat 6!/a +/b, a performance + study and benchmark analysis by Filip Hanik. +/li +li + b a href=articles/benchmark_summary.pdfSo Much Static/a /b, a traffic and performance benchmark analysis by Peter Lin. @@ -340,6 +347,14 @@ a href=http://www.amazon.com/exec/obidos/tg/detail/-/1861007736/ref=pd_sbs_b_1/002-9433156-6683214?v=glanceamp;s=books;Professional Apache Tomcat/a /b, by Chanoch Wiggers, Ben Galbraith, Vivek Chopra, Sing Li, Debashish Bhattacharjee, Amit Bakore, Romin Irani, Sandip Bhattacharya, Chad Fowlerbr/ iWrox Press (09/2002)/i +/li +li + b +a href=http://www.amazon.com/Professional-Apache-Tomcat-WROX-Guides/dp/0471753610;Professional Apache Tomcat 6/a +/b, by by Vivek Chopra, Sing Li, Jeff Genender. + br/ +iWrox Press (August 2007)/i + br/ISBN: 0471753610 /li li b Modified: tomcat/site/trunk/xdocs/resources.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/resources.xml?view=diffrev=565477r1=565476r2=565477 == --- tomcat/site/trunk/xdocs/resources.xml (original) +++ tomcat/site/trunk/xdocs/resources.xml Mon Aug 13 11:58:44 2007 @@ -32,6 +32,11 @@ ul li + ba href=http://blog.covalent.net/roller/covalent/entry/20070308; + Can Servlet Containers Scale? 16,000 Concurrent Connections using Tomcat 6!/a/b, a performance + study and benchmark analysis by Filip Hanik. +/li +li ba href=articles/benchmark_summary.pdfSo Much Static/a/b, a traffic and performance benchmark analysis by Peter Lin. /li @@ -94,6 +99,11 @@ li ba href=http://www.amazon.com/exec/obidos/tg/detail/-/1861007736/ref=pd_sbs_b_1/002-9433156-6683214?v=glanceamp;s=books;Professional Apache Tomcat/a/b, by Chanoch Wiggers, Ben Galbraith, Vivek Chopra, Sing Li, Debashish Bhattacharjee, Amit Bakore, Romin Irani, Sandip Bhattacharya, Chad Fowlerbr/ iWrox Press (09/2002)/i +/li +li + ba href=http://www.amazon.com/Professional-Apache-Tomcat-WROX-Guides/dp/0471753610;Professional Apache Tomcat 6/a/b, by by Vivek Chopra, Sing Li, Jeff Genender. + br/iWrox Press (August 2007)/i + br/ISBN: 0471753610 /li li ba href=http://tomcatbook.sourceforge.net/;Tomcat Book Project/a/b - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r522281 - in /tomcat/container/tc5.5.x: catalina/src/share/org/apache/catalina/realm/RealmBase.java webapps/docs/changelog.xml
Author: yoavs
Date: Sun Mar 25 08:28:12 2007
New Revision: 522281
URL: http://svn.apache.org/viewvc?view=revrev=522281
Log:
Bugzilla 39875: minor cleanup in RealmBase.init to avoid a possible NPE when
getting logger.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/RealmBase.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/RealmBase.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/RealmBase.java?view=diffrev=522281r1=522280r2=522281
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/RealmBase.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/RealmBase.java
Sun Mar 25 08:28:12 2007
@@ -1325,10 +1325,19 @@
}
protected boolean initialized=false;
-
+
+/**
+ * Initialize this Realm. If it's already been
+ * initialized, do nothing.
+ */
public void init() {
-this.containerLog = container.getLogger();
+// Bugzilla 39875: if already initialized, do nothing
if( initialized container != null ) return;
+
+// We want logger as soon as possible
+if (container != null) {
+this.containerLog = container.getLogger();
+}
initialized=true;
if( container== null ) {
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diffrev=522281r1=522280r2=522281
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Mar 25 08:28:12 2007
@@ -24,6 +24,9 @@
bug41752/bug Correct error message on exception in MemoryRealm.
(markt)
/fix
+ fix
+bug39875/bug Minor cleanup in RealmBase.init, as requested by
Takayoshi Kimura. (yoavs)
+ /fix
/changelog
/subsection
subsection name=Webapps
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r522283 - in /tomcat/container/tc5.5.x/webapps/docs: changelog.xml config/context.xml
Author: yoavs Date: Sun Mar 25 08:37:12 2007 New Revision: 522283 URL: http://svn.apache.org/viewvc?view=revrev=522283 Log: Bugzilla 39883: add documentation warning about the use of the antiResourceLocking flag on a webapp outside the Host's appBase. Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml tomcat/container/tc5.5.x/webapps/docs/config/context.xml Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diffrev=522283r1=522282r2=522283 == --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Mar 25 08:37:12 2007 @@ -35,6 +35,10 @@ Update host configuration document for new behaviour for directories in appBase. (markt) /update + update +bug39883/bug Add note to context configuration document about using + antiResourceLocking on a webapp outside the Host's appBase directory. (yoavs) + /update /changelog /subsection /section Modified: tomcat/container/tc5.5.x/webapps/docs/config/context.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/config/context.xml?view=diffrev=522283r1=522282r2=522283 == --- tomcat/container/tc5.5.x/webapps/docs/config/context.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/config/context.xml Sun Mar 25 08:37:12 2007 @@ -246,6 +246,14 @@ including the disabling of JSP reloading in a running server: see a href=http://issues.apache.org/bugzilla/show_bug.cgi?id=37668;Bugzilla 37668/a. /p +p +Please note that setting this flag to true in applications that are +outside the appBase for the Host (the codewebapps/code directory +by default) will cause the application to be +strongdeleted/strong on Tomcat shutdown. You probably don't want to +do this, so think twice before setting antiResourceLocking=true on a webapp +that's outside the appBase for its Host. +/p /attribute attribute name=cacheMaxSize required=false - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r522286 - in /tomcat/tc6.0.x/trunk/webapps/docs: changelog.xml config/context.xml
Author: yoavs Date: Sun Mar 25 08:44:59 2007 New Revision: 522286 URL: http://svn.apache.org/viewvc?view=revrev=522286 Log: Bugzilla 39883: add documentation warning about the use of antiResourceLocking on a webapp that's outside th Host's appBase. Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/config/context.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=522286r1=522285r2=522286 == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Mar 25 08:44:59 2007 @@ -40,6 +40,10 @@ bug41752/bug Correct error message on exception in MemoryRealm. (markt) /fix + update +bug39883/bug Add documentation warning about using antiResourceLocking +on a webapp outside the Host's appBase. (yoavs) + /update /changelog /subsection subsection name=Coyote 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?view=diffrev=522286r1=522285r2=522286 == --- tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml Sun Mar 25 08:44:59 2007 @@ -241,6 +241,15 @@ including the disabling of JSP reloading in a running server: see a href=http://issues.apache.org/bugzilla/show_bug.cgi?id=37668;Bugzilla 37668/a. /p + +p +Please note that setting this flag to true in applications that are +outside the appBase for the Host (the codewebapps/code directory +by default) will cause the application to be +strongdeleted/strong on Tomcat shutdown. You probably don't want to +do this, so think twice before setting antiResourceLocking=true on a webapp +that's outside the appBase for its Host. +/p /attribute attribute name=cacheMaxSize required=false - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r522289 - in /tomcat/container/tc5.5.x: modules/cluster/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java webapps/docs/changelog.xml
Author: yoavs
Date: Sun Mar 25 08:56:39 2007
New Revision: 522289
URL: http://svn.apache.org/viewvc?view=revrev=522289
Log:
Bugzilla 39866: avoid duplicate cluster manager names being appended to each
other.
Modified:
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java?view=diffrev=522289r1=522288r2=522289
==
---
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
(original)
+++
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
Sun Mar 25 08:56:39 2007
@@ -620,20 +620,36 @@
}
/**
- * @param name
- * @param manager
- * @return
+ * Returns the name for the cluster manager. This name
+ * depends on whether the cluster manager is defined inside
+ * a Host or an Engine.
+ *
+ * See also Bugzilla 39866:
+ * http://issues.apache.org/bugzilla/show_bug.cgi?id=39866
+ *
+ * @param name The current name
+ * @param manager The cluster manager implementation
+ * @return The name to use for the cluster manager
*/
private String getManagerName(String name, Manager manager) {
-String clusterName = name ;
-if(getContainer() instanceof Engine) {
-Container context = manager.getContainer() ;
-if(context != null context instanceof Context) {
+String clusterName = name;
+
+if (getContainer() instanceof Engine) {
+Container context = manager.getContainer();
+
+if (context instanceof Context) {
Container host = ((Context)context).getParent();
-if(host != null host instanceof Host)
-clusterName = host.getName() + name ;
+
+if (host instanceof Host) {
+// Bugzilla 39866 shows duplicate names
+// http://issues.apache.org/bugzilla/show_bug.cgi?id=39866
+if (! (host.getName().equals(name))) {
+clusterName = host.getName() + name;
+}
+}
}
}
+
return clusterName;
}
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diffrev=522289r1=522288r2=522289
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Mar 25 08:56:39 2007
@@ -41,6 +41,13 @@
/update
/changelog
/subsection
+ subsection name=Cluster
+changelog
+ fix
+bug39866/bug Duplicate names appended to cluster manager name.
(yoavs)
+ /fix
+/changelog
+ /subsection
/section
section name=Tomcat 5.5.23 (fhanik)
@@ -467,7 +474,6 @@
/add
/changelog
/subsection
-
/section
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r522295 - in /tomcat: connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalAprInputBuffer.java container/tc5.5.x/webapps/docs/changelog.xml
Author: yoavs
Date: Sun Mar 25 09:20:23 2007
New Revision: 522295
URL: http://svn.apache.org/viewvc?view=revrev=522295
Log:
Bugzilla 40960: throw SocketTimeoutException, not parent IOException, if a
socket timeout ocurs, in InternalAprInputBuffer.
Modified:
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalAprInputBuffer.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalAprInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalAprInputBuffer.java?view=diffrev=522295r1=522294r2=522295
==
---
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalAprInputBuffer.java
(original)
+++
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/InternalAprInputBuffer.java
Sun Mar 25 09:20:23 2007
@@ -20,6 +20,7 @@
import java.io.IOException;
import java.io.EOFException;
+import java.net.SocketTimeoutException;
import java.nio.ByteBuffer;
import org.apache.tomcat.jni.Socket;
@@ -822,7 +823,11 @@
bbuf.get(buf, 0, nRead);
lastValid = nRead;
} else {
-throw new IOException(sm.getString(iib.failedread));
+if ((-nRead) == Status.ETIMEDOUT || (-nRead) == Status.TIMEUP)
{
+throw new
SocketTimeoutException(sm.getString(iib.failedread));
+} else {
+throw new IOException(sm.getString(iib.failedread));
+}
}
}
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diffrev=522295r1=522294r2=522295
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Mar 25 09:20:23 2007
@@ -41,6 +41,14 @@
/update
/changelog
/subsection
+ subsection name=Coyote
+changelog
+ fix
+bug40960/bug Inconsistent exception type thrown on socket timeout
in
+ InternalAprInputBuffer. Patch by Christophe Pierret. (yoavs)
+ /fix
+/changelog
+ /subsection
subsection name=Cluster
changelog
fix
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r522298 - in /tomcat/container/tc5.5.x: catalina/src/bin/catalina-tasks.xml webapps/docs/changelog.xml
Author: yoavs
Date: Sun Mar 25 09:32:37 2007
New Revision: 522298
URL: http://svn.apache.org/viewvc?view=revrev=522298
Log:
Bugzilla 41477: add commons-el.jar to bin/catalina-tasks.xml to support jasper2
task with EL.
Modified:
tomcat/container/tc5.5.x/catalina/src/bin/catalina-tasks.xml
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified: tomcat/container/tc5.5.x/catalina/src/bin/catalina-tasks.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/bin/catalina-tasks.xml?view=diffrev=522298r1=522297r2=522298
==
--- tomcat/container/tc5.5.x/catalina/src/bin/catalina-tasks.xml (original)
+++ tomcat/container/tc5.5.x/catalina/src/bin/catalina-tasks.xml Sun Mar 25
09:32:37 2007
@@ -16,6 +16,7 @@
fileset file=${catalina.home}/common/lib/servlet-api.jar/
fileset file=${catalina.home}/common/lib/jsp-api.jar/
fileset file=${catalina.home}/server/lib/catalina-ant.jar/
+ fileset file=${catalina.home}/common/lib/commons-el.jar/
/classpath
/taskdef
/project
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diffrev=522298r1=522297r2=522298
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Mar 25 09:32:37 2007
@@ -27,6 +27,10 @@
fix
bug39875/bug Minor cleanup in RealmBase.init, as requested by
Takayoshi Kimura. (yoavs)
/fix
+ fix
+bug41477/bug Add commons-el.jar to bin/catalina-tasks.xml,
required for jasper2 tasks
+ using EL. Patch by Daniel Santos. (yoavs)
+ /fix
/changelog
/subsection
subsection name=Webapps
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r522352 - in /tomcat/container/tc5.5.x/webapps/docs: changelog.xml config/ajp.xml
Author: yoavs Date: Sun Mar 25 14:18:49 2007 New Revision: 522352 URL: http://svn.apache.org/viewvc?view=revrev=522352 Log: Bugzilla 39540: add link to mod_proxy_ajp httpd config docs. Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml tomcat/container/tc5.5.x/webapps/docs/config/ajp.xml Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diffrev=522352r1=522351r2=522352 == --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Mar 25 14:18:49 2007 @@ -43,6 +43,9 @@ bug39883/bug Add note to context configuration document about using antiResourceLocking on a webapp outside the Host's appBase directory. (yoavs) /update + update +bug39540/bug Add link to httpd 2.2 mod_proxy_ajp docs in AJP connector doc. (yoavs) + /update /changelog /subsection subsection name=Coyote Modified: tomcat/container/tc5.5.x/webapps/docs/config/ajp.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/config/ajp.xml?view=diffrev=522352r1=522351r2=522352 == --- tomcat/container/tc5.5.x/webapps/docs/config/ajp.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/config/ajp.xml Sun Mar 25 14:18:49 2007 @@ -32,9 +32,11 @@ pThe native connectors supported with this Tomcat release are: ul -liJK 1.2.x with any of the supported servers/li -limod_proxy on Apache httpd 2.x (included by default in Apache HTTP Server 2.2), -with AJP enabled/li + liJK 1.2.x with any of the supported servers/li + limod_proxy on Apache httpd 2.x (included by default in Apache HTTP Server 2.2), + with AJP enabled: see + a href=http://httpd.apache.org/docs/2.2/mod/mod_proxy_ajp.html;the httpd docs/a + for details./li /ul /p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r522353 - in /tomcat/tc6.0.x/trunk/webapps/docs: changelog.xml config/ajp.xml
Author: yoavs Date: Sun Mar 25 14:21:29 2007 New Revision: 522353 URL: http://svn.apache.org/viewvc?view=revrev=522353 Log: Bugzilla 39540: add link to mod_proxy_ajp httpd config docs. Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.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=522353r1=522352r2=522353 == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Mar 25 14:21:29 2007 @@ -71,6 +71,9 @@ Update host configuration document for new behaviour for directories in appBase. (markt) /update + update +bug39540/bug Add link to httpd 2.2 mod_proxy_ajp docs in AJP connector doc. (yoavs) + /update /changelog /subsection /section Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml?view=diffrev=522353r1=522352r2=522353 == --- tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml Sun Mar 25 14:21:29 2007 @@ -32,9 +32,11 @@ pThe native connectors supported with this Tomcat release are: ul -liJK 1.2.x with any of the supported servers/li -limod_proxy on Apache httpd 2.x (included by default in Apache HTTP Server 2.2), -with AJP enabled/li + liJK 1.2.x with any of the supported servers/li + limod_proxy on Apache httpd 2.x (included by default in Apache HTTP Server 2.2), + with AJP enabled: see + a href=http://httpd.apache.org/docs/2.2/mod/mod_proxy_ajp.html;the httpd docs/a + for details./li /ul /p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r522354 - in /tomcat/container/tc5.5.x: catalina/src/share/org/apache/catalina/realm/JAASRealm.java webapps/docs/changelog.xml
Author: yoavs
Date: Sun Mar 25 14:31:22 2007
New Revision: 522354
URL: http://svn.apache.org/viewvc?view=revrev=522354
Log:
Bugzilla 40150: validate user and role class names in JAAS realm.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JAASRealm.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JAASRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JAASRealm.java?view=diffrev=522354r1=522353r2=522354
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JAASRealm.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/JAASRealm.java
Sun Mar 25 14:31:22 2007
@@ -230,16 +230,16 @@
}
}
-/**
- * Comma-delimited list of codejava.security.Principal/code classes
- * that represent security roles.
- */
-protected String roleClassNames = null;
-
-public String getRoleClassNames() {
-return (this.roleClassNames);
-}
-
+ /**
+ * Comma-delimited list of codejava.security.Principal/code classes
+ * that represent security roles.
+ */
+ protected String roleClassNames = null;
+
+ public String getRoleClassNames() {
+ return (this.roleClassNames);
+ }
+
/**
* Sets the list of comma-delimited classes that represent
* roles. The classes in the list must implement
codejava.security.Principal/code.
@@ -250,36 +250,48 @@
*/
public void setRoleClassNames(String roleClassNames) {
this.roleClassNames = roleClassNames;
-roleClasses.clear();
-String temp = this.roleClassNames;
-if (temp == null) {
-return;
-}
-while (true) {
-int comma = temp.indexOf(',');
-if (comma 0) {
-break;
-}
-roleClasses.add(temp.substring(0, comma).trim());
-temp = temp.substring(comma + 1);
-}
-temp = temp.trim();
-if (temp.length() 0) {
-roleClasses.add(temp);
-}
-}
-
-
-/**
- * Comma-delimited list of codejava.security.Principal/code classes
- * that represent individual users.
- */
-protected String userClassNames = null;
-
-public String getUserClassNames() {
-return (this.userClassNames);
-}
-
+ parseClassNames(roleClassNames, roleClasses);
+ }
+
+ /**
+ * Parses a comma-delimited list of class names, and store the class names
+ * in the provided List. Each class must implement
codejava.security.Principal/code.
+ *
+ * @param classNamesString a comma-delimited list of fully qualified
class names.
+ * @param classNamesList the list in which the class names will be stored.
+ *The list is cleared before being populated.
+ */
+ protected void parseClassNames(String classNamesString, List
classNamesList) {
+ classNamesList.clear();
+ if (classNamesString == null) return;
+
+ String[] classNames = classNamesString.split([ ]*,[ ]*);
+ for (int i=0; iclassNames.length; i++) {
+ if (classNames[i].length()==0) continue;
+ try {
+ Class principalClass = Class.forName(classNames[i]);
+ if (Principal.class.isAssignableFrom(principalClass)) {
+ classNamesList.add(classNames[i]);
+ } else {
+ log.error(Class +classNames[i]+ is not implementing +
+ java.security.Principal! Class not added.);
+ }
+ } catch (ClassNotFoundException e) {
+ log.error(Class +classNames[i]+ not found! Class not
added.);
+ }
+ }
+ }
+
+ /**
+ * Comma-delimited list of codejava.security.Principal/code classes
+ * that represent individual users.
+ */
+ protected String userClassNames = null;
+
+ public String getUserClassNames() {
+ return (this.userClassNames);
+ }
+
/**
* Sets the list of comma-delimited classes that represent individual
* users. The classes in the list must implement
codejava.security.Principal/code.
@@ -290,23 +302,7 @@
*/
public void setUserClassNames(String userClassNames) {
this.userClassNames = userClassNames;
-userClasses.clear();
-String temp = this.userClassNames;
-if (temp == null) {
-return;
-}
-while (true) {
-int comma = temp.indexOf(',');
-if (comma 0) {
-break;
-}
-userClasses.add(temp.substring(0, comma).trim());
-temp
svn commit: r522356 - in /tomcat/tc6.0.x/trunk: build.xml java/org/apache/catalina/realm/JAASRealm.java webapps/docs/changelog.xml
Author: yoavs
Date: Sun Mar 25 14:42:05 2007
New Revision: 522356
URL: http://svn.apache.org/viewvc?view=revrev=522356
Log:
Bugzilla 40150: validate user and role classes in JAASRealm. While I'm there,
typify the relevant lists of class names so that JDK 5+ doesn't complain about
unchecked operations in this class.
Modified:
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?view=diffrev=522356r1=522355r2=522356
==
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Sun Mar 25 14:42:05 2007
@@ -92,6 +92,7 @@
source=${compile.source}
optimize=${compile.optimize}
excludes=**/CVS/**,**/.svn/**
+!-- Comment this in to show unchecked warnings: compilerarg
value=-Xlint:unchecked/ --
classpath refid=tomcat.classpath /
exclude name=org/apache/tomcat/util/net/puretls/** /
/javac
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java?view=diffrev=522356r1=522355r2=522356
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java Sun Mar
25 14:42:05 2007
@@ -154,7 +154,7 @@
/**
* The list of role class names, split out for easy processing.
*/
-protected List roleClasses = new ArrayList();
+protected ListString roleClasses = new ArrayListString();
/**
@@ -167,7 +167,7 @@
/**
* The set of user class names, split out for easy processing.
*/
-protected List userClasses = new ArrayList();
+protected ListString userClasses = new ArrayListString();
/**
@@ -230,16 +230,16 @@
}
}
-/**
- * Comma-delimited list of codejava.security.Principal/code classes
- * that represent security roles.
- */
-protected String roleClassNames = null;
-
-public String getRoleClassNames() {
-return (this.roleClassNames);
-}
-
+ /**
+ * Comma-delimited list of codejava.security.Principal/code classes
+ * that represent security roles.
+ */
+ protected String roleClassNames = null;
+
+ public String getRoleClassNames() {
+ return (this.roleClassNames);
+ }
+
/**
* Sets the list of comma-delimited classes that represent
* roles. The classes in the list must implement
codejava.security.Principal/code.
@@ -250,36 +250,48 @@
*/
public void setRoleClassNames(String roleClassNames) {
this.roleClassNames = roleClassNames;
-roleClasses.clear();
-String temp = this.roleClassNames;
-if (temp == null) {
-return;
-}
-while (true) {
-int comma = temp.indexOf(',');
-if (comma 0) {
-break;
-}
-roleClasses.add(temp.substring(0, comma).trim());
-temp = temp.substring(comma + 1);
-}
-temp = temp.trim();
-if (temp.length() 0) {
-roleClasses.add(temp);
-}
-}
-
-
-/**
- * Comma-delimited list of codejava.security.Principal/code classes
- * that represent individual users.
- */
-protected String userClassNames = null;
-
-public String getUserClassNames() {
-return (this.userClassNames);
-}
-
+ parseClassNames(roleClassNames, roleClasses);
+ }
+
+ /**
+ * Parses a comma-delimited list of class names, and store the class names
+ * in the provided List. Each class must implement
codejava.security.Principal/code.
+ *
+ * @param classNamesString a comma-delimited list of fully qualified
class names.
+ * @param classNamesList the list in which the class names will be stored.
+ *The list is cleared before being populated.
+ */
+ protected void parseClassNames(String classNamesString, ListString
classNamesList) {
+ classNamesList.clear();
+ if (classNamesString == null) return;
+
+ String[] classNames = classNamesString.split([ ]*,[ ]*);
+ for (int i=0; iclassNames.length; i++) {
+ if (classNames[i].length()==0) continue;
+ try {
+ Class principalClass = Class.forName(classNames[i]);
+ if (Principal.class.isAssignableFrom(principalClass)) {
+ classNamesList.add(classNames[i]);
+ } else {
+ log.error(Class +classNames[i]+ is not implementing
svn commit: r522367 - in /tomcat/tc6.0.x/trunk: java/org/apache/jasper/JspC.java webapps/docs/changelog.xml
Author: yoavs
Date: Sun Mar 25 15:46:46 2007
New Revision: 522367
URL: http://svn.apache.org/viewvc?view=revrev=522367
Log:
Bugzilla 41227: add a bit of DEBUG-level logging to JspC so users know what
file is being compiled.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java?view=diffrev=522367r1=522366r2=522367
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java Sun Mar 25 15:46:46
2007
@@ -815,6 +815,11 @@
public void generateWebMapping( String file, JspCompilationContext clctxt )
throws IOException
{
+if (log.isDebugEnabled()) {
+log.debug(Generating web mapping for file + file
+ + using compilation context + clctxt);
+}
+
String className = clctxt.getServletClassName();
String packageName = clctxt.getServletPackageName();
@@ -950,6 +955,10 @@
protected void processFile(String file)
throws JasperException
{
+if (log.isDebugEnabled()) {
+log.debug(Processing file: + file);
+}
+
ClassLoader originalClassLoader = null;
try {
@@ -991,6 +1000,10 @@
// Otherwise only generate .java, if .jsp file is newer than
// the .java file
if( clc.isOutDated(compile) ) {
+if (log.isDebugEnabled()) {
+log.debug(jspUri + is out dated, compiling...);
+}
+
clc.compile(compile, true);
}
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=522367r1=522366r2=522367
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Mar 25 15:46:46 2007
@@ -80,6 +80,14 @@
/update
/changelog
/subsection
+ subsection name=Jasper
+changelog
+ fix
+bug41227/bug Add a bit of DEBUG-level logging to JspC so users know
+ which file is being compiled. (yoavs)
+ /fix
+/changelog
+ /subsection
/section
section name=Tomcat 6.0.10 (remm)
subsection name=Catalina
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r522378 - in /tomcat: connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11Processor.java container/tc5.5.x/webapps/docs/changelog.xml
Author: yoavs
Date: Sun Mar 25 16:05:22 2007
New Revision: 522378
URL: http://svn.apache.org/viewvc?view=revrev=522378
Log:
Bugzilla 41675: add a couple of DEBUG-level logging statements to
Http11Processor.java when sending error responses.
Modified:
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11Processor.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11Processor.java?view=diffrev=522378r1=522377r2=522378
==
---
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11Processor.java
(original)
+++
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11Processor.java
Sun Mar 25 16:05:22 2007
@@ -841,6 +841,10 @@
log.debug(sm.getString(http11processor.header.parse), t);
}
// 400 - Bad Request
+if (log.isDebugEnabled()) {
+log.debug(sm.getString(http11processor.request.prepare)+
+ host header missing);
+}
response.setStatus(400);
error = true;
}
@@ -1203,6 +1207,10 @@
http11 = false;
error = true;
// Send 505; Unsupported HTTP version
+if (log.isDebugEnabled()) {
+log.debug(sm.getString(http11processor.request.prepare)+
+ Unsupported HTTP version \+protocolMB+\);
+}
response.setStatus(505);
}
@@ -1311,6 +1319,10 @@
// Unsupported transfer encoding
error = true;
// 501 - Unimplemented
+if (log.isDebugEnabled()) {
+log.debug(sm.getString(http11processor.request.prepare)+
+ Unsupported transfer encoding
\+encodingName+\);
+}
response.setStatus(501);
}
}
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diffrev=522378r1=522377r2=522378
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Mar 25 16:05:22 2007
@@ -58,6 +58,10 @@
bug40960/bug Inconsistent exception type thrown on socket timeout
in
InternalAprInputBuffer. Patch by Christophe Pierret. (yoavs)
/fix
+ add
+bug41675/bug Add a couple of DEBUG-level logging statements to
Http11Processors
+ when sending error responses. Patch by Ralf Hauser. (yoavs)
+ /add
/changelog
/subsection
subsection name=Cluster
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r522379 - in /tomcat/tc6.0.x/trunk: java/org/apache/coyote/http11/Http11Processor.java webapps/docs/changelog.xml
Author: yoavs
Date: Sun Mar 25 16:08:01 2007
New Revision: 522379
URL: http://svn.apache.org/viewvc?view=revrev=522379
Log:
Bugzilla 41675: add a couple of DEBUG-level logging statements to
Http11Processor.java when sending error responses.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java?view=diffrev=522379r1=522378r2=522379
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java Sun
Mar 25 16:08:01 2007
@@ -1174,6 +1174,10 @@
http11 = false;
error = true;
// Send 505; Unsupported HTTP version
+if (log.isDebugEnabled()) {
+log.debug(sm.getString(http11processor.request.prepare)+
+ Unsupported HTTP version \+protocolMB+\);
+}
response.setStatus(505);
}
@@ -1282,6 +1286,10 @@
// Unsupported transfer encoding
error = true;
// 501 - Unimplemented
+if (log.isDebugEnabled()) {
+log.debug(sm.getString(http11processor.request.prepare)+
+ Unsupported transfer encoding
\+encodingName+\);
+}
response.setStatus(501);
}
}
@@ -1300,6 +1308,10 @@
if (http11 (valueMB == null)) {
error = true;
// 400 - Bad request
+if (log.isDebugEnabled()) {
+log.debug(sm.getString(http11processor.request.prepare)+
+ host header missing);
+}
response.setStatus(400);
}
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=522379r1=522378r2=522379
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Mar 25 16:08:01 2007
@@ -63,6 +63,10 @@
fix
Requests with multiple content-length headers are now rejected. (markt)
/fix
+ add
+bug41675/bug Add a couple of DEBUG-level logging statements to
Http11Processors
+ when sending error responses. Patch by Ralf Hauser. (yoavs)
+ /add
/changelog
/subsection
subsection name=Webapps
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r490487 - in /tomcat/container/tc5.5.x: catalina/src/share/org/apache/catalina/valves/RequestDumperValve.java webapps/docs/changelog.xml
Author: yoavs
Date: Wed Dec 27 04:26:07 2006
New Revision: 490487
URL: http://svn.apache.org/viewvc?view=revrev=490487
Log:
Bugzilla 40177: un-depracate RequestDumperValve.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/RequestDumperValve.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/RequestDumperValve.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/RequestDumperValve.java?view=diffrev=490487r1=490486r2=490487
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/RequestDumperValve.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/RequestDumperValve.java
Wed Dec 27 04:26:07 2006
@@ -49,14 +49,13 @@
* pFor a similar mechanism that is portable to all Servlet 2.4
* containers, check out the RequestDumperFilter Filter in the
* example application (the source for this filter may be found in
- * $CATALINA_HOME/webapps/examples/WEB-INF/classes/filters.
+ * $CATALINA_HOME/webapps/examples/WEB-INF/classes/filters./p
*
- * @deprecated Use the RequestDumperFilter in the examples webapp instead
* @author Craig R. McClanahan
* @version $Revision$ $Date$
*/
-public class RequestDumperValve extends ValveBase {
+public class RequestDumperValve extends ValveBase {
// - Instance Variables
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diffrev=490487r1=490486r2=490487
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Dec 27 04:26:07 2006
@@ -177,7 +177,7 @@
/fix
fix
bug40177/bug: add more warnings to documentation about
RequestDumperValve
-character encoding. Deprecate this Valve in favor of
RequestDumperFilter. (yoavs)
+character encoding. (yoavs)
/fix
fix
bug39255/bug: NPE in AuthenticatorBase when logging level is set
to DEBUG
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r490308 - in /tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper: ./ compiler/ runtime/ servlet/ xmlparser/
Author: yoavs
Date: Tue Dec 26 07:24:49 2006
New Revision: 490308
URL: http://svn.apache.org/viewvc?view=revrev=490308
Log:
Bugzilla 39975: don't have static Log references.
Modified:
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/EmbeddedServletOptions.java
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/JspC.java
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/compiler/Compiler.java
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/compiler/Generator.java
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/compiler/JspConfig.java
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/compiler/JspReader.java
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/compiler/TldLocationsCache.java
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/runtime/JspFactoryImpl.java
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/runtime/PerThreadTagHandlerPool.java
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/servlet/JspServlet.java
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/servlet/JspServletWrapper.java
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/xmlparser/ParserUtils.java
Modified:
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/EmbeddedServletOptions.java
URL:
http://svn.apache.org/viewvc/tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/EmbeddedServletOptions.java?view=diffrev=490308r1=490307r2=490308
==
---
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/EmbeddedServletOptions.java
(original)
+++
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/EmbeddedServletOptions.java
Tue Dec 26 07:24:49 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2004-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -37,10 +37,9 @@
* @author Hans Bergsten
* @author Pierre Delisle
*/
-public final class EmbeddedServletOptions implements Options {
-
-// Logger
-private static Log log = LogFactory.getLog(EmbeddedServletOptions.class);
+public class EmbeddedServletOptions implements Options {
+/** Logger (set by constructor. ) */
+private Log log;
private Properties settings = new Properties();
@@ -353,10 +352,11 @@
*/
public EmbeddedServletOptions(ServletConfig config,
ServletContext context) {
+log = LogFactory.getLog(getClass());
-Enumeration enum=config.getInitParameterNames();
-while( enum.hasMoreElements() ) {
-String k=(String)enum.nextElement();
+Enumeration enums=config.getInitParameterNames();
+while( enums.hasMoreElements() ) {
+String k=(String)enums.nextElement();
String v=config.getInitParameter( k );
setProperty( k, v);
}
Modified:
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/JspC.java
URL:
http://svn.apache.org/viewvc/tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/JspC.java?view=diffrev=490308r1=490307r2=490308
==
---
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/JspC.java
(original)
+++
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/JspC.java
Tue Dec 26 07:24:49 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2004-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -88,8 +88,8 @@
public static final String DEFAULT_IE_CLASS_ID =
clsid:8AD9C840-044E-11D1-B3E9-00805F499D93;
-// Logger
-private static Log log = LogFactory.getLog(JspC.class);
+/** Logger (set by constructor. ) */
+private Log log;
private static final String SWITCH_VERBOSE = -v;
private static final String SWITCH_HELP = -help;
@@ -218,6 +218,11 @@
}
}
}
+}
+
+/** Constructor. */
+public JspC() {
+log = LogFactory.getLog(getClass());
}
public void setArgs(String[] arg) throws JasperException {
Modified:
tomcat/jasper
svn commit: r490309 - /tomcat/container/branches/tc5.0.x/webapps/docs/changelog.xml
Author: yoavs Date: Tue Dec 26 07:24:54 2006 New Revision: 490309 URL: http://svn.apache.org/viewvc?view=revrev=490309 Log: Bugzilla 39975: don't have static Log references. Modified: tomcat/container/branches/tc5.0.x/webapps/docs/changelog.xml Modified: tomcat/container/branches/tc5.0.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc5.0.x/webapps/docs/changelog.xml?view=diffrev=490309r1=490308r2=490309 == --- tomcat/container/branches/tc5.0.x/webapps/docs/changelog.xml (original) +++ tomcat/container/branches/tc5.0.x/webapps/docs/changelog.xml Tue Dec 26 07:24:54 2006 @@ -65,6 +65,14 @@ /changelog /subsection + subsection name=Jasper +changelog + fix +bug39975/bug: Don't have static Log references in Jasper. (yoavs) + /fix +/changelog + /subsection + subsection name=Webapps changelog fix - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r490146 - in /tomcat: connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java container/tc5.5.x/webapps/docs/changelog.xml
Author: yoavs
Date: Mon Dec 25 04:56:48 2006
New Revision: 490146
URL: http://svn.apache.org/viewvc?view=revrev=490146
Log:
Bugzilla 39402: don't always overwrite Vary header
Modified:
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java?view=diffrev=490146r1=490145r2=490146
==
---
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++
tomcat/connectors/trunk/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
Mon Dec 25 04:56:48 2006
@@ -1615,7 +1615,20 @@
outputBuffer.addActiveFilter(outputFilters[Constants.GZIP_FILTER]);
headers.setValue(Content-Encoding).setString(gzip);
// Make Proxies happy via Vary (from mod_deflate)
-headers.setValue(Vary).setString(Accept-Encoding);
+// Bugzilla 39402:
http://issues.apache.org/bugzilla/show_bug.cgi?id=39402
+// Either add a Vary: Accept-Encoding header or add
Accept-Encoding to
+// the existing header.
+String varyHeaderValue = ;
+MessageBytes varyHeaderValueBytes = headers.getValue(Vary);
+if (varyHeaderValueBytes!=null
varyHeaderValueBytes.getString()!=null) {
+varyHeaderValue = varyHeaderValueBytes.getString();
+}
+if (.equals(varyHeaderValue)) {
+varyHeaderValue=Accept-Encoding;
+} else {
+varyHeaderValue=varyHeaderValue+,+Accept-Encoding;
+}
+headers.setValue(Vary).setString(varyHeaderValue);
}
// Add date header
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diffrev=490146r1=490145r2=490146
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Mon Dec 25 04:56:48 2006
@@ -192,6 +192,10 @@
bug38774/bug: Check javax.net.ssl.keyStorePassword system property
as a secondary
source for keystore password in JSSESocketFactory, as suggested by Ted
X. Toth. (yoavs)
/fix
+ fix
+bug39402/bug: Modify existing Vary HTTP header, rather than
overwrite it, if it
+exists when using GZip compression. Patch by Matthew Cooke. (yoavs)
+ /fix
/changelog
/subsection
subsection name=Jasper
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r490148 - in /tomcat/container/tc5.5.x: catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java webapps/docs/changelog.xml
Author: yoavs
Date: Mon Dec 25 05:31:07 2006
New Revision: 490148
URL: http://svn.apache.org/viewvc?view=revrev=490148
Log:
Bugzilla 40326: don't use File#deleteOnExit in DefaultServlet.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java?view=diffrev=490148r1=490147r2=490148
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Mon Dec 25 05:31:07 2006
@@ -459,6 +459,15 @@
result = false;
}
+// Bugzilla 40326: at this point content file should be safe to delete
+// as it's no longer referenced. Let's not rely on deleteOnExit
because
+// it's a memory leak, as noted in this Bugzilla issue.
+try {
+contentFile.delete();
+} catch (Exception e) {
+log(DefaultServlet.doPut: couldn't delete temporary file: +
e.getMessage());
+}
+
if (result) {
if (exists) {
resp.setStatus(HttpServletResponse.SC_NO_CONTENT);
@@ -489,10 +498,7 @@
// Convert all '/' characters to '.' in resourcePath
String convertedResourcePath = path.replace('/', '.');
File contentFile = new File(tempDir, convertedResourcePath);
-if (contentFile.createNewFile()) {
-// Clean up contentFile when Tomcat is terminated
-contentFile.deleteOnExit();
-}
+contentFile.createNewFile();
RandomAccessFile randAccessContentFile =
new RandomAccessFile(contentFile, rw);
@@ -503,6 +509,7 @@
if (obj instanceof Resource)
oldResource = (Resource) obj;
} catch (NamingException e) {
+log(DefaultServlet.executePartialPut: couldn't find resource at
+ path);
}
// Copy data in oldRevisionContent to contentFile
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diffrev=490148r1=490147r2=490148
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Mon Dec 25 05:31:07 2006
@@ -168,6 +168,10 @@
bug39476/bug: add xml declaration to most build.xml files, as
suggested by
Gregory S. Hoerner Sr. (yoavs)
/update
+ fix
+bug40326/bug: : stop using File#deleteOnExit in DefaultServlet to
avoid
+JVM memory leak, as suggested by quartz. (yoavs)
+ /fix
/changelog
/subsection
subsection name=Coyote
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r490149 - in /tomcat/container/tc5.5.x: catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java catalina/src/share/org/apache/catalina/ssi/SSIServlet.java webapps/docs/changelo
Author: yoavs
Date: Mon Dec 25 06:06:34 2006
New Revision: 490149
URL: http://svn.apache.org/viewvc?view=revrev=490149
Log:
Bugzilla 40241: catch Exceptions instead of Throwables in Default and SSI
servlets, and log them better.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/ssi/SSIServlet.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java?view=diffrev=490149r1=490148r2=490149
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Mon Dec 25 06:06:34 2006
@@ -220,46 +220,65 @@
String value = null;
try {
value = getServletConfig().getInitParameter(debug);
-debug = Integer.parseInt(value);
-} catch (Throwable t) {
-;
+if (value != null) {
+debug = Integer.parseInt(value);
+}
+} catch (Exception e) {
+log(DefaultServlet.init: couldn't read debug from + value);
}
+
try {
value = getServletConfig().getInitParameter(input);
-input = Integer.parseInt(value);
-} catch (Throwable t) {
-;
+if (value != null) {
+input = Integer.parseInt(value);
+}
+} catch (Exception e) {
+log(DefaultServlet.init: couldn't read input from + value);
}
+
try {
value = getServletConfig().getInitParameter(listings);
-listings = (new Boolean(value)).booleanValue();
-} catch (Throwable t) {
-;
+if (value != null) {
+listings = (new Boolean(value)).booleanValue();
+}
+} catch (Exception e) {
+log(DefaultServlet.init: couldn't read listings from + value);
}
+
try {
value = getServletConfig().getInitParameter(readonly);
-if (value != null)
+if (value != null) {
readOnly = (new Boolean(value)).booleanValue();
-} catch (Throwable t) {
-;
+}
+} catch (Exception e) {
+log(DefaultServlet.init: couldn't read readonly from + value);
}
+
try {
value = getServletConfig().getInitParameter(output);
-output = Integer.parseInt(value);
-} catch (Throwable t) {
-;
+if (value != null) {
+output = Integer.parseInt(value);
+}
+} catch (Exception e) {
+log(DefaultServlet.init: couldn't read output from + value);
}
+
try {
value = getServletConfig().getInitParameter(sendfileSize);
-sendfileSize = Integer.parseInt(value) * 1024;
-} catch (Throwable t) {
-;
+if (value != null) {
+sendfileSize = Integer.parseInt(value) * 1024;
+}
+} catch (Exception e) {
+log(DefaultServlet.init: couldn't read sendfileSize from +
value);
}
+
try {
value = getServletConfig().getInitParameter(fileEncoding);
-fileEncoding = value;
-} catch (Throwable t) {
-;
+if (value != null) {
+fileEncoding = value;
+}
+} catch (Exception e) {
+log(DefaultServlet.init: couldn't read fileEncoding from +
value);
}
globalXsltFile = getServletConfig().getInitParameter(globalXsltFile);
@@ -284,6 +303,7 @@
} catch(ClassCastException e) {
// Failed : Not the right type
}
+
if (resources == null) {
try {
resources =
@@ -1464,10 +1484,10 @@
return buffer.toString();
}
- } catch(Throwable e) {
- ; /* Should only be IOException or NamingException
-* can be ignored
-*/
+ } catch(IOException ioe) {
+ log(DefaultServlet.getReadme: IO exception: +
ioe.getMessage());
+ } catch (NamingException ne) {
+ log(DefaultServlet.getReadme: Naming exception: +
ne.getMessage());
}
}
@@ -1488,10 +1508,10 @@
if (is!=null)
return is;
}
- } catch(Throwable e) {
- ; /* Should only be IOException
svn commit: r490151 - in /tomcat/container/tc5.5.x: catalina/src/share/org/apache/catalina/core/LocalStrings.properties catalina/src/share/org/apache/catalina/core/StandardContext.java webapps/docs/ch
Author: yoavs
Date: Mon Dec 25 06:15:53 2006
New Revision: 490151
URL: http://svn.apache.org/viewvc?view=revrev=490151
Log:
Bugzilla 40133: better handling and error message for undefined context path
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings.properties?view=diffrev=490151r1=490150r2=490151
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
Mon Dec 25 06:15:53 2006
@@ -79,6 +79,7 @@
standardContext.notWrapper=Child of a Context must be a Wrapper
standardContext.parameter.duplicate=Duplicate context initialization parameter
{0}
standardContext.parameter.required=Both parameter name and parameter value are
required
+standardContext.pathRequired=Context path must be configured
standardContext.reloadingCompleted=Reloading this Context is completed
standardContext.reloadingFailed=Reloading this Context failed due to previous
errors
standardContext.reloadingStarted=Reloading this Context has started
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java?view=diffrev=490151r1=490150r2=490151
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
Mon Dec 25 06:15:53 2006
@@ -3827,15 +3827,21 @@
* or codefalse/code otherwise.
*/
public boolean resourcesStart() {
-
boolean ok = true;
Hashtable env = new Hashtable();
-if (getParent() != null)
+if (getParent() != null) {
env.put(ProxyDirContext.HOST, getParent().getName());
-env.put(ProxyDirContext.CONTEXT, getName());
+}
try {
+// Bugzilla 40133:
http://issues.apache.org/bugzilla/show_bug.cgi?id=40133
+if (getName() == null) {
+throw new IllegalArgumentException(
+ sm.getString(standardContext.pathRequired));
+}
+env.put(ProxyDirContext.CONTEXT, getName());
+
ProxyDirContext proxyDirContext =
new ProxyDirContext(env, webappResources);
if (webappResources instanceof FileDirContext) {
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diffrev=490151r1=490150r2=490151
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Mon Dec 25 06:15:53 2006
@@ -204,6 +204,10 @@
bug40241/bug: Catch Exceptions instead of Throwables in Default
and SSI servlets.
Also improve relevant logging while we're at it. (yoavs)
/fix
+ fix
+bug40133/bug: Better error message when context name is not
available on startup,
+as suggested by Andreas Plesner Jacobsen. (yoavs)
+ /fix
/changelog
/subsection
subsection name=Jasper
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r490152 - in /tomcat/container/tc5.5.x/webapps/docs: changelog.xml setup.xml
Author: yoavs Date: Mon Dec 25 06:19:29 2006 New Revision: 490152 URL: http://svn.apache.org/viewvc?view=revrev=490152 Log: Bugzilla 40192: minor setup doc update regarding tray icon. Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml tomcat/container/tc5.5.x/webapps/docs/setup.xml Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diffrev=490152r1=490151r2=490152 == --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Mon Dec 25 06:19:29 2006 @@ -169,8 +169,11 @@ Gregory S. Hoerner Sr. (yoavs) /update fix -bug40326/bug: : stop using File#deleteOnExit in DefaultServlet to avoid +bug40326/bug: stop using File#deleteOnExit in DefaultServlet to avoid JVM memory leak, as suggested by quartz. (yoavs) + /fix + fix +bug40192/bug: update setup.html notes regarding Windows tray icon. (yoavs) /fix /changelog /subsection Modified: tomcat/container/tc5.5.x/webapps/docs/setup.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/setup.xml?view=diffrev=490152r1=490151r2=490152 == --- tomcat/container/tc5.5.x/webapps/docs/setup.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/setup.xml Mon Dec 25 06:19:29 2006 @@ -47,7 +47,7 @@ of a J2SE 5 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 +will be a tray icon visible. Note that when choosing to run Tomcat at the end of installation, the tray icon will be loaded at the same time./li liRefer to the - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r490037 - in /tomcat/container/tc5.5.x: catalina/src/share/org/apache/catalina/authenticator/SSLAuthenticator.java webapps/docs/config/http.xml webapps/docs/ssl-howto.xml
Author: yoavs Date: Sun Dec 24 08:29:27 2006 New Revision: 490037 URL: http://svn.apache.org/viewvc?view=revrev=490037 Log: Bugzilla 34643: better documentation of per-user / per-session clientAuth usage. Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/authenticator/SSLAuthenticator.java tomcat/container/tc5.5.x/webapps/docs/config/http.xml tomcat/container/tc5.5.x/webapps/docs/ssl-howto.xml Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/authenticator/SSLAuthenticator.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/authenticator/SSLAuthenticator.java?view=diffrev=490037r1=490036r2=490037 == --- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/authenticator/SSLAuthenticator.java (original) +++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/authenticator/SSLAuthenticator.java Sun Dec 24 08:29:27 2006 @@ -38,6 +38,9 @@ * An bAuthenticator/b and bValve/b implementation of authentication * that utilizes SSL certificates to identify client users. * + * You will likely want to read the SSL HowTo in the Tomcat documentation: + * http://tomcat.apache.org/tomcat-5.5-doc/ssl-howto.html + * * @author Craig R. McClanahan * @version $Revision$ $Date$ */ Modified: tomcat/container/tc5.5.x/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/config/http.xml?view=diffrev=490037r1=490036r2=490037 == --- tomcat/container/tc5.5.x/webapps/docs/config/http.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/config/http.xml Sun Dec 24 08:29:27 2006 @@ -423,7 +423,8 @@ value (which is the default) will not require a certificate chain unless the client requests a resource protected by a security constraint that uses codeCLIENT-CERT/code authentication. See the - a href=../ssl-howto.htmlSSL HowTo/a for an example./p + a href=../ssl-howto.htmlSSL HowTo/a for an example. That SSL HowTo + also contains tips on using per-user or per-session certificate-based clientAuth./p /attribute attribute name=keystoreFile required=false Modified: tomcat/container/tc5.5.x/webapps/docs/ssl-howto.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/ssl-howto.xml?view=diffrev=490037r1=490036r2=490037 == --- tomcat/container/tc5.5.x/webapps/docs/ssl-howto.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/ssl-howto.xml Sun Dec 24 08:29:27 2006 @@ -8,7 +8,7 @@ properties author email=[EMAIL PROTECTED]Christopher Cain/author -author email=[EMAIL PROTECTED]Yoav Shapira/author +authorYoav Shapira/author titleSSL Configuration HOW-TO/title /properties @@ -288,7 +288,7 @@ pstrongNote:/strong your private key password and keystore password should be the same. If they differ, you will get an error along the lines of codejava.io.IOException: Cannot recover key/code, as documented in -a href=http://issues.apache.org/bugzilla/show_bug.cgi?id=38217;Bugzilla issue 38217/a, +a href=http://issues.apache.org/bugzilla/show_bug.cgi?id=38217;Bugzilla 38217/a, which contains further references for this issue./p /subsection @@ -350,6 +350,9 @@ all SSL clients to present a client Certificate in order to use this socket. Set this value to codewant/code if you want Tomcat to request a client Certificate, but not fail if one isn't presented. +For using clientAuth on a per-user or per-session basis, check out +the tips in +a href=http://issues.apache.org/bugzilla/show_bug.cgi?id=34643; title=Bugzilla 34643Bugzilla 34643/a. /td /tr tr @@ -558,6 +561,13 @@ For additional discussion on this area, please see a href=http://issues.apache.org/bugzilla/show_bug.cgi?id=22679;Bugzilla/a. /p + +pFor tips on using clientAuth on a per-user or per-session basis, and also for +using clientAuth with self-signed or expired client certificates, please see the +discussion in +a href=http://issues.apache.org/bugzilla/show_bug.cgi?id=34643; title=Bugzilla 34643Bugzilla 34643/a. +/p + /section /body - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r490039 - /tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Author: yoavs Date: Sun Dec 24 08:40:40 2006 New Revision: 490039 URL: http://svn.apache.org/viewvc?view=revrev=490039 Log: oops forgot to inclue changelog in previous commit Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diffrev=490039r1=490038r2=490039 == --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Dec 24 08:40:40 2006 @@ -147,6 +147,15 @@ fix Make provided instances of RequestDispatcher thread safe. (markt) /fix + fix +bug34643/bug: Improved documentation for per-user / per-session clientAuth +usage in SSL Authenticator. Docs provided by jack and Ralf Hauser. (yoavs) + /fix + fix +bug40668/bug: Update release notes and readme files specific to v5.5.20 to +notify users of missing MailSessionFactory in distribution, suggest workarounds, +and link to relevant Bugzilla issue. (yoavs) + /fix /changelog /subsection subsection name=Coyote - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r490044 - in /tomcat/container/tc5.5.x/webapps/docs: changelog.xml manager-howto.xml
Author: yoavs Date: Sun Dec 24 09:04:30 2006 New Revision: 490044 URL: http://svn.apache.org/viewvc?view=revrev=490044 Log: bugzilla 40257: doc improvement Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml tomcat/container/tc5.5.x/webapps/docs/manager-howto.xml Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diffrev=490044r1=490043r2=490044 == --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Dec 24 09:04:30 2006 @@ -254,6 +254,10 @@ bug41182/bug: Update the Jasper documentation for the classpath attribute. (markt) /fix + fix +bug40257/bug: Update Manager webapp howto on remote deployment to reflect +need for explicit path in one specific use-case. Thank to Venkatesh Jayaraman. (yoavs) + /fix /changelog /subsection subsection name=Cluster Modified: tomcat/container/tc5.5.x/webapps/docs/manager-howto.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/manager-howto.xml?view=diffrev=490044r1=490043r2=490044 == --- tomcat/container/tc5.5.x/webapps/docs/manager-howto.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/manager-howto.xml Sun Dec 24 09:04:30 2006 @@ -461,7 +461,7 @@ configuration .xml file and a web application .war file located on the server. source -http://localhost:8080/manager/deploy?config=file:/path/context.xmlamp;war=jar:file:/path/bar.war!/ +http://localhost:8080/manager/deploy?config=file:/path/context.xmlamp;war=file:/path/bar.waramp;path=/bar /source /p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r490052 - in /tomcat: build/tc5.5.x/BUILDING.txt build/tc5.5.x/build.properties.default build/tc5.5.x/resources/build.xml container/tc5.5.x/webapps/docs/building.xml container/tc5.5.x/weba
Author: yoavs
Date: Sun Dec 24 09:41:23 2006
New Revision: 490052
URL: http://svn.apache.org/viewvc?view=revrev=490052
Log:
Bugzilla 37977: building documentation improvements
Modified:
tomcat/build/tc5.5.x/BUILDING.txt
tomcat/build/tc5.5.x/build.properties.default
tomcat/build/tc5.5.x/resources/build.xml
tomcat/container/tc5.5.x/webapps/docs/building.xml
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified: tomcat/build/tc5.5.x/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/BUILDING.txt?view=diffrev=490052r1=490051r2=490052
==
--- tomcat/build/tc5.5.x/BUILDING.txt (original)
+++ tomcat/build/tc5.5.x/BUILDING.txt Sun Dec 24 09:41:23 2006
@@ -47,9 +47,29 @@
available, which will be used to actually perform the build.
-(2) Building Tomcat 5.5
+(2) Install Subversion 1.3.x on your computer
-(2.1) Download main build script and build binary distribution
+* If Subversion 1.3.x is already installed on your computer, skip to (3).
+
+* Download a binary distribution of Subversion 1.3.x from:
+
+http://subversion.tigris.org/project_packages.html
+
+* Unpack the binary distribution into a convenient location so that the
+ Subversion release resides in its own directory.
+
+* Modify the PATH environment variable to include the directory
+ ${svn.home}/bin in its list, where ${svn.home} is the full pathname
+ of the subversion release directory. This makes the svn command
+ available, which will be used to checkout the tomcat sources.
+
+* NOTE: If you're running behind a proxy server, the SVN checkout of Tomcat
+ source code may fail. See http://subversion.tigris.org/faq.html#proxy for
+ ways to work around this.
+
+(3) Building Tomcat 5.5
+
+(3.1) Download main build script and build binary distribution
* Download the main build.xml script from:
http://tomcat.apache.org/tomcat-5.5-doc/build.xml
@@ -58,7 +78,7 @@
directory will be referred to as the ${tomcat.source} directory in the rest
of this document
-(2.2) Building
+(3.2) Building
* Go to that directory, and do:
@@ -90,7 +110,7 @@
base.path=/usr/share/java
-(3) Updating sources
+(4) Updating sources
It is recommended that you regularly update the downloaded Tomcat 5 sources.
To do this, execute the following commands:
@@ -99,7 +119,7 @@
ant checkout
-(4) Rebuilds
+(5) Rebuilds
For a quick rebuild of only modified code you can use
@@ -110,7 +130,7 @@
tomcat depends on ( commons-logging for now ), to ease fixes
and debuging in those packages.
-(5) Building The compat Package
+(6) Building The compat Package
Tomcat 5.5 is designed to run on J2SE 5.0, but will run on
J2SE versions 1.3 and 1.4 as well as long as the compatability
@@ -121,13 +141,13 @@
cd ${tomcat.source}
ant build-compat
-(6) Building the servlet and jsp API documentation
+(7) Building the servlet and jsp API documentation
The documentation can be easly rebuild, do
cd ${tomcat.source}/build
ant dist-javadoc
-(7) Building a release running tests:
+(8) Building a release running tests:
do
cd ${tomcat.source}/build
Modified: tomcat/build/tc5.5.x/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/build.properties.default?view=diffrev=490052r1=490051r2=490052
==
--- tomcat/build/tc5.5.x/build.properties.default (original)
+++ tomcat/build/tc5.5.x/build.properties.default Sun Dec 24 09:41:23 2006
@@ -142,9 +142,9 @@
# - Tomcat native library -
-tomcat-native.home=${base.path}/tomcat-native-1.1.7
+tomcat-native.home=${base.path}/tomcat-native-current
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
-tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-1.1.7.tar.gz
+tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-current.tar.gz
# --
Modified: tomcat/build/tc5.5.x/resources/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/resources/build.xml?view=diffrev=490052r1=490051r2=490052
==
--- tomcat/build/tc5.5.x/resources/build.xml (original)
+++ tomcat/build/tc5.5.x/resources/build.xml Sun Dec 24 09:41:23 2006
@@ -1,5 +1,6 @@
-project name=Tomcat 5.0 Netbuild default=build basedir=.
-
+!-- This file is the Tomcat 5.x net build file. It's what users run to build
Tomcat --
+!-- from scratch. See BUILDING.txt for the full instructions.
--
+project name=Tomcat 5 Netbuild default=build basedir=.
!-- = Initialize Property Values === --
@@ -11,9 +12,9 @@
!-- Project Properties --
property name=name value=Apache Tomcat /
- property name=year
svn commit: r490097 - /tomcat/container/branches/tc5.0.x/catalina/src/share/org/apache/catalina/startup/ExpandWar.java
Author: yoavs
Date: Sun Dec 24 18:34:56 2006
New Revision: 490097
URL: http://svn.apache.org/viewvc?view=revrev=490097
Log:
Bugzilla 33636: set last modified date in ExpandWar for Tomcat 5.0.
Modified:
tomcat/container/branches/tc5.0.x/catalina/src/share/org/apache/catalina/startup/ExpandWar.java
Modified:
tomcat/container/branches/tc5.0.x/catalina/src/share/org/apache/catalina/startup/ExpandWar.java
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc5.0.x/catalina/src/share/org/apache/catalina/startup/ExpandWar.java?view=diffrev=490097r1=490096r2=490097
==
---
tomcat/container/branches/tc5.0.x/catalina/src/share/org/apache/catalina/startup/ExpandWar.java
(original)
+++
tomcat/container/branches/tc5.0.x/catalina/src/share/org/apache/catalina/startup/ExpandWar.java
Sun Dec 24 18:34:56 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2004-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -182,7 +182,12 @@
logger.log( Creating expanded file + name);
}
input = jarFile.getInputStream(jarEntry);
-expand(input, docBase, name);
+// Bugzilla 33636:
http://issues.apache.org/bugzilla/show_bug.cgi?id=33636
+File f = expand(input, docBase, name);
+long lastModified = jarEntry.getTime();
+if (lastModified != -1lastModified != 0) {
+f.setLastModified(lastModified);
+}
input.close();
input = null;
}
@@ -248,10 +253,11 @@
* @param input InputStream to be copied
* @param docBase Document base directory into which we are expanding
* @param name Relative pathname of the file to be created
+ * @return File, which has been created
*
* @exception IOException if an input/output error occurs
*/
-protected static void expand(InputStream input, File docBase, String name)
+protected static File expand(InputStream input, File docBase, String name)
throws IOException {
File file = new File(docBase, name);
@@ -276,7 +282,6 @@
}
}
+return file;
}
-
-
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r490098 - /tomcat/container/branches/tc5.0.x/webapps/docs/changelog.xml
Author: yoavs Date: Sun Dec 24 18:35:04 2006 New Revision: 490098 URL: http://svn.apache.org/viewvc?view=revrev=490098 Log: Bugzilla 33636: set last modified date in ExpandWar for Tomcat 5.0. Modified: tomcat/container/branches/tc5.0.x/webapps/docs/changelog.xml Modified: tomcat/container/branches/tc5.0.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc5.0.x/webapps/docs/changelog.xml?view=diffrev=490098r1=490097r2=490098 == --- tomcat/container/branches/tc5.0.x/webapps/docs/changelog.xml (original) +++ tomcat/container/branches/tc5.0.x/webapps/docs/changelog.xml Sun Dec 24 18:35:04 2006 @@ -8,13 +8,13 @@ properties author email=[EMAIL PROTECTED]Remy Maucherat/author -author email=[EMAIL PROTECTED]Yoav Shapira/author -titleChangelog/title +authorYoav Shapira/author +titleTomcat 5.0 Changelog/title /properties body -section name=Tomcat 5.0.31 (yoavs) +section name=Tomcat 5.0.31 subsection name=General changelog fix @@ -48,6 +48,10 @@ /fix fix bug32137/bug: Possible thread-safety issue in RealmBase. (yoavs) + /fix + fix +bug33636/bug: Set last modified date of expanded WARs. Thanks to +Torsten Schlabach for the patch. (yoavs) /fix /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r490099 - in /tomcat: connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java container/tc5.5.x/webapps/docs/changelog.xml container/tc5.5.x/webapps/docs/config/a
Author: yoavs
Date: Sun Dec 24 18:41:35 2006
New Revision: 490099
URL: http://svn.apache.org/viewvc?view=revrev=490099
Log:
Bugzilla 38774: use javax.net.ssl.keyStorePassword system property as backup.
Modified:
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/container/tc5.5.x/webapps/docs/config/ajp.xml
Modified:
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?view=diffrev=490099r1=490098r2=490099
==
---
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
(original)
+++
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Sun Dec 24 18:41:35 2006
@@ -205,7 +205,11 @@
}
String keystorePass = (String)attributes.get(keystorePass);
if (keystorePass == null) {
-keystorePass = keyPass;
+// Bugzilla 38774:
http://issues.apache.org/bugzilla/show_bug.cgi?id=38774
+keystorePass =
System.getProperty(javax.net.ssl.keyStorePassword);
+if (keystorePass == null ) {
+keystorePass = keyPass;
+}
}
return keystorePass;
}
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diffrev=490099r1=490098r2=490099
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Dec 24 18:41:35 2006
@@ -180,6 +180,10 @@
bug41057/bug: Modify StringCache to add a configurable upper bound
to the length of cached strings. (remm/markt)
/fix
+ fix
+bug38774/bug: Check javax.net.ssl.keyStorePassword system property
as a secondary
+source for keystore password in JSSESocketFactory, as suggested by Ted
X. Toth. (yoavs)
+ /fix
/changelog
/subsection
subsection name=Jasper
Modified: tomcat/container/tc5.5.x/webapps/docs/config/ajp.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/config/ajp.xml?view=diffrev=490099r1=490098r2=490099
==
--- tomcat/container/tc5.5.x/webapps/docs/config/ajp.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/config/ajp.xml Sun Dec 24 18:41:35
2006
@@ -8,7 +8,7 @@
properties
author email=[EMAIL PROTECTED]Remy Maucherat/author
-author email=[EMAIL PROTECTED]Yoav Shapira/author
+authorYoav Shapira/author
author email=[EMAIL PROTECTED]Andrew R. Jaquith/author
titleThe AJP Connector/title
/properties
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r490102 - /tomcat/container/tc5.5.x/webapps/docs/config/context.xml
Author: yoavs Date: Sun Dec 24 18:54:25 2006 New Revision: 490102 URL: http://svn.apache.org/viewvc?view=revrev=490102 Log: Bugzilla 39013 (partial solution): doc improvement. Modified: tomcat/container/tc5.5.x/webapps/docs/config/context.xml Modified: tomcat/container/tc5.5.x/webapps/docs/config/context.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/config/context.xml?view=diffrev=490102r1=490101r2=490102 == --- tomcat/container/tc5.5.x/webapps/docs/config/context.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/config/context.xml Sun Dec 24 18:54:25 2006 @@ -150,6 +150,11 @@ symbolic link will only be effective after a Tomcat restart or by undeploying and redeploying the conext. A context reload is not sufficient./p +pDo not choose a docBase that starts with your Host's appBase string. +The default appBase is webapps so do not choose a docBase like +webapps-foo. Doing so will lead to deployment errors: see +a href=http://issues.apache.org/bugzilla/show_bug.cgi?id=39013; title=Bugzilla 39013Bugzilla/a +for details./p /attribute attribute name=override required=false - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r490104 - in /tomcat/container/tc5.5.x/webapps/docs: changelog.xml monitoring.xml
Author: yoavs Date: Sun Dec 24 19:01:27 2006 New Revision: 490104 URL: http://svn.apache.org/viewvc?view=revrev=490104 Log: Bugzilla 39055; documentation for JSR160 JMX monitoring with firewall Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml tomcat/container/tc5.5.x/webapps/docs/monitoring.xml Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diffrev=490104r1=490103r2=490104 == --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Dec 24 19:01:27 2006 @@ -160,6 +160,10 @@ bug37977/bug: adapt BUILDING.txt and net build.xml for SVN. Patch by Christopher Sahnwaldt. (yoavs) /fix + update +bug39055/bug: Link to sample workaround code for using JSR160 JMX monitoring +with a local firewall. Thanks to George Lindholm for the patch. (yoavs) + /update /changelog /subsection subsection name=Coyote Modified: tomcat/container/tc5.5.x/webapps/docs/monitoring.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/monitoring.xml?view=diffrev=490104r1=490103r2=490104 == --- tomcat/container/tc5.5.x/webapps/docs/monitoring.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/monitoring.xml Sun Dec 24 19:01:27 2006 @@ -62,7 +62,9 @@ /li /ol bNote:/bThe JSR 160 JMX-Adaptor opens a second data protocol port. That is a problem -when you have installed a local firewall.br/ +when you have installed a local firewall. However, there is at least one possible +workaround: using a custom JMXConnectorServer. The code for this is available +at a href=http://issues.apache.org/bugzilla/show_bug.cgi?id=39055; title=Bugzila 39055Bugzilla 39055/a. /p pActivate JMX MX4J Http Adaptor with Java 1.4: ol - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r490106 - in /tomcat: build/tc5.5.x/build.xml build/tc5.5.x/resources/build.xml connectors/trunk/build.xml container/tc5.5.x/build.xml container/tc5.5.x/catalina/build.xml container/tc5.5.
Author: yoavs Date: Sun Dec 24 19:27:38 2006 New Revision: 490106 URL: http://svn.apache.org/viewvc?view=revrev=490106 Log: Bugzilla 39476: add xml declaration to build.xml files Modified: tomcat/build/tc5.5.x/build.xml tomcat/build/tc5.5.x/resources/build.xml tomcat/connectors/trunk/build.xml tomcat/container/tc5.5.x/build.xml tomcat/container/tc5.5.x/catalina/build.xml tomcat/container/tc5.5.x/webapps/docs/changelog.xml tomcat/jasper/tc5.5.x/build.xml Modified: tomcat/build/tc5.5.x/build.xml URL: http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/build.xml?view=diffrev=490106r1=490105r2=490106 == --- tomcat/build/tc5.5.x/build.xml (original) +++ tomcat/build/tc5.5.x/build.xml Sun Dec 24 19:27:38 2006 @@ -1,6 +1,7 @@ +?xml version=1.0? +!-- This is the main Tomcat 5.5 build file: it invokes most of the others. -- project name=Tomcat 5.5 default=deploy basedir=. - !-- = Initialize Property Values === -- !-- See build.properties.sample in the top level directory for all -- @@ -12,7 +13,7 @@ !-- Project Properties -- property name=name value=Apache Tomcat / - property name=year value=2005 / + property name=year value=2006 / property name=version.major value=5 / property name=version.minor value=5 / property name=version.build value=0 / Modified: tomcat/build/tc5.5.x/resources/build.xml URL: http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/resources/build.xml?view=diffrev=490106r1=490105r2=490106 == --- tomcat/build/tc5.5.x/resources/build.xml (original) +++ tomcat/build/tc5.5.x/resources/build.xml Sun Dec 24 19:27:38 2006 @@ -1,3 +1,4 @@ +?xml version=1.0? !-- This file is the Tomcat 5.x net build file. It's what users run to build Tomcat -- !-- from scratch. See BUILDING.txt for the full instructions. -- project name=Tomcat 5 Netbuild default=build basedir=. Modified: tomcat/connectors/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/build.xml?view=diffrev=490106r1=490105r2=490106 == --- tomcat/connectors/trunk/build.xml (original) +++ tomcat/connectors/trunk/build.xml Sun Dec 24 19:27:38 2006 @@ -1,3 +1,4 @@ +?xml version=1.0? project name=Jtc default=dist basedir=. !-- == Initialize Properties = -- Modified: tomcat/container/tc5.5.x/build.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/build.xml?view=diffrev=490106r1=490105r2=490106 == --- tomcat/container/tc5.5.x/build.xml (original) +++ tomcat/container/tc5.5.x/build.xml Sun Dec 24 19:27:38 2006 @@ -1,3 +1,4 @@ +?xml version=1.0? project name=Catalina 2.0 default=deploy basedir=. Modified: tomcat/container/tc5.5.x/catalina/build.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/build.xml?view=diffrev=490106r1=490105r2=490106 == --- tomcat/container/tc5.5.x/catalina/build.xml (original) +++ tomcat/container/tc5.5.x/catalina/build.xml Sun Dec 24 19:27:38 2006 @@ -1,3 +1,4 @@ +?xml version=1.0? project name=Catalina default=deploy basedir=. Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diffrev=490106r1=490105r2=490106 == --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Dec 24 19:27:38 2006 @@ -164,6 +164,10 @@ bug39055/bug: Link to sample workaround code for using JSR160 JMX monitoring with a local firewall. Thanks to George Lindholm for the patch. (yoavs) /update + update +bug39476/bug: add xml declaration to most build.xml files, as suggested by +Gregory S. Hoerner Sr. (yoavs) + /update /changelog /subsection subsection name=Coyote Modified: tomcat/jasper/tc5.5.x/build.xml URL: http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/build.xml?view=diffrev=490106r1=490105r2=490106 == --- tomcat/jasper/tc5.5.x/build.xml (original) +++ tomcat/jasper/tc5.5.x/build.xml Sun Dec 24 19:27:38 2006 @@ -1,3 +1,4 @@ +?xml version=1.0? project name=Jasper2 default=deploy basedir=. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r490107 - in /tomcat/tc6.0.x/trunk: build.properties.default build.xml
Author: yoavs Date: Sun Dec 24 19:31:57 2006 New Revision: 490107 URL: http://svn.apache.org/viewvc?view=revrev=490107 Log: add xml declaration to build.xml Modified: tomcat/tc6.0.x/trunk/build.properties.default tomcat/tc6.0.x/trunk/build.xml Modified: tomcat/tc6.0.x/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?view=diffrev=490107r1=490106r2=490107 == --- tomcat/tc6.0.x/trunk/build.properties.default (original) +++ tomcat/tc6.0.x/trunk/build.properties.default Sun Dec 24 19:31:57 2006 @@ -2,8 +2,8 @@ # build.properties.sample # # This is an example build.properties file, used to customize building -# Jasper2 for your local environment. It defines the location of all external -# modules that Jasper2 depends on. Copy this file to build.properties +# Tomcat for your local environment. It defines the location of all external +# modules that Tomcat depends on. Copy this file to build.properties # in the top-level source directory, and customize it as needed. # # $Id$ Modified: tomcat/tc6.0.x/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?view=diffrev=490107r1=490106r2=490107 == --- tomcat/tc6.0.x/trunk/build.xml (original) +++ tomcat/tc6.0.x/trunk/build.xml Sun Dec 24 19:31:57 2006 @@ -1,3 +1,4 @@ +?xml version=1.0? project name=Tomcat 6.0 default=deploy basedir=. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r418302 - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Author: yoavs Date: Fri Jun 30 07:44:06 2006 New Revision: 418302 URL: http://svn.apache.org/viewvc?rev=418302view=rev Log: Removing ApacheCon EU banner now that the conference is nearly over. 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-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/resources.html tomcat/site/trunk/docs/svn.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/docs/whoweare.html tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Modified: tomcat/site/trunk/docs/bugreport.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=418302r1=418301r2=418302view=diff == --- tomcat/site/trunk/docs/bugreport.html (original) +++ tomcat/site/trunk/docs/bugreport.html Fri Jun 30 07:44:06 2006 @@ -21,10 +21,6 @@ font face=arial,helvetica,sanserif h1Apache Tomcat/h1 /font -!--Support ApacheCon EU-- -a title=ApacheCon EU href=http://www.eu.apachecon.com; -img border=0 alt=ApacheCon EU src=http://people.apache.org/~lars/apachecon/ac2006eu_250x92trans.gif; / -/a /td td !--APACHE LOGO-- Modified: tomcat/site/trunk/docs/contact.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/contact.html?rev=418302r1=418301r2=418302view=diff == --- tomcat/site/trunk/docs/contact.html (original) +++ tomcat/site/trunk/docs/contact.html Fri Jun 30 07:44:06 2006 @@ -19,10 +19,6 @@ font face=arial,helvetica,sanserif h1Apache Tomcat/h1 /font -!--Support ApacheCon EU-- -a title=ApacheCon EU href=http://www.eu.apachecon.com; -img border=0 alt=ApacheCon EU src=http://people.apache.org/~lars/apachecon/ac2006eu_250x92trans.gif; / -/a /td td !--APACHE LOGO-- Modified: tomcat/site/trunk/docs/download-33.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-33.html?rev=418302r1=418301r2=418302view=diff == --- tomcat/site/trunk/docs/download-33.html (original) +++ tomcat/site/trunk/docs/download-33.html Fri Jun 30 07:44:06 2006 @@ -19,10 +19,6 @@ font face=arial,helvetica,sanserif h1Apache Tomcat/h1 /font -!--Support ApacheCon EU-- -a title=ApacheCon EU href=http://www.eu.apachecon.com; -img border=0 alt=ApacheCon EU src=http://people.apache.org/~lars/apachecon/ac2006eu_250x92trans.gif; / -/a /td td !--APACHE LOGO-- Modified: tomcat/site/trunk/docs/download-41.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-41.html?rev=418302r1=418301r2=418302view=diff == --- tomcat/site/trunk/docs/download-41.html (original) +++ tomcat/site/trunk/docs/download-41.html Fri Jun 30 07:44:06 2006 @@ -19,10 +19,6 @@ font face=arial,helvetica,sanserif h1Apache Tomcat/h1 /font -!--Support ApacheCon EU-- -a title=ApacheCon EU href=http://www.eu.apachecon.com; -img border=0 alt=ApacheCon EU src=http://people.apache.org/~lars/apachecon/ac2006eu_250x92trans.gif; / -/a /td td !--APACHE LOGO-- Modified: tomcat/site/trunk/docs/download-55.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-55.html?rev=418302r1=418301r2=418302view=diff == --- tomcat/site/trunk/docs/download-55.html (original) +++ tomcat/site/trunk/docs/download-55.html Fri Jun 30 07:44:06 2006 @@ -19,10 +19,6 @@ font face=arial,helvetica,sanserif h1Apache Tomcat/h1 /font -!--Support ApacheCon EU-- -a title=ApacheCon EU href=http://www.eu.apachecon.com; -img border=0 alt=ApacheCon EU src=http://people.apache.org/~lars/apachecon/ac2006eu_250x92trans.gif; / -/a /td td !--APACHE LOGO-- Modified: tomcat/site/trunk/docs/download-connectors.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-connectors.html?rev=418302r1=418301r2=418302view=diff == --- tomcat/site/trunk/docs/download-connectors.html (original) +++ tomcat/site/trunk/docs/download-connectors.html Fri Jun 30 07:44:06 2006 @@ -19,10 +19,6 @@ font face=arial,helvetica,sanserif h1Apache Tomcat/h1 /font -!--Support ApacheCon EU-- -a title=ApacheCon EU href=http://www.eu.apachecon.com; -img border=0 alt=ApacheCon EU src=http://people.apache.org/~lars/apachecon/ac2006eu_250x92trans.gif; / -/a /td td !--APACHE LOGO-- Modified
svn commit: r414654 - in /tomcat/container/tc5.5.x: catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java webapps/docs/changelog.xml
Author: yoavs
Date: Thu Jun 15 11:51:57 2006
New Revision: 414654
URL: http://svn.apache.org/viewvc?rev=414654view=rev
Log:
Bugzilla 39657: http://issues.apache.org/bugzilla/show_bug.cgi?id=39657.
Adds the same check for the JSP API that we currently do for the Servlet API,
i.e. log a warning and don't load the jar from the webapp's repository.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java?rev=414654r1=414653r2=414654view=diff
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
Thu Jun 15 11:51:57 2006
@@ -138,7 +138,8 @@
* earlier versions.
*/
protected static final String[] triggers = {
-javax.servlet.Servlet // Servlet API
+javax.servlet.Servlet,// Servlet API
+javax.servlet.jsp.JspPage // JSP API
};
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=414654r1=414653r2=414654view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Jun 15 11:51:57 2006
@@ -36,6 +36,10 @@
add
bug39661/bug: Add documentation on JULI FileHandler properties.
(yoavs)
/add
+ add
+bug39657/bug: Warn (and don't load jar) if JSP API is in webapp
classloader repository, as suggested by
+ David Sanchez Crespillo. (yoavs)
+ /add
/changelog
/subsection
subsection name=Webapps
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r414655 - in /tomcat/container/tc5.5.x: catalina/src/bin/service.bat webapps/docs/changelog.xml
Author: yoavs Date: Thu Jun 15 11:56:42 2006 New Revision: 414655 URL: http://svn.apache.org/viewvc?rev=414655view=rev Log: Bugzilla 39674: http://issues.apache.org/bugzilla/show_bug.cgi?id=39674 Modified: tomcat/container/tc5.5.x/catalina/src/bin/service.bat tomcat/container/tc5.5.x/webapps/docs/changelog.xml Modified: tomcat/container/tc5.5.x/catalina/src/bin/service.bat URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/bin/service.bat?rev=414655r1=414654r2=414655view=diff == --- tomcat/container/tc5.5.x/catalina/src/bin/service.bat (original) +++ tomcat/container/tc5.5.x/catalina/src/bin/service.bat Thu Jun 15 11:56:42 2006 @@ -74,17 +74,22 @@ rem Use the environment variables as an example rem Each command line option is prefixed with PR_ -set PR_DESCRIPTION=Apache Tomcat Server - http://jakarta.apache.org/tomcat +set PR_DESCRIPTION=Apache Tomcat Server - http://tomcat.apache.org set PR_INSTALL=%EXECUTABLE% set PR_LOGPATH=%CATALINA_BASE%\logs set PR_CLASSPATH=%CATALINA_HOME%\bin\bootstrap.jar + rem Set the server jvm from JAVA_HOME set PR_JVM=%JAVA_HOME%\jre\bin\server\jvm.dll if exist %PR_JVM% goto foundJvm rem Set the client jvm from JAVA_HOME set PR_JVM=%JAVA_HOME%\jre\bin\client\jvm.dll if exist %PR_JVM% goto foundJvm +rem Check for JRockit JVM: Bugzilla 39674 +set PR_JVM=%JAVA_HOME%\jre\bin\jrockit\jvm.dll +if exist %PR_JVM% goto foundJvm set PR_JVM=auto + :foundJvm echo Using JVM: %PR_JVM% %EXECUTABLE% //IS//%SERVICE_NAME% --StartClass org.apache.catalina.startup.Bootstrap --StopClass org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=414655r1=414654r2=414655view=diff == --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Jun 15 11:56:42 2006 @@ -40,6 +40,9 @@ bug39657/bug: Warn (and don't load jar) if JSP API is in webapp classloader repository, as suggested by David Sanchez Crespillo. (yoavs) /add + add +bug39674/bug: Support JRockit JVM in service.bat script, as suggested by lizongbo. (yoavs) + /add /changelog /subsection subsection name=Webapps - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r414656 - in /tomcat/container/tc5.5.x/webapps/docs: changelog.xml config/loader.xml
Author: yoavs Date: Thu Jun 15 12:09:18 2006 New Revision: 414656 URL: http://svn.apache.org/viewvc?rev=414656view=rev Log: Bugzilla 39711: http://issues.apache.org/bugzilla/show_bug.cgi?id=39711 Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml tomcat/container/tc5.5.x/webapps/docs/config/loader.xml Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=414656r1=414655r2=414656view=diff == --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Jun 15 12:09:18 2006 @@ -43,6 +43,9 @@ add bug39674/bug: Support JRockit JVM in service.bat script, as suggested by lizongbo. (yoavs) /add + fix +bug39711/bug: Update Loader configuration documentation, as suggested by Stephane Bailliez. (yoavs) + /fix /changelog /subsection subsection name=Webapps Modified: tomcat/container/tc5.5.x/webapps/docs/config/loader.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/config/loader.xml?rev=414656r1=414655r2=414656view=diff == --- tomcat/container/tc5.5.x/webapps/docs/config/loader.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/config/loader.xml Thu Jun 15 12:09:18 2006 @@ -8,6 +8,7 @@ properties author email=[EMAIL PROTECTED]Craig R. McClanahan/author +authorYoav Shapira/author titleThe Loader Component/title /properties @@ -105,10 +106,11 @@ attributes - attribute name=checkInterval required=false + attribute name=backgroundProcesssorDelay required=false pThe number of seconds between checks for modified classes and resources, if codereloadable/code has been set to -codetrue/code. The default is 15 seconds./p +codetrue/code./p +pSee the general documentation for this parameter at a href=../host.htmlHost Container/a./p /attribute attribute name=loaderClass required=false - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r412767 - in /tomcat/site/trunk: docs/ xdocs/stylesheets/
Author: yoavs Date: Thu Jun 8 08:01:21 2006 New Revision: 412767 URL: http://svn.apache.org/viewvc?rev=412767view=rev Log: Support our friends at ApacheCon EU for a couple of weeks. (I'll remove the logo/link and re-generate the site once the conference ends). 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-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/resources.html tomcat/site/trunk/docs/svn.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/docs/whoweare.html tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Modified: tomcat/site/trunk/docs/bugreport.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=412767r1=412766r2=412767view=diff == --- tomcat/site/trunk/docs/bugreport.html (original) +++ tomcat/site/trunk/docs/bugreport.html Thu Jun 8 08:01:21 2006 @@ -21,6 +21,10 @@ font face=arial,helvetica,sanserif h1Apache Tomcat/h1 /font +!--Support ApacheCon EU-- +a title=ApacheCon EU href=http://www.eu.apachecon.com; +img border=0 alt=ApacheCon EU src=http://people.apache.org/~lars/apachecon/ac2006eu_250x92trans.gif; / +/a /td td !--APACHE LOGO-- Modified: tomcat/site/trunk/docs/contact.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/contact.html?rev=412767r1=412766r2=412767view=diff == --- tomcat/site/trunk/docs/contact.html (original) +++ tomcat/site/trunk/docs/contact.html Thu Jun 8 08:01:21 2006 @@ -19,6 +19,10 @@ font face=arial,helvetica,sanserif h1Apache Tomcat/h1 /font +!--Support ApacheCon EU-- +a title=ApacheCon EU href=http://www.eu.apachecon.com; +img border=0 alt=ApacheCon EU src=http://people.apache.org/~lars/apachecon/ac2006eu_250x92trans.gif; / +/a /td td !--APACHE LOGO-- Modified: tomcat/site/trunk/docs/download-33.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-33.html?rev=412767r1=412766r2=412767view=diff == --- tomcat/site/trunk/docs/download-33.html (original) +++ tomcat/site/trunk/docs/download-33.html Thu Jun 8 08:01:21 2006 @@ -19,6 +19,10 @@ font face=arial,helvetica,sanserif h1Apache Tomcat/h1 /font +!--Support ApacheCon EU-- +a title=ApacheCon EU href=http://www.eu.apachecon.com; +img border=0 alt=ApacheCon EU src=http://people.apache.org/~lars/apachecon/ac2006eu_250x92trans.gif; / +/a /td td !--APACHE LOGO-- Modified: tomcat/site/trunk/docs/download-41.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-41.html?rev=412767r1=412766r2=412767view=diff == --- tomcat/site/trunk/docs/download-41.html (original) +++ tomcat/site/trunk/docs/download-41.html Thu Jun 8 08:01:21 2006 @@ -19,6 +19,10 @@ font face=arial,helvetica,sanserif h1Apache Tomcat/h1 /font +!--Support ApacheCon EU-- +a title=ApacheCon EU href=http://www.eu.apachecon.com; +img border=0 alt=ApacheCon EU src=http://people.apache.org/~lars/apachecon/ac2006eu_250x92trans.gif; / +/a /td td !--APACHE LOGO-- Modified: tomcat/site/trunk/docs/download-55.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-55.html?rev=412767r1=412766r2=412767view=diff == --- tomcat/site/trunk/docs/download-55.html (original) +++ tomcat/site/trunk/docs/download-55.html Thu Jun 8 08:01:21 2006 @@ -19,6 +19,10 @@ font face=arial,helvetica,sanserif h1Apache Tomcat/h1 /font +!--Support ApacheCon EU-- +a title=ApacheCon EU href=http://www.eu.apachecon.com; +img border=0 alt=ApacheCon EU src=http://people.apache.org/~lars/apachecon/ac2006eu_250x92trans.gif; / +/a /td td !--APACHE LOGO-- Modified: tomcat/site/trunk/docs/download-connectors.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-connectors.html?rev=412767r1=412766r2=412767view=diff == --- tomcat/site/trunk/docs/download-connectors.html (original) +++ tomcat/site/trunk/docs/download-connectors.html Thu Jun 8 08:01:21 2006 @@ -19,6 +19,10 @@ font face=arial,helvetica,sanserif h1Apache Tomcat/h1 /font +!--Support ApacheCon EU-- +a title=ApacheCon EU href=http://www.eu.apachecon.com; +img border=0 alt=ApacheCon EU src=http://people.apache.org/~lars/apachecon
svn commit: r409450 - in /tomcat/container/tc5.5.x/webapps/docs: changelog.xml logging.xml
Author: yoavs Date: Thu May 25 13:02:32 2006 New Revision: 409450 URL: http://svn.apache.org/viewvc?rev=409450view=rev Log: Bugzilla 39661: http://issues.apache.org/bugzilla/show_bug.cgi?id=39661 Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml tomcat/container/tc5.5.x/webapps/docs/logging.xml Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=409450r1=409449r2=409450view=diff == --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu May 25 13:02:32 2006 @@ -33,6 +33,9 @@ bug39406/bug: Fix that StandardSession#getLastAccessedTime() uses correct exception message, suggested by Takayoshi Kimura. (pero) /fix + add +bug39661/bug: Add documentation on JULI FileHandler properties. (yoavs) + /add /changelog /subsection subsection name=Webapps Modified: tomcat/container/tc5.5.x/webapps/docs/logging.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/logging.xml?rev=409450r1=409449r2=409450view=diff == --- tomcat/container/tc5.5.x/webapps/docs/logging.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/logging.xml Thu May 25 13:02:32 2006 @@ -130,7 +130,7 @@ p In order to configure JDK logging you should have JDK 1.4+. Tomcat 5.5 is intended for -JDK 5.0, but can be run on JDK 1.4 using a compatibility package. +JDK 5.0 or later, but can be run on JDK 1.4 using a compatibility package. /p p The default implemenatation of java.util.logging provided in the JDK is too limited to be @@ -266,6 +266,70 @@ /source /p + /section + + section name=Handler Properties +p + Tomcat's JULI implementation is not intended to be a fully-featured logging libary, only + a simple bridge to those libraries. However, JULI does provide several properties + for configuring the its handlers. These are listed below. +/p + +subsection name=FileHandler + attributes +attribute name=directory required=false + p +The directory where the log file will be written. The Tomcat server account +should have write permissions to this directory. The default value of this +property is emlogs/em. + /p +/attribute + +attribute name=prefix required=false + p +The log file name prefix. This is the portion of the log file name before the date. +The default value of this property is emjuli./em. + /p +/attribute + +attribute name=suffix required=false + p +The log file name suffix. This is the portion of the log file name after the date. +The default value of this property is em.log/em. + /p +/attribute + +attribute name=level required=false + p +The threshold level for this handler. It must be one of the levels in the +a href=http://java.sun.com/j2se/1.4.2/docs/api/java/util/logging/Level.html;java.util.logging.Level/a class. +The default value of this property is emALL/em. Messages whose level is below +the specified level will not be written to the file. + /p +/attribute + +attribute name=filter required=false + p +The fully-qualified class name of a class that implements the +a href=http://java.sun.com/j2se/1.4.2/docs/api/java/util/logging/Filter.html;java.util.logging.Filter/a +interface. JULI will load this class and associate it with this handler to filter its messages. +By default, there is no Filter associated with the handler. + /p +/attribute + +attribute name=formatter required=false + p +The fully-qualified class name of a class that implements the +a href=http://java.suncom/j2se/1.4.2/docs/api/java/util/logging/Formatter.html;java.util.logging.Formatter/a +interface. JULI will load this class and associate it with this handler to format its messages. +By default, there is no Formatter associated with the handler. + /p +/attribute + + /attributes + +/subsection + /section /body - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r397551 - in /tomcat/site/trunk: docs/doap_Tomcat.rdf docs/download-55.html docs/index.html xdocs-faq/tomcat-faq.xsl xdocs/download-55.xml xdocs/index.xml
Author: yoavs Date: Thu Apr 27 07:17:56 2006 New Revision: 397551 URL: http://svn.apache.org/viewcvs?rev=397551view=rev Log: Updated following 5.5.17 stability vote (see archive at http://marc.theaimsgroup.com/?t=11459026422r=1w=2) Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf tomcat/site/trunk/docs/download-55.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/xdocs-faq/tomcat-faq.xsl tomcat/site/trunk/xdocs/download-55.xml tomcat/site/trunk/xdocs/index.xml Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=397551r1=397550r2=397551view=diff == --- tomcat/site/trunk/docs/doap_Tomcat.rdf (original) +++ tomcat/site/trunk/docs/doap_Tomcat.rdf Thu Apr 27 07:17:56 2006 @@ -31,6 +31,11 @@ release Version nameLatest Stable Release/name +created2006-04-14/created +revision5.5.17/revision + /Version + Version +name5.5.16/name created2006-03-05/created revision5.5.16/revision /Version Modified: tomcat/site/trunk/docs/download-55.html URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/download-55.html?rev=397551r1=397550r2=397551view=diff == --- tomcat/site/trunk/docs/download-55.html (original) +++ tomcat/site/trunk/docs/download-55.html Thu Apr 27 07:17:56 2006 @@ -199,8 +199,7 @@ p blockquote a href=http://www.apache.org/dist/tomcat/tomcat-5/KEYS;KEYS/a | -a href=#5.5.17-beta5.5.17-beta/a | -a href=#5.5.165.5.16/a | +a href=#5.5.175.5.17/a | a href=#5.0.30-beta5.0.30-beta/a | a href=#5.0.285.0.28/a | a href=http://cvs.apache.org/builds/jakarta-tomcat-5/nightly/;Nightly/a | @@ -300,8 +299,8 @@ tr td bgcolor=#525D76 font face=arial,helvetica,sanserif color=#ff -a name=5.5.17-beta -strong5.5.17-beta/strong +a name=5.5.17 +strong5.5.17/strong /a /font /td @@ -311,8 +310,8 @@ p blockquote p - a name=5.5.17-betaPlease/a see the - a href=[preferred]/tomcat/tomcat-5/v5.5.17-beta/README.htmlREADME/a + a name=5.5.17Please/a see the + a href=[preferred]/tomcat/tomcat-5/v5.5.17/README.htmlREADME/a file for packaging information. It explains what every distribution contains. /p @@ -333,19 +332,19 @@ liCore: ul li - a href=[preferred]/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17.zipzip/a - (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17.zip.asc;pgp/a, - a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17.zip.MD5;md5/a) + a href=[preferred]/tomcat/tomcat-5/v5.5.17/bin/apache-tomcat-5.5.17.zipzip/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17/bin/apache-tomcat-5.5.17.zip.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17/bin/apache-tomcat-5.5.17.zip.MD5;md5/a) /li li - a href=[preferred]/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17.tar.gztar.gz/a - (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17.tar.gz.asc;pgp/a, - a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17.tar.gz.MD5;md5/a) + a href=[preferred]/tomcat/tomcat-5/v5.5.17/bin/apache-tomcat-5.5.17.tar.gztar.gz/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17/bin/apache-tomcat-5.5.17.tar.gz.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17/bin/apache-tomcat-5.5.17.tar.gz.MD5;md5/a) /li li - a href=[preferred]/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17.exeWindows Executable/a - (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17.exe.asc;pgp/a, - a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17.exe.MD5;md5/a) + a href=[preferred]/tomcat/tomcat-5/v5.5.17/bin/apache-tomcat-5.5.17.exeWindows Executable/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17/bin/apache-tomcat-5.5.17.exe.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17/bin/apache-tomcat-5.5.17.exe.MD5;md5/a) /li /ul /li @@ -353,28 +352,28 @@ liDeployer: ul li - a href=[preferred]/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17-deployer.zipzip/a - (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17-deployer.zip.asc;pgp/a, - a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17
svn commit: r394689 - /tomcat/build/tc5.5.x/build.xml
Author: yoavs
Date: Mon Apr 17 08:00:51 2006
New Revision: 394689
URL: http://svn.apache.org/viewcvs?rev=394689view=rev
Log:
Change MD5 extensions to lowercase.
Modified:
tomcat/build/tc5.5.x/build.xml
Modified: tomcat/build/tc5.5.x/build.xml
URL:
http://svn.apache.org/viewcvs/tomcat/build/tc5.5.x/build.xml?rev=394689r1=394688r2=394689view=diff
==
--- tomcat/build/tc5.5.x/build.xml (original)
+++ tomcat/build/tc5.5.x/build.xml Mon Apr 17 08:00:51 2006
@@ -1472,8 +1472,9 @@
move file=${tomcat.dist}/tomcat-installer.exe
tofile=${tomcat.release}/v${version}/bin/${final.name}.exe /
-checksum file=${tomcat.release}/v${version}/bin/${final.name}.exe /
-echo file=${tomcat.release}/v${version}/bin/${final.name}.exe.MD5
+checksum file=${tomcat.release}/v${version}/bin/${final.name}.exe
+ forceOverwrite=yes fileext=.md5 /
+echo file=${tomcat.release}/v${version}/bin/${final.name}.exe.md5
message=${md5sum.binary-prefix}${final.name}.exe${line.separator}
append=true /
/target
@@ -1521,8 +1522,9 @@
/zipfileset
/zip
-checksum file=${tomcat.release}/v${version}/bin/${final.name}.zip/
-echo file=${tomcat.release}/v${version}/bin/${final.name}.zip.MD5
+checksum file=${tomcat.release}/v${version}/bin/${final.name}.zip
+ forceOverwrite=yes fileext=.md5 /
+echo file=${tomcat.release}/v${version}/bin/${final.name}.zip.md5
message=${md5sum.binary-prefix}${final.name}.zip${line.separator}
append=true /
/target
@@ -1541,8 +1543,9 @@
includes=RELEASE-NOTES /
/zip
-checksum
file=${tomcat.release}/v${version}/bin/${final.name}-embed.zip/
-echo
file=${tomcat.release}/v${version}/bin/${final.name}-embed.zip.MD5
+checksum file=${tomcat.release}/v${version}/bin/${final.name}-embed.zip
+ forceOverwrite=yes fileext=.md5 /
+echo
file=${tomcat.release}/v${version}/bin/${final.name}-embed.zip.md5
message=${md5sum.binary-prefix}${final.name}-embed.zip${line.separator}
append=true /
/target
@@ -1556,8 +1559,9 @@
zipfileset dir=${tomcat.dist} prefix=${final.name}-deployer
includes=RELEASE-NOTES /
/zip
-checksum
file=${tomcat.release}/v${version}/bin/${final.name}-deployer.zip/
-echo
file=${tomcat.release}/v${version}/bin/${final.name}-deployer.zip.MD5
+checksum
file=${tomcat.release}/v${version}/bin/${final.name}-deployer.zip
+ forceOverwrite=yes fileext=.md5 /
+echo
file=${tomcat.release}/v${version}/bin/${final.name}-deployer.zip.md5
message=${md5sum.binary-prefix}${final.name}-deployer.zip${line.separator}
append=true /
/target
@@ -1571,8 +1575,9 @@
zipfileset dir=${tomcat.dist} prefix=${final.name}
includes=RELEASE-NOTES /
/zip
-checksum
file=${tomcat.release}/v${version}/bin/${final.name}-compat.zip/
-echo
file=${tomcat.release}/v${version}/bin/${final.name}-compat.zip.MD5
+checksum file=${tomcat.release}/v${version}/bin/${final.name}-compat.zip
+ forceOverwrite=yes fileext=.md5 /
+echo
file=${tomcat.release}/v${version}/bin/${final.name}-compat.zip.md5
message=${md5sum.binary-prefix}${final.name}-compat.zip${line.separator}
append=true /
/target
@@ -1590,8 +1595,9 @@
zipfileset dir=${tomcat.dist} prefix=${final.name}
includes=RELEASE-NOTES /
/zip
-checksum
file=${tomcat.release}/v${version}/bin/${final.name}-admin.zip/
-echo
file=${tomcat.release}/v${version}/bin/${final.name}-admin.zip.MD5
+checksum file=${tomcat.release}/v${version}/bin/${final.name}-admin.zip
+ forceOverwrite=yes fileext=.md5 /
+echo
file=${tomcat.release}/v${version}/bin/${final.name}-admin.zip.md5
message=${md5sum.binary-prefix}${final.name}-admin.zip${line.separator}
append=true /
/target
@@ -1671,8 +1677,9 @@
/tarfileset
/tar
-checksum file=${tomcat.release}/v${version}/bin/${final.name}.tar.gz/
-echo file=${tomcat.release}/v${version}/bin/${final.name}.tar.gz.MD5
+checksum file=${tomcat.release}/v${version}/bin/${final.name}.tar.gz
+ forceOverwrite=yes fileext=.md5 /
+echo file=${tomcat.release}/v${version}/bin/${final.name}.tar.gz.md5
message=${md5sum.binary-prefix}${final.name}.tar.gz${line.separator}
append=true /
/target
@@ -1694,8 +1701,9 @@
/tarfileset
/tar
-checksum
file=${tomcat.release}/v${version}/bin/${final.name}-embed.tar.gz/
-echo
file=${tomcat.release}/v${version}/bin/${final.name}-embed.tar.gz.MD5
+checksum
file=${tomcat.release}/v${version}/bin/${final.name}-embed.tar.gz
+ forceOverwrite=yes fileext=.md5 /
+echo
file=${tomcat.release
svn commit: r394690 - /tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Author: yoavs Date: Mon Apr 17 08:01:08 2006 New Revision: 394690 URL: http://svn.apache.org/viewcvs?rev=394690view=rev Log: Note md5 extension change, start 5.5.18 changelog. Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=394690r1=394689r2=394690view=diff == --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Mon Apr 17 08:01:08 2006 @@ -14,6 +14,18 @@ body +section name=Tomcat 5.5.18 (yoavs) + subsection name=General +changelog + update +Change MD5 release signature files to have md5 (lowercase) extension instead of MD5 (uppercase), +as suggested by Henk Penning and specified in the +a href=http://www.apache.org/dev/release-publishing.html;ASF release publishing guidelines/a. (yoavs) + /update +/changelog + /subsection +/section + section name=Tomcat 5.5.17 (yoavs) subsection name=General changelog - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r394691 - in /tomcat/site/trunk: docs/download-55.html xdocs/download-55.xml
Author: yoavs Date: Mon Apr 17 08:05:23 2006 New Revision: 394691 URL: http://svn.apache.org/viewcvs?rev=394691view=rev Log: 5.5.17 beta download section, which I apparently forgot to commit on Saturday. Modified: tomcat/site/trunk/docs/download-55.html tomcat/site/trunk/xdocs/download-55.xml Modified: tomcat/site/trunk/docs/download-55.html URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/download-55.html?rev=394691r1=394690r2=394691view=diff == --- tomcat/site/trunk/docs/download-55.html (original) +++ tomcat/site/trunk/docs/download-55.html Mon Apr 17 08:05:23 2006 @@ -199,6 +199,7 @@ p blockquote a href=http://www.apache.org/dist/tomcat/tomcat-5/KEYS;KEYS/a | +a href=#5.5.17-beta5.5.17-beta/a | a href=#5.5.165.5.16/a | a href=#5.0.30-beta5.0.30-beta/a | a href=#5.0.285.0.28/a | @@ -286,6 +287,187 @@ /blockquote +/p +/td +/tr +tr +td +br / +/td +/tr +/table +table width=100% cellpadding=2 cellspacing=0 border=0 +tr +td bgcolor=#525D76 +font face=arial,helvetica,sanserif color=#ff +a name=5.5.17-beta +strong5.5.17-beta/strong +/a +/font +/td +/tr +tr +td +p +blockquote + p + a name=5.5.17-betaPlease/a see the + a href=[preferred]/tomcat/tomcat-5/v5.5.17-beta/README.htmlREADME/a + file for packaging information. It explains what every distribution contains. + /p + + table width=100% cellpadding=2 cellspacing=0 border=0 +tr +td bgcolor=#828DA6 +font face=arial,helvetica,sanserif color=#ff +a name=Binary Distributions +strongBinary Distributions/strong +/a +/font +/td +/tr +tr +td +blockquote + ul +liCore: + ul + li + a href=[preferred]/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17.zipzip/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17.zip.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17.zip.MD5;md5/a) + /li + li + a href=[preferred]/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17.tar.gztar.gz/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17.tar.gz.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17.tar.gz.MD5;md5/a) + /li + li + a href=[preferred]/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17.exeWindows Executable/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17.exe.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17.exe.MD5;md5/a) + /li + /ul +/li + +liDeployer: + ul + li + a href=[preferred]/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17-deployer.zipzip/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17-deployer.zip.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17-deployer.zip.MD5;md5/a) + /li + li + a href=[preferred]/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17-deployer.tar.gztar.gz/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17-deployer.tar.gz.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17-deployer.tar.gz.MD5;md5/a) + /li + /ul +/li +liEmbedded: + ul + li + a href=[preferred]/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17-embed.zipzip/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17-embed.zip.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17-embed.zip.MD5;md5/a) + /li + li + a href=[preferred]/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17-embed.tar.gztar.gz/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17-embed.tar.gz.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17-embed.tar.gz.MD5;md5/a) + /li + /ul +/li + +liAdministration Web Application: + ul + li +a href=[preferred]/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17-admin.zipzip/a +(a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17-admin.zip.asc;pgp/a, +a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.17-beta/bin/apache-tomcat-5.5.17-admin.zip.MD5;md5
svn commit: r394120 - in /tomcat/container/tc5.5.x: catalina/src/bin/catalina.sh webapps/docs/changelog.xml
Author: yoavs Date: Fri Apr 14 08:25:07 2006 New Revision: 394120 URL: http://svn.apache.org/viewcvs?rev=394120view=rev Log: Bugzilla 37848: http://issues.apache.org/bugzilla/show_bug.cgi?id=37848 Modified: tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh tomcat/container/tc5.5.x/webapps/docs/changelog.xml Modified: tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh?rev=394120r1=394119r2=394120view=diff == --- tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh (original) +++ tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh Fri Apr 14 08:25:07 2006 @@ -131,6 +131,12 @@ CATALINA_TMPDIR=$CATALINA_BASE/temp fi +# Bugzilla 37848: When no TTY is available, don't output to console +have_tty=0 +if [ `tty` != not a tty ]; then +have_tty=1 +fi + # For Cygwin, switch paths to Windows format before running java if $cygwin; then JAVA_HOME=`cygpath --absolute --windows $JAVA_HOME` @@ -150,13 +156,16 @@ # - Execute The Requested Command - -echo Using CATALINA_BASE: $CATALINA_BASE -echo Using CATALINA_HOME: $CATALINA_HOME -echo Using CATALINA_TMPDIR: $CATALINA_TMPDIR -if [ $1 = debug -o $1 = javac ] ; then - echo Using JAVA_HOME: $JAVA_HOME -else - echo Using JRE_HOME: $JRE_HOME +# Bugzilla 37848: only output this if we have a TTY +if [ $have_tty -eq 1 ]; then + echo Using CATALINA_BASE: $CATALINA_BASE + echo Using CATALINA_HOME: $CATALINA_HOME + echo Using CATALINA_TMPDIR: $CATALINA_TMPDIR + if [ $1 = debug -o $1 = javac ] ; then +echo Using JAVA_HOME: $JAVA_HOME + else +echo Using JRE_HOME: $JRE_HOME + fi fi if [ $1 = jpda ] ; then Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=394120r1=394119r2=394120view=diff == --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Fri Apr 14 08:25:07 2006 @@ -84,6 +84,10 @@ fix Fix handling of non matching if-range header (remm) /fix + fix +bug37848/bug: Only output catalina.sh diagnostic messages if we have a TTY, submitted by + David Shaw. (yoavs) + /fix /changelog /subsection subsection name=Coyote - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r394121 - in /tomcat/container/tc5.5.x: catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java webapps/docs/changelog.xml
Author: yoavs
Date: Fri Apr 14 08:35:10 2006
New Revision: 394121
URL: http://svn.apache.org/viewcvs?rev=394121view=rev
Log:
Bugzilla 38596: http://issues.apache.org/bugzilla/show_bug.cgi?id=38596
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java?rev=394121r1=394120r2=394121view=diff
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java
Fri Apr 14 08:35:10 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2004-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -57,13 +57,13 @@
/**
* The generated string for the roles PreparedStatement
*/
-private StringBuffer preparedRoles = null;
+private String preparedRoles = null;
/**
* The generated string for the credentials PreparedStatement
*/
-private StringBuffer preparedCredentials = null;
+private String preparedCredentials = null;
/**
@@ -581,7 +581,7 @@
throws SQLException {
PreparedStatement credentials =
-dbConnection.prepareStatement(preparedCredentials.toString());
+dbConnection.prepareStatement(preparedCredentials);
credentials.setString(1, username);
return (credentials);
@@ -601,7 +601,7 @@
throws SQLException {
PreparedStatement roles =
-dbConnection.prepareStatement(preparedRoles.toString());
+dbConnection.prepareStatement(preparedRoles);
roles.setString(1, username);
return (roles);
@@ -624,23 +624,24 @@
super.start();
// Create the roles PreparedStatement string
-preparedRoles = new StringBuffer(SELECT );
-preparedRoles.append(roleNameCol);
-preparedRoles.append( FROM );
-preparedRoles.append(userRoleTable);
-preparedRoles.append( WHERE );
-preparedRoles.append(userNameCol);
-preparedRoles.append( = ?);
+StringBuffer temp = new StringBuffer(SELECT );
+temp.append(roleNameCol);
+temp.append( FROM );
+temp.append(userRoleTable);
+temp.append( WHERE );
+temp.append(userNameCol);
+temp.append( = ?);
+preparedRoles = temp.toString();
// Create the credentials PreparedStatement string
-preparedCredentials = new StringBuffer(SELECT );
-preparedCredentials.append(userCredCol);
-preparedCredentials.append( FROM );
-preparedCredentials.append(userTable);
-preparedCredentials.append( WHERE );
-preparedCredentials.append(userNameCol);
-preparedCredentials.append( = ?);
-
+temp = new StringBuffer(SELECT );
+temp.append(userCredCol);
+temp.append( FROM );
+temp.append(userTable);
+temp.append( WHERE );
+temp.append(userNameCol);
+temp.append( = ?);
+preparedCredentials = temp.toString();
}
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=394121r1=394120r2=394121view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Fri Apr 14 08:35:10 2006
@@ -88,6 +88,10 @@
bug37848/bug: Only output catalina.sh diagnostic messages if we
have a TTY, submitted by
David Shaw. (yoavs)
/fix
+ fix
+bug38596/bug: Minor performance optimization in DataSourceRealm,
suggested by Sandy
+ McArthur. (yoavs)
+ /fix
/changelog
/subsection
subsection name=Coyote
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r394158 - /tomcat/build/tags/tc5.5.x/TOMCAT_5_5_17/
Author: yoavs Date: Fri Apr 14 11:06:46 2006 New Revision: 394158 URL: http://svn.apache.org/viewcvs?rev=394158view=rev Log: Tagging Tomcat version TOMCAT_5_5_17. Added: tomcat/build/tags/tc5.5.x/TOMCAT_5_5_17/ - copied from r394157, tomcat/build/tc5.5.x/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r394161 - /tomcat/jasper/tags/tc5.5.x/TOMCAT_5_5_17/
Author: yoavs Date: Fri Apr 14 11:06:59 2006 New Revision: 394161 URL: http://svn.apache.org/viewcvs?rev=394161view=rev Log: Tagging Tomcat version TOMCAT_5_5_17. Added: tomcat/jasper/tags/tc5.5.x/TOMCAT_5_5_17/ - copied from r394160, tomcat/jasper/tc5.5.x/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r394162 - /tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/TOMCAT_5_5_17/
Author: yoavs Date: Fri Apr 14 11:07:05 2006 New Revision: 394162 URL: http://svn.apache.org/viewcvs?rev=394162view=rev Log: Tagging Tomcat version TOMCAT_5_5_17. Added: tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/TOMCAT_5_5_17/ - copied from r394161, tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r394163 - /tomcat/site/tags/TOMCAT_5_5_17/
Author: yoavs Date: Fri Apr 14 11:07:08 2006 New Revision: 394163 URL: http://svn.apache.org/viewcvs?rev=394163view=rev Log: Tagging Tomcat version TOMCAT_5_5_17. Added: tomcat/site/tags/TOMCAT_5_5_17/ - copied from r394162, tomcat/site/trunk/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r393867 - in /tomcat/container/tc5.5.x: catalina/src/bin/catalina.sh webapps/docs/changelog.xml
Author: yoavs Date: Thu Apr 13 10:50:27 2006 New Revision: 393867 URL: http://svn.apache.org/viewcvs?rev=393867view=rev Log: Bugzilla 38194: http://issues.apache.org/bugzilla/show_bug.cgi?id=38194 Modified: tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh tomcat/container/tc5.5.x/webapps/docs/changelog.xml Modified: tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh?rev=393867r1=393866r2=393867view=diff == --- tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh (original) +++ tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh Thu Apr 13 10:50:27 2006 @@ -279,6 +279,8 @@ if [ ! -z $CATALINA_PID ]; then echo Killing: `cat $CATALINA_PID` kill -9 `cat $CATALINA_PID` +else + echo Kill failed: \$CATALINA_PID not set fi fi Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=393867r1=393866r2=393867view=diff == --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Apr 13 10:50:27 2006 @@ -62,6 +62,9 @@ fix Correctly reset listeners when reloading a webapp (remm) /fix + fix +bug38194/bug: Don't fail silently if -force is used without CATALINA_PID, submitted by Matthew Buckett. (yoavs) + /fix /changelog /subsection subsection name=Coyote - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r393882 - in /tomcat/container/tc5.5.x: catalina/src/share/org/apache/naming/resources/FileDirContext.java webapps/docs/changelog.xml
Author: yoavs
Date: Thu Apr 13 11:46:19 2006
New Revision: 393882
URL: http://svn.apache.org/viewcvs?rev=393882view=rev
Log:
Bugzilla 38154: http://issues.apache.org/bugzilla/show_bug.cgi?id=38154
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/resources/FileDirContext.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/resources/FileDirContext.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/resources/FileDirContext.java?rev=393882r1=393881r2=393882view=diff
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/resources/FileDirContext.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/resources/FileDirContext.java
Thu Apr 13 11:46:19 2006
@@ -838,6 +838,11 @@
if (canPath == null)
return null;
+// Bugzilla 38154: after release() the absoluteBase is null,
leading to an NPE
+if (absoluteBase == null) {
+return null;
+}
+
// Check to see if going outside of the web application root
if (!canPath.startsWith(absoluteBase)) {
return null;
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=393882r1=393881r2=393882view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Apr 13 11:46:19 2006
@@ -65,6 +65,9 @@
fix
bug38194/bug: Don't fail silently if -force is used without
CATALINA_PID, submitted by Matthew Buckett. (yoavs)
/fix
+ fix
+bug38154/bug: Avoid NPE in FileDirContext after webapp undeploy,
reported by Jamie Maher. (yoavs)
+ /fix
/changelog
/subsection
subsection name=Coyote
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r393890 - in /tomcat/container/tc5.5.x/webapps/docs: changelog.xml ssl-howto.xml
Author: yoavs Date: Thu Apr 13 12:00:20 2006 New Revision: 393890 URL: http://svn.apache.org/viewcvs?rev=393890view=rev Log: Bugzilla 38217: http://issues.apache.org/bugzilla/show_bug.cgi?id=38217 Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml tomcat/container/tc5.5.x/webapps/docs/ssl-howto.xml Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=393890r1=393889r2=393890view=diff == --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Apr 13 12:00:20 2006 @@ -68,6 +68,9 @@ fix bug38154/bug: Avoid NPE in FileDirContext after webapp undeploy, reported by Jamie Maher. (yoavs) /fix + fix +bug38217/bug: Added cautionary note about keystore password to SSL HowTo, as suggested by Ralf Hauser. (yoavs) + /fix /changelog /subsection subsection name=Coyote Modified: tomcat/container/tc5.5.x/webapps/docs/ssl-howto.xml URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/ssl-howto.xml?rev=393890r1=393889r2=393890view=diff == --- tomcat/container/tc5.5.x/webapps/docs/ssl-howto.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/ssl-howto.xml Thu Apr 13 12:00:20 2006 @@ -277,6 +277,12 @@ pIf everything was successful, you now have a keystore file with a Certificate that can be used by your server./p +pstrongNote:/strong your private key password and keystore password +should be the same. If they differ, you will get an error along the lines +of codejava.io.IOException: Cannot recover key/code, as documented in +a href=http://issues.apache.org/bugzilla/show_bug.cgi?id=38217;Bugzilla issue 38217/a, +which contains further references for this issue./p + /subsection subsection name=Edit the Tomcat Configuration File - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r393892 - /tomcat/build/tc5.5.x/BUILDING.txt
Author: yoavs Date: Thu Apr 13 12:04:38 2006 New Revision: 393892 URL: http://svn.apache.org/viewcvs?rev=393892view=rev Log: Reflect the fact we're no longer on CVS. Modified: tomcat/build/tc5.5.x/BUILDING.txt Modified: tomcat/build/tc5.5.x/BUILDING.txt URL: http://svn.apache.org/viewcvs/tomcat/build/tc5.5.x/BUILDING.txt?rev=393892r1=393891r2=393892view=diff == --- tomcat/build/tc5.5.x/BUILDING.txt (original) +++ tomcat/build/tc5.5.x/BUILDING.txt Thu Apr 13 12:04:38 2006 @@ -68,7 +68,8 @@ * NOTE: Users accessing the Internet through a proxy must use a properties file to indicate to Ant the proxy configuration. Read below. -* WARNING: Running this command will checkout the Tomcat 5 sources from CVS, as +* WARNING: Running this command will checkout the Tomcat 5 sources from the Apache + source code repository, as well as download binaries to the /usr/share/java directory. Make sure this is appropriate to do on your computer. On Windows, this usually corresponds to the C:\usr\share\java directory, unless Cygwin is used. Read below to - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r393895 - /tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Author: yoavs
Date: Thu Apr 13 12:13:42 2006
New Revision: 393895
URL: http://svn.apache.org/viewcvs?rev=393895view=rev
Log:
Bugzilla 38015: http://issues.apache.org/bugzilla/show_bug.cgi?id=38015
Modified:
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Modified:
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
URL:
http://svn.apache.org/viewcvs/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java?rev=393895r1=393894r2=393895view=diff
==
---
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
(original)
+++
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Thu Apr 13 12:13:42 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2004-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -477,6 +477,10 @@
// Ignore example element: Bugzilla 33538
} else if (tag-extension.equals(tname)) {
// Ignore tag-extension element: Bugzilla 33538
+} else if (icon.equals(tname) ||
+display-name.equals(tname) ||
+ description.equals(tname)) {
+// Ignore these elements: Bugzilla 38015
} else {
if (log.isWarnEnabled()) {
log.warn(Localizer.getMessage(
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r393898 - in /tomcat/container/tc5.5.x/webapps/docs: changelog.xml config/host.xml
Author: yoavs Date: Thu Apr 13 12:25:01 2006 New Revision: 393898 URL: http://svn.apache.org/viewcvs?rev=393898view=rev Log: Bugzilla 38262: http://issues.apache.org/bugzilla/show_bug.cgi?id=38262 Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml tomcat/container/tc5.5.x/webapps/docs/config/host.xml Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=393898r1=393897r2=393898view=diff == --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Apr 13 12:25:01 2006 @@ -71,6 +71,9 @@ fix bug38217/bug: Added cautionary note about keystore password to SSL HowTo, as suggested by Ralf Hauser. (yoavs) /fix + fix +bug38262/bug: Cleared ambiguity in host documentation, as suggested by Jeffrey Bennett. (yoavs) + /fix /changelog /subsection subsection name=Coyote @@ -105,6 +108,13 @@ fix tcnative jnilib.c now report correct compile flags for runtime Library.java checks like sendfile support default true/false (pero) + /fix +/changelog + /subsection + subsection name=Jasper +changelog + fix +bug38015/bug: Remove misleading warnings logged in TagLibraryInfoImpl, as suggested by Andrew Houghton. (yoavs) /fix /changelog /subsection Modified: tomcat/container/tc5.5.x/webapps/docs/config/host.xml URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/config/host.xml?rev=393898r1=393897r2=393898view=diff == --- tomcat/container/tc5.5.x/webapps/docs/config/host.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/config/host.xml Thu Apr 13 12:25:01 2006 @@ -280,7 +280,8 @@ is set to codefalse/code. If you redeploy an updated WAR file, be sure to delete the expanded directory when restarting Tomcat, so that the updated WAR file will be re-expanded (note that the auto -deployer will automatically take care of this if it is enabled)./li +deployer, if enabled, will automatically expand the updated WAR file +once the previously expanded directory is removed)./li liAny subdirectory within the emapplication base directory/em that appears to be an unpacked web application (that is, it contains a code/WEB-INF/web.xml/code file) will receive an automatically - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r393925 - in /tomcat/container/tc5.5.x: catalina/src/share/org/apache/catalina/startup/TldConfig.java webapps/docs/changelog.xml
Author: yoavs
Date: Thu Apr 13 13:42:53 2006
New Revision: 393925
URL: http://svn.apache.org/viewcvs?rev=393925view=rev
Log:
Bugzilla 38476: http://issues.apache.org/bugzilla/show_bug.cgi?id=38476
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/TldConfig.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/TldConfig.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/TldConfig.java?rev=393925r1=393924r2=393925view=diff
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/TldConfig.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/TldConfig.java
Thu Apr 13 13:42:53 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2001,2004 The Apache Software Foundation.
+ * Copyright 1999-2001,2004-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
+import java.io.InputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
@@ -534,9 +535,16 @@
InputSource inputSource = null;
try {
-inputSource =
-new InputSource(
-
context.getServletContext().getResourceAsStream(resourcePath));
+// Bugzilla 38476
+InputStream stream =
+context.getServletContext().getResourceAsStream(resourcePath);
+if (stream == null) {
+throw new IllegalArgumentException
+(sm.getString(contextConfig.tldResourcePath,
+ resourcePath));
+}
+
+inputSource = new InputSource(stream);
if (inputSource == null) {
throw new IllegalArgumentException
(sm.getString(contextConfig.tldResourcePath,
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=393925r1=393924r2=393925view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Apr 13 13:42:53 2006
@@ -74,6 +74,9 @@
fix
bug38262/bug: Cleared ambiguity in host documentation, as
suggested by Jeffrey Bennett. (yoavs)
/fix
+ fix
+bug38476/bug: Modified check for null TLD stream, as suggested by
Fabrizio Giustina. (yoavs)
+ /fix
/changelog
/subsection
subsection name=Coyote
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r393936 - /tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java
Author: yoavs
Date: Thu Apr 13 13:56:51 2006
New Revision: 393936
URL: http://svn.apache.org/viewcvs?rev=393936view=rev
Log:
Bugzilla 38376: http://issues.apache.org/bugzilla/show_bug.cgi?id=38376
Modified:
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java
Modified:
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewcvs/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java?rev=393936r1=393935r2=393936view=diff
==
--- tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java
(original)
+++ tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java
Thu Apr 13 13:56:51 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2004-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -2278,7 +2278,7 @@
out.printin(if ();
out.print(tagEvalVar);
out.println(
- != javax.servlet.jsp.tagext.Tag.EVAL_BODY_INCLUDE));
+ != javax.servlet.jsp.tagext.Tag.EVAL_BODY_INCLUDE)
{);
out.pushIndent();
out.printil(out = _jspx_page_context.popBody(););
if (n.implementsTryCatchFinally()) {
@@ -2289,6 +2289,7 @@
out.println([0]--;);
}
out.popIndent();
+out.printil(});
}
out.popIndent(); // EVAL_BODY
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r393951 - /tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Author: yoavs Date: Thu Apr 13 14:43:50 2006 New Revision: 393951 URL: http://svn.apache.org/viewcvs?rev=393951view=rev Log: Another update. Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=393951r1=393950r2=393951view=diff == --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Apr 13 14:43:50 2006 @@ -119,6 +119,9 @@ fix bug38015/bug: Remove misleading warnings logged in TagLibraryInfoImpl, as suggested by Andrew Houghton. (yoavs) /fix + fix +bug38376/bug: Make sure body content stack is always properly aligned, as submitted by Tony Deigh. (yoavs) + /fix /changelog /subsection subsection name=Webapps - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r388813 - /tomcat/site/trunk/docs/doap_Tomcat.rdf
Author: yoavs Date: Sat Mar 25 12:14:46 2006 New Revision: 388813 URL: http://svn.apache.org/viewcvs?rev=388813view=rev Log: Correct RDF. Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=388813r1=388812r2=388813view=diff == --- tomcat/site/trunk/docs/doap_Tomcat.rdf (original) +++ tomcat/site/trunk/docs/doap_Tomcat.rdf Sat Mar 25 12:14:46 2006 @@ -46,18 +46,22 @@ browse rdf:resource=http://svn.apache.org/repos/asf/tomcat// /SVNRepository /repository -asfext:standard - asfext:titleJava Servlets/asfext:title - asfext:bodyJCP/asfext:body - asfext:idJSR 154/asfext:id - asfext:url rdf:resource=http://www.jcp.org/en/jsr/detail?id=154/ -/asfext:standard -asfext:standard - asfext:titleJava Server Pages/asfext:title - asfext:bodyJCP/asfext:body - asfext:idJSR 152/asfext:id - asfext:url rdf:resource=http://www.jcp.org/en/jsr/detail?id=152/ -/asfext:standard +asfext:implements + asfext:Standard +asfext:titleJava Servlets/asfext:title +asfext:bodyJCP/asfext:body +asfext:idJSR 154/asfext:id +asfext:url rdf:resource=http://www.jcp.org/en/jsr/detail?id=154/ + /asfext:Standard +/asfext:implements +asfext:implements + asfext:Standard +asfext:titleJava Server Pages/asfext:title +asfext:bodyJCP/asfext:body +asfext:idJSR 152/asfext:id +asfext:url rdf:resource=http://www.jcp.org/en/jsr/detail?id=152/ + /asfext:Standard +/asfext:implements /Project /rdf:RDF - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r386742 - /tomcat/site/trunk/docs/doap_Tomcat.rdf
Author: yoavs Date: Fri Mar 17 14:30:47 2006 New Revision: 386742 URL: http://svn.apache.org/viewcvs?rev=386742view=rev Log: Updated DOAP. Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=386742r1=386741r2=386742view=diff == --- tomcat/site/trunk/docs/doap_Tomcat.rdf (original) +++ tomcat/site/trunk/docs/doap_Tomcat.rdf Fri Mar 17 14:30:47 2006 @@ -20,8 +20,13 @@ mailing-list rdf:resource=http://tomcat.apache.org/lists.html; / download-page rdf:resource=http://tomcat.apache.org; / programming-languagejava/programming-language -category rdf:resource=http://projects.apache.org/category/servletcontainerJavaServerPagesJSP; / +category rdf:resource=http://projects.apache.org/category/servletContainer; / release + Version +name5.5.16/name +created2006-03-05/created +revision5.5.16/revision + /Version Version name5.5.15/name created2006-01-23/created - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r386744 - /tomcat/site/trunk/docs/doap_Tomcat.rdf
Author: yoavs Date: Fri Mar 17 14:36:31 2006 New Revision: 386744 URL: http://svn.apache.org/viewcvs?rev=386744view=rev Log: Further DOAP stuff. Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=386744r1=386743r2=386744view=diff == --- tomcat/site/trunk/docs/doap_Tomcat.rdf (original) +++ tomcat/site/trunk/docs/doap_Tomcat.rdf Fri Mar 17 14:36:31 2006 @@ -19,11 +19,11 @@ bug-database rdf:resource=http://issues.apache.org/bugzilla; / mailing-list rdf:resource=http://tomcat.apache.org/lists.html; / download-page rdf:resource=http://tomcat.apache.org; / -programming-languagejava/programming-language -category rdf:resource=http://projects.apache.org/category/servletContainer; / +programming-languageJava/programming-language +category rdf:resource=http://projects.apache.org/category/network-server; / release Version -name5.5.16/name +nameLatest Stable Release/name created2006-03-05/created revision5.5.16/revision /Version @@ -39,6 +39,18 @@ browse rdf:resource=http://svn.apache.org/repos/asf/tomcat// /SVNRepository /repository +asfext:standard + asfext:titleJava Servlets/asfext:title + asfext:bodyJCP/asfext:body + asfext:idJSR 154/asfext:id + asfext:url rdf:resource=http://www.jcp.org/en/jsr/detail?id=154/ +/asfext:standard +asfext:standard + asfext:titleJava Server Pages/asfext:title + asfext:bodyJCP/asfext:body + asfext:idJSR 152/asfext:id + asfext:url rdf:resource=http://www.jcp.org/en/jsr/detail?id=152/ +/asfext:standard /Project /rdf:RDF - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r386748 - /tomcat/site/trunk/docs/doap_Tomcat.rdf
Author: yoavs Date: Fri Mar 17 14:49:06 2006 New Revision: 386748 URL: http://svn.apache.org/viewcvs?rev=386748view=rev Log: Yet one more DOAP addition Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=386748r1=386747r2=386748view=diff == --- tomcat/site/trunk/docs/doap_Tomcat.rdf (original) +++ tomcat/site/trunk/docs/doap_Tomcat.rdf Fri Mar 17 14:49:06 2006 @@ -21,6 +21,12 @@ download-page rdf:resource=http://tomcat.apache.org; / programming-languageJava/programming-language category rdf:resource=http://projects.apache.org/category/network-server; / +maintainer + foaf:Person +foaf:nameTomcat PMC/foaf:name + foaf:mbox rdf:resource=mailto:dev@tomcat.apache.org/ + /foaf:Person +/maintainer release Version nameLatest Stable Release/name - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r386754 - /tomcat/site/trunk/docs/doap_Tomcat.rdf
Author: yoavs Date: Fri Mar 17 15:02:11 2006 New Revision: 386754 URL: http://svn.apache.org/viewcvs?rev=386754view=rev Log: Corrected and added missing namespace. Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=386754r1=386753r2=386754view=diff == --- tomcat/site/trunk/docs/doap_Tomcat.rdf (original) +++ tomcat/site/trunk/docs/doap_Tomcat.rdf Fri Mar 17 15:02:11 2006 @@ -3,7 +3,8 @@ rdf:RDF xml:lang=en xmlns=http://usefulinc.com/ns/doap#; xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; - xmlns:asfext=http:projects.apache.org/ns/asfext# + xmlns:asfext=http://projects.apache.org/ns/asfext#; + xmlns:foaf=http://xmlsns.com/foaf/0.1/; Project rdf:about=http://tomcat.apache.org/; created2006-01-27/created license rdf:resource=http://usefulinc.com/doap/licenses/asl20; / - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r386326 - in /tomcat/site/trunk: docs/download-55.html xdocs/download-55.xml
Author: yoavs Date: Thu Mar 16 05:50:50 2006 New Revision: 386326 URL: http://svn.apache.org/viewcvs?rev=386326view=rev Log: Add note about native connector version in 5.5.16. Modified: tomcat/site/trunk/docs/download-55.html tomcat/site/trunk/xdocs/download-55.xml Modified: tomcat/site/trunk/docs/download-55.html URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/download-55.html?rev=386326r1=386325r2=386326view=diff == --- tomcat/site/trunk/docs/download-55.html (original) +++ tomcat/site/trunk/docs/download-55.html Thu Mar 16 05:50:50 2006 @@ -314,6 +314,16 @@ a href=[preferred]/tomcat/tomcat-5/v5.5.16/README.htmlREADME/a file for packaging information. It explains what every distribution contains. /p + p + strongNote Regarding Native Connector:/strong + The Tomcat 5.5.16 binaries include the Native Connector version 1.1.1. This version + contains some significant bugs that have been addressed in version 1.1.2. We strongly + encourage users of the Native Connector to upgrade to version 1.1.2 by downloading it: + a href=[preferred]/tomcat/tomcat-connectors/native/tomcat-native-1.1.2.tar.gztar.gz/a + (a href=http://www.apache.org/dist/tomcat/tomcat-connectors/native/tomcat-native-1.1.2.tar.gz.asc;PGP/a), + a href=[preferred]/tomcat/tomcat-connectors/native/tomcat-native-1.1.2.zipzip/a + (a href=http://www.apache.org/dist/tomcat/tomcat-connectors/native/tomcat-native-1.1.2.zip.asc;PGP/a) + /p table width=100% cellpadding=2 cellspacing=0 border=0 tr Modified: tomcat/site/trunk/xdocs/download-55.xml URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/xdocs/download-55.xml?rev=386326r1=386325r2=386326view=diff == --- tomcat/site/trunk/xdocs/download-55.xml (original) +++ tomcat/site/trunk/xdocs/download-55.xml Thu Mar 16 05:50:50 2006 @@ -65,6 +65,16 @@ a href=[preferred]/tomcat/tomcat-5/v5.5.16/README.htmlREADME/a file for packaging information. It explains what every distribution contains. /p + p + strongNote Regarding Native Connector:/strong + The Tomcat 5.5.16 binaries include the Native Connector version 1.1.1. This version + contains some significant bugs that have been addressed in version 1.1.2. We strongly + encourage users of the Native Connector to upgrade to version 1.1.2 by downloading it: + a href=[preferred]/tomcat/tomcat-connectors/native/tomcat-native-1.1.2.tar.gztar.gz/a + (a href=http://www.apache.org/dist/tomcat/tomcat-connectors/native/tomcat-native-1.1.2.tar.gz.asc;PGP/a), + a href=[preferred]/tomcat/tomcat-connectors/native/tomcat-native-1.1.2.zipzip/a + (a href=http://www.apache.org/dist/tomcat/tomcat-connectors/native/tomcat-native-1.1.2.zip.asc;PGP/a) + /p subsection name=Binary Distributions ul - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r386136 - in /tomcat/site/trunk: docs/download-55.html docs/index.html xdocs/download-55.xml xdocs/index.xml
Author: yoavs Date: Wed Mar 15 11:12:11 2006 New Revision: 386136 URL: http://svn.apache.org/viewcvs?rev=386136view=rev Log: 5.5.16 is now stable. Modified: tomcat/site/trunk/docs/download-55.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/xdocs/download-55.xml tomcat/site/trunk/xdocs/index.xml Modified: tomcat/site/trunk/docs/download-55.html URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/download-55.html?rev=386136r1=386135r2=386136view=diff == --- tomcat/site/trunk/docs/download-55.html (original) +++ tomcat/site/trunk/docs/download-55.html Wed Mar 15 11:12:11 2006 @@ -199,8 +199,7 @@ p blockquote a href=http://www.apache.org/dist/tomcat/tomcat-5/KEYS;KEYS/a | -a href=#5.5.16-beta5.5.16-beta/a | -a href=#5.5.155.5.15/a | +a href=#5.5.165.5.16/a | a href=#5.0.30-beta5.0.30-beta/a | a href=#5.0.285.0.28/a | a href=http://cvs.apache.org/builds/jakarta-tomcat-5/nightly/;Nightly/a | @@ -300,8 +299,8 @@ tr td bgcolor=#525D76 font face=arial,helvetica,sanserif color=#ff -a name=5.5.16-beta -strong5.5.16-beta/strong +a name=5.5.16 +strong5.5.16/strong /a /font /td @@ -311,8 +310,8 @@ p blockquote p - a name=5.5.16-betaPlease/a see the - a href=[preferred]/tomcat/tomcat-5/v5.5.16-beta/README.htmlREADME/a + a name=5.5.16Please/a see the + a href=[preferred]/tomcat/tomcat-5/v5.5.16/README.htmlREADME/a file for packaging information. It explains what every distribution contains. /p @@ -333,19 +332,19 @@ liCore: ul li - a href=[preferred]/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16.zipzip/a - (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16.zip.asc;pgp/a, - a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16.zip.MD5;md5/a) + a href=[preferred]/tomcat/tomcat-5/v5.5.16/bin/apache-tomcat-5.5.16.zipzip/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16/bin/apache-tomcat-5.5.16.zip.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16/bin/apache-tomcat-5.5.16.zip.MD5;md5/a) /li li - a href=[preferred]/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16.tar.gztar.gz/a - (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16.tar.gz.asc;pgp/a, - a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16.tar.gz.MD5;md5/a) + a href=[preferred]/tomcat/tomcat-5/v5.5.16/bin/apache-tomcat-5.5.16.tar.gztar.gz/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16/bin/apache-tomcat-5.5.16.tar.gz.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16/bin/apache-tomcat-5.5.16.tar.gz.MD5;md5/a) /li li - a href=[preferred]/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16.exeWindows Executable/a - (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16.exe.asc;pgp/a, - a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16.exe.MD5;md5/a) + a href=[preferred]/tomcat/tomcat-5/v5.5.16/bin/apache-tomcat-5.5.16.exeWindows Executable/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16/bin/apache-tomcat-5.5.16.exe.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16/bin/apache-tomcat-5.5.16.exe.MD5;md5/a) /li /ul /li @@ -353,28 +352,28 @@ liDeployer: ul li - a href=[preferred]/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16-deployer.zipzip/a - (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16-deployer.zip.asc;pgp/a, - a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16-deployer.zip.MD5;md5/a) + a href=[preferred]/tomcat/tomcat-5/v5.5.16/bin/apache-tomcat-5.5.16-deployer.zipzip/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16/bin/apache-tomcat-5.5.16-deployer.zip.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16/bin/apache-tomcat-5.5.16-deployer.zip.MD5;md5/a) /li li - a href=[preferred]/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16-deployer.tar.gztar.gz/a - (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16-deployer.tar.gz.asc;pgp/a, - a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16-deployer.tar.gz.MD5;md5/a) + a href=[preferred]/tomcat/tomcat-5
svn commit: r384293 - in /tomcat/container/tc5.5.x/webapps: docs/ host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/
Author: yoavs
Date: Wed Mar 8 10:09:36 2006
New Revision: 384293
URL: http://svn.apache.org/viewcvs?rev=384293view=rev
Log:
Bugzilla 38508: http://issues.apache.org/bugzilla/show_bug.cgi?id=38508
Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/container/tc5.5.x/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HTMLHostManagerServlet.java
tomcat/container/tc5.5.x/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HostManagerServlet.java
tomcat/container/tc5.5.x/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/LocalStrings.properties
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=384293r1=384292r2=384293view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Mar 8 10:09:36 2006
@@ -25,6 +25,14 @@
/fix
/changelog
/subsection
+ subsection name=Webapps
+changelog
+ fix
+bug38508/bug: Several enhancements to Host Manager application,
including configurable
+ manager app support and dialog box enhancements. Thanks to George
Sexton for the patch. (yoavs)
+ /fix
+/changelog
+ /subsection
/section
section name=Tomcat 5.5.16 (yoavs)
Modified:
tomcat/container/tc5.5.x/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HTMLHostManagerServlet.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HTMLHostManagerServlet.java?rev=384293r1=384292r2=384293view=diff
==
---
tomcat/container/tc5.5.x/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HTMLHostManagerServlet.java
(original)
+++
tomcat/container/tc5.5.x/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HTMLHostManagerServlet.java
Wed Mar 8 10:09:36 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004-2005 The Apache Software Foundation.
+ * Copyright 1999,2004-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -256,11 +256,16 @@
buf.append(, ).append(aliases[j]);
}
}
+
+if (buf.length() == 0) {
+buf.append(nbsp;);
+}
+
args[1] = buf.toString();
writer.print
(MessageFormat.format(HOSTS_ROW_DETAILS_SECTION, args));
-args = new Object[6];
+args = new Object[7];
args[0] = response.encodeURL
(request.getContextPath() +
/html/start?name= + hostName);
@@ -273,6 +278,7 @@
(request.getContextPath() +
/html/remove?name= + hostName);
args[5] = hostsRemove;
+args[6] = hostName;
if (host == this.host) {
writer.print(MessageFormat.format(
MANAGER_HOST_ROW_BUTTON_SECTION, args));
@@ -320,6 +326,10 @@
args[2] = ;
writer.print(MessageFormat.format(ADD_SECTION_BOOLEAN, args));
+args[0] = sm.getString(htmlHostManagerServlet.addManager);
+args[1] = manager;
+args[2] = checked;
+writer.print(MessageFormat.format(ADD_SECTION_BOOLEAN, args));
args = new Object[1];
args[0] = sm.getString(htmlHostManagerServlet.addButton);
@@ -375,7 +385,7 @@
private static final String HOSTS_ROW_DETAILS_SECTION =
tr\n +
- td class=\row-left\smalla href=\{0}\{0}/a +
+ td class=\row-left\smalla href=\http://{0}\;{0}/a +
/small/td\n +
td class=\row-center\small{1}/small/td\n;
@@ -390,11 +400,11 @@
/tr\n;
private static final String HOSTS_ROW_BUTTON_SECTION =
- td class=\row-left\\n +
+ td class=\row-left\ NOWRAP\n +
small\n +
- nbsp;a href=\{0}\ onclick=\return(confirm('Are you
sure?'))\{1}/anbsp;\n +
- nbsp;a href=\{2}\ onclick=\return(confirm('Are you
sure?'))\{3}/anbsp;\n +
- nbsp;a href=\{4}\ onclick=\return(confirm('Are you
sure?'))\{5}/anbsp;\n +
+ nbsp;a href=\{0}\ onclick=\return(confirm(''{1} {6}\\n\\nAre
you sure?''))\{1}/anbsp;\n +
+ nbsp;a href=\{2}\ onclick=\return(confirm(''{3} {6}\\n\\nAre
you sure?''))\{3}/anbsp;\n +
+ nbsp;a href=\{4}\ onclick=\return(confirm(''{5} {6}\\n\\nAre
you sure?''))\{5}/anbsp;\n +
/small\n +
/td\n +
/tr\n;
@@ -454,7 +464,6 @@
nbsp;\n
svn commit: r383337 - in /tomcat/site/trunk: docs/download-55.html xdocs/download-55.xml
Author: yoavs Date: Sun Mar 5 07:14:21 2006 New Revision: 383337 URL: http://svn.apache.org/viewcvs?rev=383337view=rev Log: 5.5.16-beta added. Modified: tomcat/site/trunk/docs/download-55.html tomcat/site/trunk/xdocs/download-55.xml Modified: tomcat/site/trunk/docs/download-55.html URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/download-55.html?rev=383337r1=383336r2=383337view=diff == --- tomcat/site/trunk/docs/download-55.html (original) +++ tomcat/site/trunk/docs/download-55.html Sun Mar 5 07:14:21 2006 @@ -199,6 +199,7 @@ p blockquote a href=http://www.apache.org/dist/tomcat/tomcat-5/KEYS;KEYS/a | +a href=#5.5.16-beta5.5.16-beta/a | a href=#5.5.155.5.15/a | a href=#5.0.30-beta5.0.30-beta/a | a href=#5.0.285.0.28/a | @@ -286,6 +287,187 @@ /blockquote +/p +/td +/tr +tr +td +br / +/td +/tr +/table +table width=100% cellpadding=2 cellspacing=0 border=0 +tr +td bgcolor=#525D76 +font face=arial,helvetica,sanserif color=#ff +a name=5.5.16-beta +strong5.5.16-beta/strong +/a +/font +/td +/tr +tr +td +p +blockquote + p + a name=5.5.16-betaPlease/a see the + a href=[preferred]/tomcat/tomcat-5/v5.5.16-beta/README.htmlREADME/a + file for packaging information. It explains what every distribution contains. + /p + + table width=100% cellpadding=2 cellspacing=0 border=0 +tr +td bgcolor=#828DA6 +font face=arial,helvetica,sanserif color=#ff +a name=Binary Distributions +strongBinary Distributions/strong +/a +/font +/td +/tr +tr +td +blockquote + ul +liCore: + ul + li + a href=[preferred]/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16.zipzip/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16.zip.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16.zip.MD5;md5/a) + /li + li + a href=[preferred]/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16.tar.gztar.gz/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16.tar.gz.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16.tar.gz.MD5;md5/a) + /li + li + a href=[preferred]/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16.exeWindows Executable/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16.exe.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16.exe.MD5;md5/a) + /li + /ul +/li + +liDeployer: + ul + li + a href=[preferred]/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16-deployer.zipzip/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16-deployer.zip.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16-deployer.zip.MD5;md5/a) + /li + li + a href=[preferred]/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16-deployer.tar.gztar.gz/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16-deployer.tar.gz.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16-deployer.tar.gz.MD5;md5/a) + /li + /ul +/li +liEmbedded: + ul + li + a href=[preferred]/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16-embed.zipzip/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16-embed.zip.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16-embed.zip.MD5;md5/a) + /li + li + a href=[preferred]/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16-embed.tar.gztar.gz/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16-embed.tar.gz.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16-embed.tar.gz.MD5;md5/a) + /li + /ul +/li + +liAdministration Web Application: + ul + li +a href=[preferred]/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16-admin.zipzip/a +(a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16-admin.zip.asc;pgp/a, +a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.16-beta/bin/apache-tomcat-5.5.16-admin.zip.MD5;md5/a) + /li + li +a href=[preferred]/tomcat
svn commit: r383241 - /tomcat/connectors/tags/tc5.5.x/TOMCAT_5_5_16/
Author: yoavs Date: Sat Mar 4 17:00:50 2006 New Revision: 383241 URL: http://svn.apache.org/viewcvs?rev=383241view=rev Log: Tagging Tomcat version TOMCAT_5_5_16. Added: tomcat/connectors/tags/tc5.5.x/TOMCAT_5_5_16/ - copied from r383240, tomcat/connectors/trunk/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r383244 - /tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/TOMCAT_5_5_16/
Author: yoavs Date: Sat Mar 4 17:00:52 2006 New Revision: 383244 URL: http://svn.apache.org/viewcvs?rev=383244view=rev Log: Tagging Tomcat version TOMCAT_5_5_16. Added: tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/TOMCAT_5_5_16/ - copied from r383243, tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r383242 - /tomcat/container/tags/tc5.5.x/TOMCAT_5_5_16/
Author: yoavs Date: Sat Mar 4 17:00:51 2006 New Revision: 383242 URL: http://svn.apache.org/viewcvs?rev=383242view=rev Log: Tagging Tomcat version TOMCAT_5_5_16. Added: tomcat/container/tags/tc5.5.x/TOMCAT_5_5_16/ - copied from r383241, tomcat/container/tc5.5.x/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r383250 - /tomcat/connectors/tags/tc5.5.x/5_5_16/
Author: yoavs Date: Sat Mar 4 17:06:55 2006 New Revision: 383250 URL: http://svn.apache.org/viewcvs?rev=383250view=rev Log: Tagging Tomcat version 5_5_16. Added: tomcat/connectors/tags/tc5.5.x/5_5_16/ - copied from r383249, tomcat/connectors/trunk/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r383251 - /tomcat/container/tags/tc5.5.x/5_5_16/
Author: yoavs Date: Sat Mar 4 17:06:55 2006 New Revision: 383251 URL: http://svn.apache.org/viewcvs?rev=383251view=rev Log: Tagging Tomcat version 5_5_16. Added: tomcat/container/tags/tc5.5.x/5_5_16/ - copied from r383250, tomcat/container/tc5.5.x/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r383257 - /tomcat/container/tags/tc5.5.x/TOMCAT_5_5_16/tc5.5.x/
Author: yoavs Date: Sat Mar 4 17:07:45 2006 New Revision: 383257 URL: http://svn.apache.org/viewcvs?rev=383257view=rev Log: Tagging Tomcat version TOMCAT_5_5_16. Added: tomcat/container/tags/tc5.5.x/TOMCAT_5_5_16/tc5.5.x/ - copied from r383256, tomcat/container/tc5.5.x/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r383258 - /tomcat/jasper/tags/tc5.5.x/TOMCAT_5_5_16/tc5.5.x/
Author: yoavs Date: Sat Mar 4 17:07:46 2006 New Revision: 383258 URL: http://svn.apache.org/viewcvs?rev=383258view=rev Log: Tagging Tomcat version TOMCAT_5_5_16. Added: tomcat/jasper/tags/tc5.5.x/TOMCAT_5_5_16/tc5.5.x/ - copied from r383257, tomcat/jasper/tc5.5.x/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r383259 - /tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/TOMCAT_5_5_16/servlet2.4-jsp2.0-tc5.x/
Author: yoavs Date: Sat Mar 4 17:07:47 2006 New Revision: 383259 URL: http://svn.apache.org/viewcvs?rev=383259view=rev Log: Tagging Tomcat version TOMCAT_5_5_16. Added: tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/TOMCAT_5_5_16/servlet2.4-jsp2.0-tc5.x/ - copied from r383258, tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r373593 - /tomcat/site/trunk/docs/doap_Tomcat.rdf
Author: yoavs Date: Mon Jan 30 13:20:54 2006 New Revision: 373593 URL: http://svn.apache.org/viewcvs?rev=373593view=rev Log: Added DOAP file for projects.apache.org. Added: tomcat/site/trunk/docs/doap_Tomcat.rdf Added: tomcat/site/trunk/docs/doap_Tomcat.rdf URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=373593view=auto == --- tomcat/site/trunk/docs/doap_Tomcat.rdf (added) +++ tomcat/site/trunk/docs/doap_Tomcat.rdf Mon Jan 30 13:20:54 2006 @@ -0,0 +1,39 @@ +?xml version=1.0? +?xml-stylesheet type=text/xsl? +rdf:RDF xml:lang=en + xmlns=http://usefulinc.com/ns/doap#; + xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:asfext=http:projects.apache.org/ns/asfext# + Project rdf:about=http://tomcat.apache.org/; +created2006-01-27/created +license rdf:resource=http://usefulinc.com/doap/licenses/asl20; / +nameApache Tomcat/name +homepage rdf:resource=http://tomcat.apache.org; / +asfext:pmc rdf:resource=http://tomcat.apache.org; / +shortdescA Java Servlet and Java Servet Pages specifications implementation./shortdesc +descriptionApache Tomcat is the servlet container that is used in the official Reference Implementation for the Java Servlet and JavaServer Pages technologies. The Java Servlet and JavaServer Pages specifications are developed by Sun under the Java Community Process. + +Apache Tomcat is developed in an open and participatory environment and released under the Apache Software License. Apache Tomcat is intended to be a collaboration of the best-of-breed developers from around the world. We invite you to participate in this open development project. To learn more about getting involved, click here. + +Apache Tomcat powers numerous large-scale, mission-critical web applications across a diverse range of industries and organizations. Some of these users and their stories are listed on the PoweredBy wiki page./description +bug-database rdf:resource=http://issues.apache.org/bugzilla; / +mailing-list rdf:resource=http://tomcat.apache.org/lists.html; / +download-page rdf:resource=http://tomcat.apache.org; / +programming-languagejava/programming-language +category rdf:resource=http://projects.apache.org/category/servletcontainerJavaServerPagesJSP; / +release + Version +name5.5.15/name +created2006-01-23/created +revision5.5.15/revision + /Version +/release +repository + SVNRepository +location rdf:resource=http://svn.apache.org/repos/asf/tomcat/ +browse rdf:resource=http://svn.apache.org/repos/asf/tomcat// + /SVNRepository +/repository + /Project +/rdf:RDF + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r371053 - in /tomcat/site/trunk: docs/download-55.html docs/index.html xdocs/download-55.xml xdocs/index.xml
Author: yoavs Date: Sat Jan 21 06:41:28 2006 New Revision: 371053 URL: http://svn.apache.org/viewcvs?rev=371053view=rev Log: 5.5.15 is now stable. Modified: tomcat/site/trunk/docs/download-55.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/xdocs/download-55.xml tomcat/site/trunk/xdocs/index.xml Modified: tomcat/site/trunk/docs/download-55.html URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/download-55.html?rev=371053r1=371052r2=371053view=diff == --- tomcat/site/trunk/docs/download-55.html (original) +++ tomcat/site/trunk/docs/download-55.html Sat Jan 21 06:41:28 2006 @@ -199,8 +199,7 @@ p blockquote a href=http://www.apache.org/dist/tomcat/tomcat-5/KEYS;KEYS/a | -a href=#5.5.15-beta5.5.15-beta/a | -a href=#5.5.125.5.12/a | +a href=#5.5.155.5.15/a | a href=#5.0.30-beta5.0.30-beta/a | a href=#5.0.285.0.28/a | a href=http://cvs.apache.org/builds/jakarta-tomcat-5/nightly/;Nightly/a | @@ -300,8 +299,8 @@ tr td bgcolor=#525D76 font face=arial,helvetica,sanserif color=#ff -a name=5.5.15-beta -strong5.5.15-beta/strong +a name=5.5.15 +strong5.5.15/strong /a /font /td @@ -311,7 +310,7 @@ p blockquote p - a name=5.5.15-betaPlease/a see the + a name=5.5.15Please/a see the a href=[preferred]/tomcat/tomcat-5/v5.5.15/README.htmlREADME/a file for packaging information. It explains what every distribution contains. /p @@ -333,19 +332,19 @@ liCore: ul li - a href=[preferred]/tomcat/tomcat-5/v5.5.15-beta/bin/apache-tomcat-5.5.15.zipzip/a - (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.15-beta/bin/apache-tomcat-5.5.15.zip.asc;pgp/a, - a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.15-beta/bin/apache-tomcat-5.5.15.zip.MD5;md5/a) + a href=[preferred]/tomcat/tomcat-5/v5.5.15/bin/apache-tomcat-5.5.15.zipzip/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.15/bin/apache-tomcat-5.5.15.zip.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.15/bin/apache-tomcat-5.5.15.zip.MD5;md5/a) /li li - a href=[preferred]/tomcat/tomcat-5/v5.5.15-beta/bin/apache-tomcat-5.5.15.tar.gztar.gz/a - (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.15-beta/bin/apache-tomcat-5.5.15.tar.gz.asc;pgp/a, - a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.15-beta/bin/apache-tomcat-5.5.15.tar.gz.MD5;md5/a) + a href=[preferred]/tomcat/tomcat-5/v5.5.15/bin/apache-tomcat-5.5.15.tar.gztar.gz/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.15/bin/apache-tomcat-5.5.15.tar.gz.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.15/bin/apache-tomcat-5.5.15.tar.gz.MD5;md5/a) /li li - a href=[preferred]/tomcat/tomcat-5/v5.5.15-beta/bin/apache-tomcat-5.5.15.exeWindows Executable/a - (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.15-beta/bin/apache-tomcat-5.5.15.exe.asc;pgp/a, - a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.15-beta/bin/apache-tomcat-5.5.15.exe.MD5;md5/a) + a href=[preferred]/tomcat/tomcat-5/v5.5.15/bin/apache-tomcat-5.5.15.exeWindows Executable/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.15/bin/apache-tomcat-5.5.15.exe.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.15/bin/apache-tomcat-5.5.15.exe.MD5;md5/a) /li /ul /li @@ -353,28 +352,28 @@ liDeployer: ul li - a href=[preferred]/tomcat/tomcat-5/v5.5.15-beta/bin/apache-tomcat-5.5.15-deployer.zipzip/a - (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.15-beta/bin/apache-tomcat-5.5.15-deployer.zip.asc;pgp/a, - a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.15-beta/bin/apache-tomcat-5.5.15-deployer.zip.MD5;md5/a) + a href=[preferred]/tomcat/tomcat-5/v5.5.15/bin/apache-tomcat-5.5.15-deployer.zipzip/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.15/bin/apache-tomcat-5.5.15-deployer.zip.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.15/bin/apache-tomcat-5.5.15-deployer.zip.MD5;md5/a) /li li - a href=[preferred]/tomcat/tomcat-5/v5.5.15-beta/bin/apache-tomcat-5.5.15-deployer.tar.gztar.gz/a - (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.15-beta/bin/apache-tomcat-5.5.15-deployer.tar.gz.asc;pgp/a, - a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.15-beta/bin/apache-tomcat-5.5.15-deployer.tar.gz.MD5;md5/a) + a href=[preferred]/tomcat/tomcat-5/v5.5.15/bin/apache-tomcat-5.5.15-deployer.tar.gztar.gz
svn commit: r367616 - in /tomcat/container/tc5.5.x/webapps/docs: changelog.xml config/loader.xml config/realm.xml tomcat-docs.xsl
Author: yoavs Date: Tue Jan 10 06:39:10 2006 New Revision: 367616 URL: http://svn.apache.org/viewcvs?rev=367616view=rev Log: Minor doc updates. Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml tomcat/container/tc5.5.x/webapps/docs/config/loader.xml tomcat/container/tc5.5.x/webapps/docs/config/realm.xml tomcat/container/tc5.5.x/webapps/docs/tomcat-docs.xsl Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=367616r1=367615r2=367616view=diff == --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Tue Jan 10 06:39:10 2006 @@ -14,7 +14,14 @@ body -section name=Tomcat 5.5.16 +section name=Tomcat 5.5.16 (yoavs) + subsection name=General +changelog + update +Updated / enhanced docs to remove old FIXME references. (yoavs) + /update +/changelog + /subsection subsection name=Catalina changelog fix @@ -45,7 +52,7 @@ /subsection /section -section name=Tomcat 5.5.15 +section name=Tomcat 5.5.15 (yoavs) subsection name=General changelog fix Modified: tomcat/container/tc5.5.x/webapps/docs/config/loader.xml URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/config/loader.xml?rev=367616r1=367615r2=367616view=diff == --- tomcat/container/tc5.5.x/webapps/docs/config/loader.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/config/loader.xml Tue Jan 10 06:39:10 2006 @@ -35,7 +35,7 @@ created automatically, which is sufficient for most requirements./p pFor a more in-depth description of the class loader hierarchy - that is implemented by Catalina, see strongFIXME - Reference/strong./p + that is implemented by Catalina, see a href=../class-loader-howto.htmlthe ClassLoader HowTo/a./p blockquoteem pThe description below uses the variable name $CATALINA_HOME Modified: tomcat/container/tc5.5.x/webapps/docs/config/realm.xml URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/config/realm.xml?rev=367616r1=367615r2=367616view=diff == --- tomcat/container/tc5.5.x/webapps/docs/config/realm.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/config/realm.xml Tue Jan 10 06:39:10 2006 @@ -31,11 +31,10 @@ containers, unless explicitly overridden./p pFor more in-depth information about container managed security in web - applications, see strongFIXME - link to Container Managed Security Guide - in the application developer's section/strong. For more in-depth - information about configuing and using the standard Realm component - implementations, see strongFIXME - link to Realm Configuration HOW-TO - in the administrator's section/strong./p + applications, as well as more information on configuring and using the + standard realm component implementations, please see the + a href=../realm-howto.htmlContainer-Managed Security Guide/a. + /p blockquoteem pThe description below uses the variable name $CATALINA_HOME @@ -155,7 +154,7 @@ /attributes -pSee strongFIXME - Nested pointer into HOW-TO/strong for more +pSee the a href=../realm-howto.htmlContainer-Managed Security Guide/a for more information on setting up container managed security using the JDBC Database Realm component./p @@ -418,7 +417,7 @@ /attributes -pSee strongFIXME - Nested pointer into HOW-TO/strong for more +pSee the a href=../realm-howto.htmlContainer-Managed Security Guide/a for more information on setting up container managed security using the JNDI Directory Realm component./p @@ -466,7 +465,7 @@ /ul/li /ul -pSee strongFIXME - Nested pointer into HOW-TO/strong for more +pSee the a href=../realm-howto.htmlContainer-Managed Security Guide/a for more information on setting up container managed security using the Memory Based Realm component./p Modified: tomcat/container/tc5.5.x/webapps/docs/tomcat-docs.xsl URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/tomcat-docs.xsl?rev=367616r1=367615r2=367616view=diff == --- tomcat/container/tc5.5.x/webapps/docs/tomcat-docs.xsl (original) +++ tomcat/container/tc5.5.x/webapps/docs/tomcat-docs.xsl Tue Jan 10 06:39:10 2006 @@ -14,9 +14,9 @@ !-- Defined parameters (overrideable) -- - xsl:paramname=home-nameselect='The Jakarta Project'/ - xsl:paramname=home-hrefselect='http://jakarta.apache.org/'/ - xsl:paramname=home-logoselect='/images/jakarta-logo.gif'/ + xsl:paramname=home-nameselect
svn commit: r367722 - in /tomcat/site/trunk: docs/faq/misc.html docs/faq/printer/misc.html xdocs-faq/misc.xml
Author: yoavs Date: Tue Jan 10 10:41:29 2006 New Revision: 367722 URL: http://svn.apache.org/viewcvs?rev=367722view=rev Log: Question I've gotten offline a few times. Modified: tomcat/site/trunk/docs/faq/misc.html tomcat/site/trunk/docs/faq/printer/misc.html tomcat/site/trunk/xdocs-faq/misc.xml Modified: tomcat/site/trunk/docs/faq/misc.html URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/faq/misc.html?rev=367722r1=367721r2=367722view=diff == --- tomcat/site/trunk/docs/faq/misc.html (original) +++ tomcat/site/trunk/docs/faq/misc.html Tue Jan 10 10:41:29 2006 @@ -174,6 +174,11 @@ Help! Even though I run shutdown.sh (or shutdown.bat), Tomcat does not stop! /a /li +li + a href=#adminJspErrors +How do I debug JSP errors in the Admin web application? + /a +/li /ul /p @@ -781,6 +786,39 @@ Most likely, a non-daemon thread is running. JVM's do not shutdown until there are 0 non-daemon threads. You will need to perform a thread dump [ttkill -3 pid/tt for Unix or ttCTRL+Break/tt for Windows] to determine the code which started the thread. + /divbr + + b style=font-size: larger + a href=#adminJspErrors +How do I debug JSP errors in the Admin web application? + /a + /b + div style=padding-left : 20px; +The admin web application that ships with Tomcat's binary distribution contains +pre-compiled JSPs and mappings for them. In order to debug these JSPs, you need +to get the source versions, place them in the admin webapp directory, and disable +the JSPC-generated web.xml servlet mappings. Here's how to do it from scratch +for a clean Tomcat installation: + +ol + liDownload Tomcat's base and admin webapp distributions (binaries), unzip to a directory + of your choice. We'll use codec:\temp/code in this example./li + liEdit c:\temp\server\webapps\admin\WEB-INF\web.xml to remove the JSPC-generated servlet mappings. + These are marked in the web.xml file with comments indicating the beginning and end of the JSPC + section. You can simply comment out all these codeservlet-mappping/code elements. Be careful not to + comment out other servlet mappings such as the Struts dispatcher servlet./li + liOpen c:\temp\server\webapps\admin\WEB-INF\lib\catalina-admin.jar with a zip file program like + WinZip. Remove the files named *_jsp.class, as these are the compiled JSPs. Do not remove + the other class files, the ones under the org/apache/ paths./li + liDownload a Tomcat source distribution and unzip it to a directory of your choice, but not + the same directory that you used above. We'll use codec:\src/code in this example./li + liCopy everything bexcept/b the WEB-INF/lib directory from c:\src\container\webapps\admin + to c:\temp\server\webapps\admin. Now you will have the uncompiled admin webapp JSPs./li + liIf you haven't already, define an admin user in code%CATALINA_HOME%\conf\tomcat-users.xml/code./li + liStart Tomcat, navigate to http://localhost:8080 (or your actual server:port if you have modified + the default values), and access the admin web application. It will run slower because Tomcat is + now compiling the JSPs on-demand the first time you access them, but should otherwise appear normal./li +/ol /divbr /blockquote/td/tr/table/td/tr!--FOOTER SEPARATOR--trtd colspan=2hr size=1 noshade=/td/trtrtd align=center colspan=2!--Google Search Form: see Bugzilla 35788--form action=http://www.google.com/search; name=searchForm method=GETinput value=UTF-8 name=ie type=hiddeninput value=UTF-8 name=oe type=hiddentable bgcolor=#FFtrtda href=http://www.google.com/;img align=absmiddle alt=Google border=0 src=http://www.google.com/logos/Logo_40wht.gif;/a/tdtdinput value= maxlength=255 size=25 name=q type=textinput value=http://jakarta.apache.org/tomcat/faq; name=domains type=hiddeninput value=http://jakarta.apache.org/tomcat/faq; name=sitesearch type=hiddeninput value=Google Search name=btnG type=submitbr Modified: tomcat/site/trunk/docs/faq/printer/misc.html URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/faq/printer/misc.html?rev=367722r1=367721r2=367722view=diff == --- tomcat/site/trunk/docs/faq/printer/misc.html (original) +++ tomcat/site/trunk/docs/faq/printer/misc.html Tue Jan 10 10:41:29 2006 @@ -173,6 +173,11 @@ Help! Even though I run shutdown.sh (or shutdown.bat), Tomcat does not stop! /a /li +li + a href=#adminJspErrors +How do I debug JSP errors in the Admin web application? + /a +/li /ul /p @@ -780,6 +785,39 @@ Most likely, a non-daemon thread is running. JVM's do not shutdown until
svn commit: r366510 - /tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/TOMCAT_5_5_12/
Author: yoavs Date: Fri Jan 6 06:35:40 2006 New Revision: 366510 URL: http://svn.apache.org/viewcvs?rev=366510view=rev Log: Copying tag from 5.5.11 to 5.5.12 as I apparently forgot to tag 5.5.12 at the time of release. Added: tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/TOMCAT_5_5_12/ - copied from r366509, tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/TOMCAT_5_5_11/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r365948 - in /tomcat/site/trunk: docs/download-55.html xdocs/download-55.xml
Author: yoavs Date: Wed Jan 4 09:16:21 2006 New Revision: 365948 URL: http://svn.apache.org/viewcvs?rev=365948view=rev Log: Tomcat 5.5.15-beta. Modified: tomcat/site/trunk/docs/download-55.html tomcat/site/trunk/xdocs/download-55.xml Modified: tomcat/site/trunk/docs/download-55.html URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/download-55.html?rev=365948r1=365947r2=365948view=diff == --- tomcat/site/trunk/docs/download-55.html (original) +++ tomcat/site/trunk/docs/download-55.html Wed Jan 4 09:16:21 2006 @@ -199,7 +199,7 @@ p blockquote a href=http://www.apache.org/dist/tomcat/tomcat-5/KEYS;KEYS/a | -a href=#5.5.14-beta5.5.14-beta/a | +a href=#5.5.15-beta5.5.15-beta/a | a href=#5.5.125.5.12/a | a href=#5.0.30-beta5.0.30-beta/a | a href=#5.0.285.0.28/a | @@ -300,8 +300,8 @@ tr td bgcolor=#525D76 font face=arial,helvetica,sanserif color=#ff -a name=5.5.14-beta -strong5.5.14-beta/strong +a name=5.5.15-beta +strong5.5.15-beta/strong /a /font /td @@ -311,8 +311,8 @@ p blockquote p - a name=5.5.14-betaPlease/a see the - a href=[preferred]/tomcat/tomcat-5/v5.5.14/README.htmlREADME/a + a name=5.5.15-betaPlease/a see the + a href=[preferred]/tomcat/tomcat-5/v5.5.15/README.htmlREADME/a file for packaging information. It explains what every distribution contains. /p @@ -333,19 +333,19 @@ liCore: ul li - a href=[preferred]/tomcat/tomcat-5/v5.5.14-beta/bin/apache-tomcat-5.5.14.zipzip/a - (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.14-beta/bin/apache-tomcat-5.5.14.zip.asc;pgp/a, - a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.14-beta/bin/apache-tomcat-5.5.14.zip.md5;md5/a) + a href=[preferred]/tomcat/tomcat-5/v5.5.15-beta/bin/apache-tomcat-5.5.15.zipzip/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.15-beta/bin/apache-tomcat-5.5.15.zip.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.15-beta/bin/apache-tomcat-5.5.15.zip.MD5;md5/a) /li li - a href=[preferred]/tomcat/tomcat-5/v5.5.14-beta/bin/apache-tomcat-5.5.14.tar.gztar.gz/a - (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.14-beta/bin/apache-tomcat-5.5.14.tar.gz.asc;pgp/a, - a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.14-beta/bin/apache-tomcat-5.5.14.tar.gz.md5;md5/a) + a href=[preferred]/tomcat/tomcat-5/v5.5.15-beta/bin/apache-tomcat-5.5.15.tar.gztar.gz/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.15-beta/bin/apache-tomcat-5.5.15.tar.gz.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.15-beta/bin/apache-tomcat-5.5.15.tar.gz.MD5;md5/a) /li li - a href=[preferred]/tomcat/tomcat-5/v5.5.14-beta/bin/apache-tomcat-5.5.14.exeWindows Executable/a - (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.14-beta/bin/apache-tomcat-5.5.14.exe.asc;pgp/a, - a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.14-beta/bin/apache-tomcat-5.5.14.exe.md5;md5/a) + a href=[preferred]/tomcat/tomcat-5/v5.5.15-beta/bin/apache-tomcat-5.5.15.exeWindows Executable/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.15-beta/bin/apache-tomcat-5.5.15.exe.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.15-beta/bin/apache-tomcat-5.5.15.exe.MD5;md5/a) /li /ul /li @@ -353,28 +353,28 @@ liDeployer: ul li - a href=[preferred]/tomcat/tomcat-5/v5.5.14-beta/bin/apache-tomcat-5.5.14-deployer.zipzip/a - (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.14-beta/bin/apache-tomcat-5.5.14-deployer.zip.asc;pgp/a, - a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.14-beta/bin/apache-tomcat-5.5.14-deployer.zip.md5;md5/a) + a href=[preferred]/tomcat/tomcat-5/v5.5.15-beta/bin/apache-tomcat-5.5.15-deployer.zipzip/a + (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.15-beta/bin/apache-tomcat-5.5.15-deployer.zip.asc;pgp/a, + a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.15-beta/bin/apache-tomcat-5.5.15-deployer.zip.MD5;md5/a) /li li - a href=[preferred]/tomcat/tomcat-5/v5.5.14-beta/bin/apache-tomcat-5.5.14-deployer.tar.gztar.gz/a - (a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.14-beta/bin/apache-tomcat-5.5.14-deployer.tar.gz.asc;pgp/a, - a href=http://www.apache.org/dist/tomcat/tomcat-5/v5.5.14-beta/bin/apache-tomcat-5.5.14-deployer.tar.gz.md5;md5/a) + a href=[preferred]/tomcat/tomcat-5/v5.5.15-beta/bin/apache-tomcat-5.5.15-deployer.tar.gztar.gz
svn commit: r365649 - /tomcat/build/tags/tc5.5.x/TOMCAT_5_5_15/
Author: yoavs Date: Tue Jan 3 07:00:24 2006 New Revision: 365649 URL: http://svn.apache.org/viewcvs?rev=365649view=rev Log: Tagging Tomcat version TOMCAT_5_5_15. Added: tomcat/build/tags/tc5.5.x/TOMCAT_5_5_15/ - copied from r365648, tomcat/build/tc5.5.x/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r365650 - /tomcat/connectors/tags/tc5.5.x/TOMCAT_5_5_15/
Author: yoavs Date: Tue Jan 3 07:00:24 2006 New Revision: 365650 URL: http://svn.apache.org/viewcvs?rev=365650view=rev Log: Tagging Tomcat version TOMCAT_5_5_15. Added: tomcat/connectors/tags/tc5.5.x/TOMCAT_5_5_15/ - copied from r365649, tomcat/connectors/trunk/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r365652 - /tomcat/jasper/tags/tc5.5.x/TOMCAT_5_5_15/
Author: yoavs Date: Tue Jan 3 07:00:26 2006 New Revision: 365652 URL: http://svn.apache.org/viewcvs?rev=365652view=rev Log: Tagging Tomcat version TOMCAT_5_5_15. Added: tomcat/jasper/tags/tc5.5.x/TOMCAT_5_5_15/ - copied from r365651, tomcat/jasper/tc5.5.x/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r365654 - /tomcat/site/tags/TOMCAT_5_5_15/
Author: yoavs Date: Tue Jan 3 07:00:27 2006 New Revision: 365654 URL: http://svn.apache.org/viewcvs?rev=365654view=rev Log: Tagging Tomcat version TOMCAT_5_5_15. Added: tomcat/site/tags/TOMCAT_5_5_15/ - copied from r365653, tomcat/site/trunk/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r365653 - /tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/TOMCAT_5_5_15/
Author: yoavs Date: Tue Jan 3 07:00:27 2006 New Revision: 365653 URL: http://svn.apache.org/viewcvs?rev=365653view=rev Log: Tagging Tomcat version TOMCAT_5_5_15. Added: tomcat/servletapi/tags/servlet2.4-jsp2.0-tc5.x/TOMCAT_5_5_15/ - copied from r365652, tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r365421 - /tomcat/build/tc5.5.x/build.xml
Author: yoavs
Date: Mon Jan 2 12:21:01 2006
New Revision: 365421
URL: http://svn.apache.org/viewcvs?rev=365421view=rev
Log:
Added md5 checksum generation for each distros, one less thing for the release
manager to do manually.
Modified:
tomcat/build/tc5.5.x/build.xml
Modified: tomcat/build/tc5.5.x/build.xml
URL:
http://svn.apache.org/viewcvs/tomcat/build/tc5.5.x/build.xml?rev=365421r1=365420r2=365421view=diff
==
--- tomcat/build/tc5.5.x/build.xml (original)
+++ tomcat/build/tc5.5.x/build.xml Mon Jan 2 12:21:01 2006
@@ -1448,7 +1448,6 @@
target name=installer
description=Create Windows installer if=execute.installer
echo message=Builds a Windows installer based on Nullsoft Installer/
-echo message=NSIS must be installed in the default directory/
copy todir=${tomcat.dist}
fileset dir=resources /
/copy
@@ -1459,16 +1458,19 @@
tofile=${tomcat.dist}/bin/tomcat5.exe /
copy file=${jtc.home}/procrun/bin/tomcat5w.exe
tofile=${tomcat.dist}/bin/tomcat5w.exe /
+
filter token=VERSION value=${version}/
filter token=VERSION_NUMBER value=${version.number}/
-copy file=tomcat.nsi tofile=${tomcat.dist}/tomcat.nsi
- filtering=true/
+
+copy file=tomcat.nsi tofile=${tomcat.dist}/tomcat.nsi
filtering=true/
exec dir=${tomcat.dist} executable=${nsis.exe}
arg value=/DNSISDIR=${nsis.home} /
arg value=tomcat.nsi /
/exec
-move file=${tomcat.dist}/tomcat-installer.exe
- tofile=${tomcat.release}/v${version}/bin/${final.name}.exe /
+
+move file=${tomcat.dist}/tomcat-installer.exe
tofile=${tomcat.release}/v${version}/bin/${final.name}.exe /
+
+checksum file=${tomcat.release}/v${version}/bin/${final.name}.exe /
/target
@@ -1491,6 +1493,7 @@
/target
+ !-- Packages the core zip distro --
target name=package-zip
zip zipfile=${tomcat.release}/v${version}/bin/${final.name}.zip
zipfileset dir=${tomcat.dist} prefix=${final.name}
@@ -1513,8 +1516,11 @@
exclude name=conf/Catalina/localhost/admin.xml/
/zipfileset
/zip
+
+checksum file=${tomcat.release}/v${version}/bin/${final.name}.zip/
/target
+ !-- Packages the embedded Tomcat distro in zip format --
target name=package-embed-zip
zip zipfile=${tomcat.release}/v${version}/bin/${final.name}-embed.zip
zipfileset dir=${tomcat.embed} prefix=${final.name}-embed
@@ -1528,63 +1534,62 @@
zipfileset dir=${tomcat.dist} prefix=${final.name}-embed
includes=RELEASE-NOTES /
/zip
+
+checksum
file=${tomcat.release}/v${version}/bin/${final.name}-embed.zip/
/target
+ !-- Packages the deployer distribution in zip format --
target name=package-deployer-zip
zip
zipfile=${tomcat.release}/v${version}/bin/${final.name}-deployer.zip
- zipfileset dir=${tomcat.deployer} prefix=${final.name}-deployer
- includes=** /
- zipfileset dir=${tomcat.dist} prefix=${final.name}-deployer
- includes=LICENSE /
- zipfileset dir=${tomcat.dist} prefix=${final.name}-deployer
- includes=NOTICE /
- zipfileset dir=${tomcat.dist} prefix=${final.name}-deployer
- includes=README.txt /
- zipfileset dir=${tomcat.dist} prefix=${final.name}-deployer
- includes=RELEASE-NOTES /
+ zipfileset dir=${tomcat.deployer} prefix=${final.name}-deployer
includes=** /
+ zipfileset dir=${tomcat.dist} prefix=${final.name}-deployer
includes=LICENSE /
+ zipfileset dir=${tomcat.dist} prefix=${final.name}-deployer
includes=NOTICE /
+ zipfileset dir=${tomcat.dist} prefix=${final.name}-deployer
includes=README.txt /
+ zipfileset dir=${tomcat.dist} prefix=${final.name}-deployer
includes=RELEASE-NOTES /
/zip
+
+checksum
file=${tomcat.release}/v${version}/bin/${final.name}-deployer.zip/
/target
- target name=package-compat-zip
-zip
zipfile=${tomcat.release}/v${version}/bin/${final.name}-compat.zip
- zipfileset dir=${tomcat.compat} prefix=${final.name}
- includes=** /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=LICENSE /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=NOTICE /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=README.txt /
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=RELEASE-NOTES /
-/zip
- /target
-
- target name=package-admin-zip
-zip
zipfile=${tomcat.release}/v${version}/bin/${final.name}-admin.zip
- zipfileset dir=${tomcat.dist} prefix=${final.name}
-include name=server/webapps/admin/**/
-include name=conf/Catalina/localhost/admin.xml/
-exclude name=*.jsp /
- /zipfileset
- zipfileset dir=${tomcat.dist} prefix=${final.name}
- includes=LICENSE
svn commit: r354429 - /tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Author: yoavs Date: Tue Dec 6 05:44:08 2005 New Revision: 354429 URL: http://svn.apache.org/viewcvs?rev=354429view=rev Log: Note Native 1.1.1 update. Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=354429r1=354428r2=354429view=diff == --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Tue Dec 6 05:44:08 2005 @@ -17,6 +17,12 @@ section name=Tomcat 5.5.14 (yoavs) subsection name=General changelog + update +Update optional native APR connector version to 1.1.1. (mturk) + /update + update +Update build.properties.default to get native connector from new location. (yoavs) + /update /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
