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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
markt [Sun, 16 Nov 2008 17:28:26 +0000 (17:28 +0000)]
Remove pointless brackets
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@718063
13f79535-47bb-0310-9956-
ffa450edef68
markt [Sun, 16 Nov 2008 14:51:21 +0000 (14:51 +0000)]
o.a.coyote review complete
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@718042
13f79535-47bb-0310-9956-
ffa450edef68
markt [Sun, 16 Nov 2008 14:08:02 +0000 (14:08 +0000)]
o.a.catalina review complete
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@718033
13f79535-47bb-0310-9956-
ffa450edef68
markt [Sun, 16 Nov 2008 12:42:43 +0000 (12:42 +0000)]
Fix comment typos
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@718014
13f79535-47bb-0310-9956-
ffa450edef68
markt [Sun, 16 Nov 2008 12:17:28 +0000 (12:17 +0000)]
Document that shutdown address is configurable.
Add note re how to disable this completely.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@718011
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Sun, 16 Nov 2008 03:50:09 +0000 (03:50 +0000)]
Fix test case
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@717976
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Sun, 16 Nov 2008 03:43:21 +0000 (03:43 +0000)]
make sure we clean up
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@717975
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Sun, 16 Nov 2008 03:41:42 +0000 (03:41 +0000)]
Make sure it compiles with JDK1.5, this is one of the times you wish you had preprocessor statements
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@717974
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Sun, 16 Nov 2008 03:26:29 +0000 (03:26 +0000)]
Added an interceptor that keeps track of statements, and if they are not closed, then they will be closed automatically
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@717972
13f79535-47bb-0310-9956-
ffa450edef68
markt [Sun, 16 Nov 2008 01:16:56 +0000 (01:16 +0000)]
A few more simple dirs completed.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@717958
13f79535-47bb-0310-9956-
ffa450edef68
markt [Sun, 16 Nov 2008 01:10:53 +0000 (01:10 +0000)]
Sync docs in trunk with 6.0.x
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@717957
13f79535-47bb-0310-9956-
ffa450edef68
markt [Sun, 16 Nov 2008 00:30:19 +0000 (00:30 +0000)]
Add jfclere's cookie test fixes to trunk. Merge of r633793.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@717950
13f79535-47bb-0310-9956-
ffa450edef68
markt [Sat, 15 Nov 2008 20:24:08 +0000 (20:24 +0000)]
And another easy one
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@717926
13f79535-47bb-0310-9956-
ffa450edef68
markt [Sat, 15 Nov 2008 20:15:08 +0000 (20:15 +0000)]
Another easy one. I'll have to start /java at some point ;)
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@717924
13f79535-47bb-0310-9956-
ffa450edef68
markt [Sat, 15 Nov 2008 20:00:27 +0000 (20:00 +0000)]
/conf was quick too
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@717923
13f79535-47bb-0310-9956-
ffa450edef68
markt [Sat, 15 Nov 2008 19:57:25 +0000 (19:57 +0000)]
/bin was quick :)
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@717922
13f79535-47bb-0310-9956-
ffa450edef68
markt [Sat, 15 Nov 2008 19:55:02 +0000 (19:55 +0000)]
Update diff status
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@717921
13f79535-47bb-0310-9956-
ffa450edef68
markt [Sat, 15 Nov 2008 19:52:04 +0000 (19:52 +0000)]
Sync BUILDING.txt
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@717920
13f79535-47bb-0310-9956-
ffa450edef68
markt [Sat, 15 Nov 2008 19:09:15 +0000 (19:09 +0000)]
Remove unused file.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@717914
13f79535-47bb-0310-9956-
ffa450edef68
markt [Sat, 15 Nov 2008 18:40:10 +0000 (18:40 +0000)]
Remove the tomcat 6 parts of the change log
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@717909
13f79535-47bb-0310-9956-
ffa450edef68
markt [Sat, 15 Nov 2008 18:12:15 +0000 (18:12 +0000)]
Merge r613809 from 6.0.x
FarmWarDeployer can only be configured as host sub-element
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@717902
13f79535-47bb-0310-9956-
ffa450edef68
markt [Sat, 15 Nov 2008 13:27:34 +0000 (13:27 +0000)]
Add temp file to track diff status
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@714253
13f79535-47bb-0310-9956-
ffa450edef68
markt [Sat, 15 Nov 2008 12:59:01 +0000 (12:59 +0000)]
Update KEYS with changes from 6.0.x (Remy updated his key)
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@714246
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Sat, 15 Nov 2008 03:51:51 +0000 (03:51 +0000)]
Only apply state once, so if the connection state interceptor is not applied, then we need to do it in the pool
Add abstract interceptor to handle statement wrappers and creation, to be used later when we do a clean up and performance interceptor
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@714217
13f79535-47bb-0310-9956-
ffa450edef68
billbarker [Sat, 15 Nov 2008 02:30:12 +0000 (02:30 +0000)]
If we know we are closing the connection, don't drain input.
This way uploading a 100GB file doesn't tie up the thread
if the servlet has rejected it.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@714214
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Fri, 14 Nov 2008 15:42:47 +0000 (15:42 +0000)]
fix spacing issues
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@714040
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Fri, 14 Nov 2008 15:33:39 +0000 (15:33 +0000)]
A disconnect should not throw an error
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@714036
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Fri, 14 Nov 2008 15:19:25 +0000 (15:19 +0000)]
forgot to save file before checkin
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@714028
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Fri, 14 Nov 2008 15:18:19 +0000 (15:18 +0000)]
use atomic counters
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@714027
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Fri, 14 Nov 2008 14:59:10 +0000 (14:59 +0000)]
initialize root cause of an exception
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@714023
13f79535-47bb-0310-9956-
ffa450edef68
mturk [Fri, 14 Nov 2008 13:49:14 +0000 (13:49 +0000)]
Do not throw attribute value.
Patch provided by Tomaz Cerar cerar at parsek.com
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@714002
13f79535-47bb-0310-9956-
ffa450edef68
mturk [Fri, 14 Nov 2008 08:54:58 +0000 (08:54 +0000)]
When throwing Non-serializable exception, mark which argument was non-serializable to help tracing the cause when developing.
Needs localization to other local properties files.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@713953
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Fri, 14 Nov 2008 00:55:59 +0000 (00:55 +0000)]
increment build number and control it from build file at this point
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@713889
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Fri, 14 Nov 2008 00:44:19 +0000 (00:44 +0000)]
Added helper script to sign releases
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@713887
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Thu, 13 Nov 2008 23:54:31 +0000 (23:54 +0000)]
Add a change log to the module
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@713869
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Thu, 13 Nov 2008 18:59:24 +0000 (18:59 +0000)]
fix for calling close multiple times
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@713787
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Thu, 13 Nov 2008 18:02:35 +0000 (18:02 +0000)]
Fix connection state, make it smarter and faster.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@713763
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Wed, 12 Nov 2008 21:50:03 +0000 (21:50 +0000)]
Updated documentation and added wrappers for toString and added an example
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@713522
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Tue, 11 Nov 2008 20:00:26 +0000 (20:00 +0000)]
Fix socket properties usage so that we can decide if we want to accept the default value or if we want to use a preset value
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@713144
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Tue, 11 Nov 2008 17:12:18 +0000 (17:12 +0000)]
oops
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@713086
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Tue, 11 Nov 2008 15:58:23 +0000 (15:58 +0000)]
Move the bayeux to a separate module
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@713070
13f79535-47bb-0310-9956-
ffa450edef68
markt [Mon, 10 Nov 2008 23:03:48 +0000 (23:03 +0000)]
Remove out of date file from trunk
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@712864
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Mon, 10 Nov 2008 17:14:41 +0000 (17:14 +0000)]
Last bit of my ego goes away
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@712702
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Mon, 10 Nov 2008 17:09:40 +0000 (17:09 +0000)]
Added test case to test two concurrent datasources, fixed the flag to turn on the sweeper
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@712701
13f79535-47bb-0310-9956-
ffa450edef68
markt [Sun, 9 Nov 2008 01:57:34 +0000 (01:57 +0000)]
Fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=42707
I debated adding the addContainerListener() meethod to JMX. I'll leave it a little while for people to comment on this (or anything else) before I propose this one for 6.0.x.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@712467
13f79535-47bb-0310-9956-
ffa450edef68
markt [Sun, 9 Nov 2008 01:45:26 +0000 (01:45 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42747
I've tested this with all the combinations I could think of and ensured that the order of the redploy resources is consistent. The summary of changes is:
- context.xml takes effect on first deploy rather than next restart
- context.xml from DIR is now copied to conf/<eng>/<host> in the same manner as context.xml from WAR
I also fixed a couple of edge cases I spotted and changed a few local variables to make the code easier to understand.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@712464
13f79535-47bb-0310-9956-
ffa450edef68
markt [Sun, 9 Nov 2008 01:35:58 +0000 (01:35 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42673
Correctly handle includes with multi-level contexts
Patch provided by Peter Jodeleit
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@712461
13f79535-47bb-0310-9956-
ffa450edef68
pero [Fri, 7 Nov 2008 21:40:37 +0000 (21:40 +0000)]
Fix NPE to use Http11NioProtocol handler with default parameters!
# example:
<Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
maxThreads="150" minSpareThreads="4"/>
<Connector executor="tomcatThreadPool"
port="8080" protocol="org.apache.coyote.http11.Http11NioProtocol"
connectionTimeout="20000"
redirectPort="8443" />
Used at MAC OS X with "-Djava.net.preferIPv4Stack=true"
I am not sure that default returns are correct!
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@712278
13f79535-47bb-0310-9956-
ffa450edef68
pero [Fri, 7 Nov 2008 21:29:21 +0000 (21:29 +0000)]
FIX possible NPE as Engine level configuration, as context dosen't exists!
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@712274
13f79535-47bb-0310-9956-
ffa450edef68
rjung [Fri, 7 Nov 2008 04:01:05 +0000 (04:01 +0000)]
This belongs to r711934. Property version nww
gets calculated, so remove it from build.properties
and add the version.suffix instead.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@712053
13f79535-47bb-0310-9956-
ffa450edef68
rjung [Fri, 7 Nov 2008 01:59:04 +0000 (01:59 +0000)]
Allow binding as user to directory instead
of anonymous or fixed user/password access.
Useful especially in an AD setup.
Needs more testing.
Should fix BZ45794 and BZ19444.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@712038
13f79535-47bb-0310-9956-
ffa450edef68
rjung [Fri, 7 Nov 2008 00:48:13 +0000 (00:48 +0000)]
Move curUserPattern from a global variable to
a method variable.
Not necessary at the moment, because the realm
is mostly synchronized, but being global doesn't
help and will hurt once we implement connection
pooling and concurrent usage for the realm.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@712024
13f79535-47bb-0310-9956-
ffa450edef68
rjung [Fri, 7 Nov 2008 00:20:06 +0000 (00:20 +0000)]
Whitespace cleanup and two new debug messages.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@712019
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Thu, 6 Nov 2008 21:52:40 +0000 (21:52 +0000)]
Modify build script to generate a distribution
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@711985
13f79535-47bb-0310-9956-
ffa450edef68
rjung [Thu, 6 Nov 2008 18:34:50 +0000 (18:34 +0000)]
Using @-patterns in the non-docs files and
ant filters to replace the major version and also
major.minor.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@711934
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Thu, 6 Nov 2008 18:25:49 +0000 (18:25 +0000)]
Improve documentation
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@711932
13f79535-47bb-0310-9956-
ffa450edef68
rjung [Wed, 5 Nov 2008 22:15:53 +0000 (22:15 +0000)]
Now make the classes checking session idleness
use thisAccessedTime.
This is not for invalidation, only for displaying
idle times and making persistance decisions.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@711720
13f79535-47bb-0310-9956-
ffa450edef68
rjung [Wed, 5 Nov 2008 22:11:04 +0000 (22:11 +0000)]
Now expose thisAccessedTime via the session interface
and ManagerBase, so we can use it from outside the session.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@711716
13f79535-47bb-0310-9956-
ffa450edef68
rjung [Wed, 5 Nov 2008 22:05:24 +0000 (22:05 +0000)]
This one gets inherited from StandardSession.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@711714
13f79535-47bb-0310-9956-
ffa450edef68
rjung [Wed, 5 Nov 2008 21:56:52 +0000 (21:56 +0000)]
Give thisAccessedTime and lastAccessedTime for sessions
a clear semantics:
- thisAccessedTime will be updated at the beginning and
at the end of session use
- lastAccessedTime will only be updated at the end of
session use
This means:
- lastAccessedTime is the last access time of a session
disregarding any request still being processed on.
So this is good to use even from within a request
to detect when its own session has been used last before.
- thisAccessedTime already gets updated when a new request
disregarding any request still being processed on.
So this is better for any idleness check or information.
- thisAccessedTime >= lastAccessedTime always
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@711711
13f79535-47bb-0310-9956-
ffa450edef68
rjung [Wed, 5 Nov 2008 20:50:34 +0000 (20:50 +0000)]
Whitespace and indentation cleanup.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@711695
13f79535-47bb-0310-9956-
ffa450edef68
markt [Wed, 5 Nov 2008 16:17:16 +0000 (16:17 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46011
Make Principal accessible (if set) via Subject.getSubject(AccessController.getContext()) when processing filters.
Based on a patch provided by tsveg1
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@711600
13f79535-47bb-0310-9956-
ffa450edef68
projects / tomcat7.0 / log