tomcat7.0
17 years agoImplement keepAliveCount in a thread safe way, and as an estimate
fhanik [Mon, 8 Dec 2008 16:24:05 +0000 (16:24 +0000)]
Implement keepAliveCount in a thread safe way, and as an estimate

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@724393 13f79535-47bb-0310-9956-ffa450edef68

17 years agoimplement a bit cleanup and a rough estimate on the size of a poller
fhanik [Mon, 8 Dec 2008 15:52:23 +0000 (15:52 +0000)]
implement a bit cleanup and a rough estimate on the size of a poller

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@724384 13f79535-47bb-0310-9956-ffa450edef68

17 years agoRemove the synchronize/notifyAll based thread pool, and use only the built in pool
fhanik [Mon, 8 Dec 2008 03:32:07 +0000 (03:32 +0000)]
Remove the synchronize/notifyAll based thread pool, and use only the built in pool

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@724239 13f79535-47bb-0310-9956-ffa450edef68

17 years agoSet line endings for a couple of new files
markt [Sat, 6 Dec 2008 09:24:29 +0000 (09:24 +0000)]
Set line endings for a couple of new files

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@723961 13f79535-47bb-0310-9956-ffa450edef68

17 years agoAdd the ability to configure a job queue size, and a timeout for how long we want...
fhanik [Fri, 5 Dec 2008 22:02:15 +0000 (22:02 +0000)]
Add the ability to configure a job queue size, and a timeout for how long we want to try to add something to the queue.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@723889 13f79535-47bb-0310-9956-ffa450edef68

17 years agoA few more properties
markt [Fri, 5 Dec 2008 17:48:41 +0000 (17:48 +0000)]
A few more properties

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@723803 13f79535-47bb-0310-9956-ffa450edef68

17 years agoQuery collection stats
fhanik [Fri, 5 Dec 2008 17:36:09 +0000 (17:36 +0000)]
Query collection stats

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@723802 13f79535-47bb-0310-9956-ffa450edef68

17 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=46247
markt [Fri, 5 Dec 2008 15:57:43 +0000 (15:57 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46247
svn property patches for trunk
Patch provided be sebb at a.o

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@723775 13f79535-47bb-0310-9956-ffa450edef68

17 years agohttps://issues.apache.org/bugzilla/show_bug.cgi?id=46232
markt [Fri, 5 Dec 2008 14:27:57 +0000 (14:27 +0000)]
https://issues.apache.org/bugzilla/show_bug.cgi?id=46232
Don't override the endorsed dir if the user has set it
Based on a patch by Russ Tokuyama

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@723738 13f79535-47bb-0310-9956-ffa450edef68

17 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=44285
markt [Thu, 4 Dec 2008 19:31:34 +0000 (19:31 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44285
Provide support for configuring the JSSE SSL session cache size and timeout

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@723404 13f79535-47bb-0310-9956-ffa450edef68

17 years agostart working on the interceptor for query stats
fhanik [Thu, 4 Dec 2008 07:07:23 +0000 (07:07 +0000)]
start working on the interceptor for query stats

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@723228 13f79535-47bb-0310-9956-ffa450edef68

17 years agofix build script
fhanik [Thu, 4 Dec 2008 07:07:01 +0000 (07:07 +0000)]
fix build script

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@723227 13f79535-47bb-0310-9956-ffa450edef68

17 years agoAdd comment and cleanup
fhanik [Thu, 4 Dec 2008 07:06:19 +0000 (07:06 +0000)]
Add comment and cleanup

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@723226 13f79535-47bb-0310-9956-ffa450edef68

17 years agoGenerics for o.a.c.users and o.a.c.util
markt [Tue, 2 Dec 2008 21:34:37 +0000 (21:34 +0000)]
Generics for o.a.c.users and o.a.c.util

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@722621 13f79535-47bb-0310-9956-ffa450edef68

17 years agoGenerics for o.a.c.valves
markt [Tue, 2 Dec 2008 19:54:06 +0000 (19:54 +0000)]
Generics for o.a.c.valves
Fix a couple of other Eclipse warnings as well

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@722589 13f79535-47bb-0310-9956-ffa450edef68

17 years agoremove some not needed test, add compile version
fhanik [Tue, 2 Dec 2008 17:11:38 +0000 (17:11 +0000)]
remove some not needed test, add compile version

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@722528 13f79535-47bb-0310-9956-ffa450edef68

17 years agoAdd fairness test to build.xml
fhanik [Tue, 2 Dec 2008 17:01:02 +0000 (17:01 +0000)]
Add fairness test to build.xml

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@722524 13f79535-47bb-0310-9956-ffa450edef68

17 years agoupdate version to next rev
fhanik [Tue, 2 Dec 2008 16:46:14 +0000 (16:46 +0000)]
update version to next rev

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@722522 13f79535-47bb-0310-9956-ffa450edef68

17 years agoimplement cancellation ability for future
fhanik [Tue, 2 Dec 2008 16:02:16 +0000 (16:02 +0000)]
implement cancellation ability for future

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@722506 13f79535-47bb-0310-9956-ffa450edef68

17 years agoAdd log formatter that outputs on a single line (except stack traces)
markt [Mon, 1 Dec 2008 13:15:37 +0000 (13:15 +0000)]
Add log formatter that outputs on a single line (except stack traces)

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@722064 13f79535-47bb-0310-9956-ffa450edef68

17 years agoGenerics changes for o.a.el
markt [Sun, 30 Nov 2008 22:32:18 +0000 (22:32 +0000)]
Generics changes for o.a.el

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@721914 13f79535-47bb-0310-9956-ffa450edef68

17 years agoAllow webapps to access org.apache.jasper.el package.
markt [Sun, 30 Nov 2008 20:14:59 +0000 (20:14 +0000)]
Allow webapps to access org.apache.jasper.el package.
I have looked through the package and I believe this change is safe although more eyes would be good. Without this permission, a handful of TCKs fail if tested with a security manager enabled.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@721886 13f79535-47bb-0310-9956-ffa450edef68

17 years agoGenerics for o.a.coyote
markt [Sun, 30 Nov 2008 15:59:48 +0000 (15:59 +0000)]
Generics for o.a.coyote

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@721835 13f79535-47bb-0310-9956-ffa450edef68

17 years agoLots of EL failures with a security manager without this.
markt [Sat, 29 Nov 2008 20:20:06 +0000 (20:20 +0000)]
Lots of EL failures with a security manager without this.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@721708 13f79535-47bb-0310-9956-ffa450edef68

17 years agoFix some TCK failures when using a security manager.
markt [Sat, 29 Nov 2008 19:01:57 +0000 (19:01 +0000)]
Fix some TCK failures when using a security manager.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@721704 13f79535-47bb-0310-9956-ffa450edef68

17 years agoGenerics changes for remainder of Jasper.
markt [Thu, 27 Nov 2008 21:54:36 +0000 (21:54 +0000)]
Generics changes for remainder of Jasper.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@721289 13f79535-47bb-0310-9956-ffa450edef68

17 years agoAdd doPrivileged block required for Servlet TCK to pass when running with a security...
markt [Thu, 27 Nov 2008 21:40:05 +0000 (21:40 +0000)]
Add doPrivileged block required for Servlet TCK to pass when running with a security manager

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@721286 13f79535-47bb-0310-9956-ffa450edef68

17 years agoGenerics fixes require change in code generated for JSPs
markt [Thu, 27 Nov 2008 00:08:32 +0000 (00:08 +0000)]
Generics fixes require change in code generated for JSPs

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@721041 13f79535-47bb-0310-9956-ffa450edef68

17 years agoUse same (more useful) jpda defaults as catalina.sh
markt [Wed, 26 Nov 2008 23:55:26 +0000 (23:55 +0000)]
Use same (more useful) jpda defaults as catalina.sh

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@721040 13f79535-47bb-0310-9956-ffa450edef68

17 years agoTabs -> 8 spaces
markt [Wed, 26 Nov 2008 21:41:03 +0000 (21:41 +0000)]
Tabs -> 8 spaces

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720991 13f79535-47bb-0310-9956-ffa450edef68

17 years agoAdd the ability to configure multiple pollers and default them to number of CPUs
fhanik [Wed, 26 Nov 2008 03:54:38 +0000 (03:54 +0000)]
Add the ability to configure multiple pollers and default them to number of CPUs

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720728 13f79535-47bb-0310-9956-ffa450edef68

17 years agoFirst attempt for SSL send file
fhanik [Wed, 26 Nov 2008 03:39:03 +0000 (03:39 +0000)]
First attempt for SSL send file

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720724 13f79535-47bb-0310-9956-ffa450edef68

17 years agoincrement version number
fhanik [Wed, 26 Nov 2008 01:16:30 +0000 (01:16 +0000)]
increment version number

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720694 13f79535-47bb-0310-9956-ffa450edef68

17 years agoAdd the ability to retrieve connection object asynchronously
fhanik [Wed, 26 Nov 2008 01:14:32 +0000 (01:14 +0000)]
Add the ability to retrieve connection object asynchronously

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720693 13f79535-47bb-0310-9956-ffa450edef68

17 years agoRemove the Driver class, its not used anymore, and if it was used, there needs to...
fhanik [Tue, 25 Nov 2008 23:37:00 +0000 (23:37 +0000)]
Remove the Driver class, its not used anymore, and if it was used, there needs to be a way to instantiate from a properties file or similar

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720668 13f79535-47bb-0310-9956-ffa450edef68

17 years agowe don't have to wrap it anymore, since the extension implements the interface directly
fhanik [Tue, 25 Nov 2008 23:23:21 +0000 (23:23 +0000)]
we don't have to wrap it anymore, since the extension implements the interface directly

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720646 13f79535-47bb-0310-9956-ffa450edef68

17 years agoClean up a bit
fhanik [Tue, 25 Nov 2008 23:04:41 +0000 (23:04 +0000)]
Clean up a bit

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720643 13f79535-47bb-0310-9956-ffa450edef68

17 years agoExtend the fair blocking queue to allow asynchronous polling
fhanik [Tue, 25 Nov 2008 22:57:24 +0000 (22:57 +0000)]
Extend the fair blocking queue to allow asynchronous polling

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720641 13f79535-47bb-0310-9956-ffa450edef68

17 years agoPool should throw a SQL exception, never return null
fhanik [Tue, 25 Nov 2008 22:56:58 +0000 (22:56 +0000)]
Pool should throw a SQL exception, never return null

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720640 13f79535-47bb-0310-9956-ffa450edef68

17 years agoAdd an extended key manager to handle a forced server alias on the tomcat NIO connector
fhanik [Tue, 25 Nov 2008 20:14:30 +0000 (20:14 +0000)]
Add an extended key manager to handle a forced server alias on the tomcat NIO connector

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720587 13f79535-47bb-0310-9956-ffa450edef68

17 years agoImplement setter for keyalias, not used yet
fhanik [Tue, 25 Nov 2008 18:00:43 +0000 (18:00 +0000)]
Implement setter for keyalias, not used yet

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720553 13f79535-47bb-0310-9956-ffa450edef68

17 years agostart to add back in features
fhanik [Mon, 24 Nov 2008 22:39:48 +0000 (22:39 +0000)]
start to add back in features

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720317 13f79535-47bb-0310-9956-ffa450edef68

17 years agoprint out some useful test data
fhanik [Mon, 24 Nov 2008 22:28:03 +0000 (22:28 +0000)]
print out some useful test data

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720313 13f79535-47bb-0310-9956-ffa450edef68

17 years agomake sure the test is time based
fhanik [Mon, 24 Nov 2008 22:21:15 +0000 (22:21 +0000)]
make sure the test is time based

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720310 13f79535-47bb-0310-9956-ffa450edef68

17 years agoFix fair blocking queue for now, we will add back the ability to not have a timeout...
fhanik [Mon, 24 Nov 2008 22:04:23 +0000 (22:04 +0000)]
Fix fair blocking queue for now, we will add back the ability to not have a timeout later

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720306 13f79535-47bb-0310-9956-ffa450edef68

17 years agouse same method names everywhere
fhanik [Mon, 24 Nov 2008 20:52:26 +0000 (20:52 +0000)]
use same method names everywhere

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720289 13f79535-47bb-0310-9956-ffa450edef68

17 years agoeclipse autocompletion is gonna kill me
fhanik [Mon, 24 Nov 2008 20:43:32 +0000 (20:43 +0000)]
eclipse autocompletion is gonna kill me

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720285 13f79535-47bb-0310-9956-ffa450edef68

17 years agofix bug
fhanik [Mon, 24 Nov 2008 20:43:15 +0000 (20:43 +0000)]
fix bug

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720284 13f79535-47bb-0310-9956-ffa450edef68

17 years agofix sample code
fhanik [Mon, 24 Nov 2008 20:42:12 +0000 (20:42 +0000)]
fix sample code

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720283 13f79535-47bb-0310-9956-ffa450edef68

17 years agoimplemented use equals attribute everywhere
fhanik [Mon, 24 Nov 2008 20:41:38 +0000 (20:41 +0000)]
implemented use equals attribute everywhere

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720282 13f79535-47bb-0310-9956-ffa450edef68

17 years agoimplement useEquals for the connection pool itself, does not apply to interceptors...
fhanik [Mon, 24 Nov 2008 20:33:17 +0000 (20:33 +0000)]
implement useEquals for the connection pool itself, does not apply to interceptors, they can manage that on their own

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720280 13f79535-47bb-0310-9956-ffa450edef68

17 years agoAdd doc, update version number
fhanik [Mon, 24 Nov 2008 19:27:37 +0000 (19:27 +0000)]
Add doc, update version number

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720267 13f79535-47bb-0310-9956-ffa450edef68

17 years agoAdd in framework for comparing on either reference or string value
fhanik [Mon, 24 Nov 2008 19:25:22 +0000 (19:25 +0000)]
Add in framework for comparing on either reference or string value

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720265 13f79535-47bb-0310-9956-ffa450edef68

17 years agoupdate changelog
fhanik [Mon, 24 Nov 2008 18:49:40 +0000 (18:49 +0000)]
update changelog

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720254 13f79535-47bb-0310-9956-ffa450edef68

17 years agodocument how interceptors work and how to configure them
fhanik [Mon, 24 Nov 2008 18:47:49 +0000 (18:47 +0000)]
document how interceptors work and how to configure them

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720253 13f79535-47bb-0310-9956-ffa450edef68

17 years agoproperly throw exception
fhanik [Mon, 24 Nov 2008 17:59:50 +0000 (17:59 +0000)]
properly throw exception

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720240 13f79535-47bb-0310-9956-ffa450edef68

17 years agoFix NPE
fhanik [Mon, 24 Nov 2008 11:32:02 +0000 (11:32 +0000)]
Fix NPE

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720173 13f79535-47bb-0310-9956-ffa450edef68

17 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=42077
markt [Sun, 23 Nov 2008 23:35:05 +0000 (23:35 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42077
Don't include nulls in iterator. Based on a patch by Mathias Broekelmann

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720069 13f79535-47bb-0310-9956-ffa450edef68

17 years agoTab police
markt [Sun, 23 Nov 2008 23:31:43 +0000 (23:31 +0000)]
Tab police

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720068 13f79535-47bb-0310-9956-ffa450edef68

17 years agoFix generics in o.a.jasper & o.a.jasper.compiler. Also a few knock-on changes in...
markt [Sun, 23 Nov 2008 21:29:46 +0000 (21:29 +0000)]
Fix generics in o.a.jasper & o.a.jasper.compiler. Also a few knock-on changes in other jasper packages.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720049 13f79535-47bb-0310-9956-ffa450edef68

17 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=42693
markt [Sun, 23 Nov 2008 21:25:22 +0000 (21:25 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42693
I want to do some more testing before proposing this one

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720046 13f79535-47bb-0310-9956-ffa450edef68

17 years agoGenerics fixes for o.a.jk
markt [Sun, 23 Nov 2008 13:49:26 +0000 (13:49 +0000)]
Generics fixes for o.a.jk

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@719988 13f79535-47bb-0310-9956-ffa450edef68

17 years agoAdd ability to customize wait plan
fhanik [Sat, 22 Nov 2008 23:13:05 +0000 (23:13 +0000)]
Add ability to customize wait plan

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@719936 13f79535-47bb-0310-9956-ffa450edef68

17 years agoo.a.juli generics
markt [Sat, 22 Nov 2008 11:30:47 +0000 (11:30 +0000)]
o.a.juli generics

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@719837 13f79535-47bb-0310-9956-ffa450edef68

17 years agoRemove deprecated code.
markt [Sat, 22 Nov 2008 11:19:43 +0000 (11:19 +0000)]
Remove deprecated code.
Some code made private rather than removed based on code comments.
Calls to deprecated methods changed to use appropriate replacements.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@719835 13f79535-47bb-0310-9956-ffa450edef68

17 years agoadd async call template, not sure how it will work, but I will know soon
fhanik [Fri, 21 Nov 2008 21:06:44 +0000 (21:06 +0000)]
add async call template, not sure how it will work, but I will know soon
make sure that timewait is a positive value, 0 being the lowest

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@719711 13f79535-47bb-0310-9956-ffa450edef68

17 years agoFix dynamic thread resizing
fhanik [Fri, 21 Nov 2008 16:31:45 +0000 (16:31 +0000)]
Fix dynamic thread resizing

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@719626 13f79535-47bb-0310-9956-ffa450edef68

17 years agoMake size of all threads pools dynamically configurable
markt [Fri, 21 Nov 2008 15:46:12 +0000 (15:46 +0000)]
Make size of all threads pools dynamically configurable

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@719602 13f79535-47bb-0310-9956-ffa450edef68

17 years agoRemove deprecated code in digester (it was this bit that broke the build previously).
markt [Fri, 21 Nov 2008 09:45:31 +0000 (09:45 +0000)]
Remove deprecated code in digester (it was this bit that broke the build previously).
Modify all classes that overrode deprecated methods to override the new methods.
Add a note to the change log about backwards compatibility or lack thereof.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@719551 13f79535-47bb-0310-9956-ffa450edef68

17 years agoMake private / remove deprecated methods
markt [Fri, 21 Nov 2008 09:36:09 +0000 (09:36 +0000)]
Make private / remove deprecated methods

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@719550 13f79535-47bb-0310-9956-ffa450edef68

17 years agoClean up
markt [Fri, 21 Nov 2008 09:33:44 +0000 (09:33 +0000)]
Clean up
Replace deprecated method calls

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@719549 13f79535-47bb-0310-9956-ffa450edef68

17 years agotimeout of 0 means we return right away
fhanik [Fri, 21 Nov 2008 05:22:14 +0000 (05:22 +0000)]
timeout of 0 means we return right away

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@719481 13f79535-47bb-0310-9956-ffa450edef68

17 years agoRevert r718819 that completely broke Tomcat.
markt [Thu, 20 Nov 2008 08:19:23 +0000 (08:19 +0000)]
Revert r718819 that completely broke Tomcat.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@719194 13f79535-47bb-0310-9956-ffa450edef68

17 years agoGenerics for o.a.naming.*
markt [Thu, 20 Nov 2008 01:39:30 +0000 (01:39 +0000)]
Generics for o.a.naming.*
A little messy in places due to differences in env handling. Properties, Hashtable<?,?>, Hashtable<String,Object> and Hashtable<String,String) are all used and in a few places it is necessary to cast from one to the other.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@719153 13f79535-47bb-0310-9956-ffa450edef68

17 years agoRelax generics checks otherwise an call with a Properties object will not compile.
markt [Thu, 20 Nov 2008 00:10:48 +0000 (00:10 +0000)]
Relax generics checks otherwise an call with a Properties object will not compile.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@719136 13f79535-47bb-0310-9956-ffa450edef68

17 years agoFix SEND_FILE bug, with Java NIO you can only change the key interest ops on the...
fhanik [Wed, 19 Nov 2008 23:39:17 +0000 (23:39 +0000)]
Fix SEND_FILE bug, with Java NIO you can only change the key interest ops on the poller thread, so we have to make sure we fire off an event

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@719129 13f79535-47bb-0310-9956-ffa450edef68

17 years agoFix generics and use of deprecated field
markt [Wed, 19 Nov 2008 23:16:05 +0000 (23:16 +0000)]
Fix generics and use of deprecated field

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@719125 13f79535-47bb-0310-9956-ffa450edef68

17 years agoDeprecate class that is no longer used.
markt [Wed, 19 Nov 2008 23:15:08 +0000 (23:15 +0000)]
Deprecate class that is no longer used.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@719124 13f79535-47bb-0310-9956-ffa450edef68

17 years agoDeprecate classes that are no longer used.
markt [Wed, 19 Nov 2008 23:07:20 +0000 (23:07 +0000)]
Deprecate classes that are no longer used.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@719119 13f79535-47bb-0310-9956-ffa450edef68

17 years agoMore generics fixes
markt [Wed, 19 Nov 2008 23:03:01 +0000 (23:03 +0000)]
More generics fixes

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@719117 13f79535-47bb-0310-9956-ffa450edef68

17 years agofix NPE risk
fhanik [Wed, 19 Nov 2008 22:26:06 +0000 (22:26 +0000)]
fix NPE risk

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@719096 13f79535-47bb-0310-9956-ffa450edef68

17 years agokeep the correct default value
fhanik [Wed, 19 Nov 2008 22:14:57 +0000 (22:14 +0000)]
keep the correct default value

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@719093 13f79535-47bb-0310-9956-ffa450edef68

17 years agoTab police
markt [Wed, 19 Nov 2008 22:14:47 +0000 (22:14 +0000)]
Tab police

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@719092 13f79535-47bb-0310-9956-ffa450edef68

17 years agoremove debug stuff that should not be there
fhanik [Wed, 19 Nov 2008 00:44:57 +0000 (00:44 +0000)]
remove debug stuff that should not be there

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@718824 13f79535-47bb-0310-9956-ffa450edef68

17 years agoRemove deprecation. Generics changes removed the issue.
markt [Wed, 19 Nov 2008 00:43:15 +0000 (00:43 +0000)]
Remove deprecation. Generics changes removed the issue.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@718821 13f79535-47bb-0310-9956-ffa450edef68

17 years agoRemove deprecated methods. (In a few places public methods become private)
markt [Wed, 19 Nov 2008 00:39:04 +0000 (00:39 +0000)]
Remove deprecated methods. (In a few places public methods become private)
In the few places they are used, replace the call to the deprecated method with an appropriate alternative.
Should be no functional change.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@718819 13f79535-47bb-0310-9956-ffa450edef68

17 years agoKnock-on generics changes from digester commit
markt [Tue, 18 Nov 2008 23:36:34 +0000 (23:36 +0000)]
Knock-on generics changes from digester commit

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@718796 13f79535-47bb-0310-9956-ffa450edef68

17 years agoRemaining generics changes in o.a.tomcat.util
markt [Tue, 18 Nov 2008 23:29:05 +0000 (23:29 +0000)]
Remaining generics changes in o.a.tomcat.util
No nasty surprises. Should be no functional impact.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@718766 13f79535-47bb-0310-9956-ffa450edef68

17 years agoClean up debug a bit while troubleshooting
fhanik [Tue, 18 Nov 2008 03:18:30 +0000 (03:18 +0000)]
Clean up debug a bit while troubleshooting

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@718474 13f79535-47bb-0310-9956-ffa450edef68

17 years agoGenerics changes for o.a.t.util.modeler
markt [Tue, 18 Nov 2008 00:47:36 +0000 (00:47 +0000)]
Generics changes for o.a.t.util.modeler
These changes identified a bunch of issues, the most serious of which was the loadDescriptors() method that sometimes returned List<ObjectName> and sometimes List<ManagedBean>. Some callers expected this, some didn't.
There are comments in the code identifying this as an issue. The fix I applied aligns with some commented out code that may have been part of an intended fix. There are still some deprecated methods that need to be cleaned up.
With these changes Tomcat starts without error and JConsole shows all the mbeans I expect to see.
There is plenty of further clean-up required here but I'll do that separately after the generics.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@718452 13f79535-47bb-0310-9956-ffa450edef68

17 years agoNeed to make sure configBase exists. WAR deployment has this check. DIR deployment...
markt [Mon, 17 Nov 2008 23:30:32 +0000 (23:30 +0000)]
Need to make sure configBase exists. WAR deployment has this check. DIR deployment needs it too.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@718436 13f79535-47bb-0310-9956-ffa450edef68

17 years agosocket properties NPE fixes
fhanik [Mon, 17 Nov 2008 23:00:23 +0000 (23:00 +0000)]
socket properties NPE fixes

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@718428 13f79535-47bb-0310-9956-ffa450edef68

17 years agoRemove references to admin and balancer webapps and an unused task
markt [Mon, 17 Nov 2008 20:18:55 +0000 (20:18 +0000)]
Remove references to admin and balancer webapps and an unused task

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@718360 13f79535-47bb-0310-9956-ffa450edef68

17 years agoAdd first stab in letting interceptors have dynamic attributes
fhanik [Mon, 17 Nov 2008 04:42:57 +0000 (04:42 +0000)]
Add first stab in letting interceptors have dynamic attributes

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@718171 13f79535-47bb-0310-9956-ffa450edef68

17 years agoAdd timeout test
fhanik [Mon, 17 Nov 2008 04:42:29 +0000 (04:42 +0000)]
Add timeout test

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@718170 13f79535-47bb-0310-9956-ffa450edef68

17 years agoUpdate changelog to show all changes in trunk that have not been proposed for 6.0.x
markt [Sun, 16 Nov 2008 23:09:13 +0000 (23:09 +0000)]
Update changelog to show all changes in trunk that have not been proposed for 6.0.x
If any backports for 6.0.x fail to achieve 3 +1s, need to include change in this file.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@718141 13f79535-47bb-0310-9956-ffa450edef68

17 years agoRevert accidental changes in r718133
markt [Sun, 16 Nov 2008 23:07:52 +0000 (23:07 +0000)]
Revert accidental changes in r718133

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@718140 13f79535-47bb-0310-9956-ffa450edef68

17 years agoFar faster than I was expecting - the diff is complete. Remove the temp tracking...
markt [Sun, 16 Nov 2008 22:42:43 +0000 (22:42 +0000)]
Far faster than I was expecting - the diff is complete. Remove the temp tracking file.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@718133 13f79535-47bb-0310-9956-ffa450edef68

17 years agoPort sendfile fix from 6.0.x to trunk
markt [Sun, 16 Nov 2008 20:54:03 +0000 (20:54 +0000)]
Port sendfile fix from 6.0.x to trunk

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@718115 13f79535-47bb-0310-9956-ffa450edef68

17 years agoel was simple. jasper will take longer
markt [Sun, 16 Nov 2008 17:33:38 +0000 (17:33 +0000)]
el was simple. jasper will take longer

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@718066 13f79535-47bb-0310-9956-ffa450edef68