tomcat7.0
16 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=38797
markt [Sun, 5 Jul 2009 11:30:22 +0000 (11:30 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38797
Revert previous fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=37933 and implement an alternative that doesn't have the side effects described in 38797

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

16 years agoRevert generics changes that require changes in spec classes
markt [Sun, 5 Jul 2009 11:11:57 +0000 (11:11 +0000)]
Revert generics changes that require changes in spec classes

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

16 years agoSpecify explicit encoding when performing replace task.
kkolinko [Sun, 5 Jul 2009 00:17:22 +0000 (00:17 +0000)]
Specify explicit encoding when performing replace task.

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

16 years agoFix generics warnings
kkolinko [Sat, 4 Jul 2009 23:10:05 +0000 (23:10 +0000)]
Fix generics warnings

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

16 years agoAdded **/*.rtf to the list of exclusions and sorted it alphabetically.
kkolinko [Sat, 4 Jul 2009 22:58:08 +0000 (22:58 +0000)]
Added **/*.rtf to the list of exclusions and sorted it alphabetically.
(We have a License.rtf file)

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

16 years agoDeprecation fixes
markt [Sat, 4 Jul 2009 15:59:05 +0000 (15:59 +0000)]
Deprecation fixes

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

16 years agoRemove some unused code
markt [Sat, 4 Jul 2009 15:55:48 +0000 (15:55 +0000)]
Remove some unused code

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

16 years agoFix generics warnings
markt [Sat, 4 Jul 2009 15:46:47 +0000 (15:46 +0000)]
Fix generics warnings

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

16 years agoExplicitly specify encoding for the source files
kkolinko [Sat, 4 Jul 2009 00:06:05 +0000 (00:06 +0000)]
Explicitly specify encoding for the source files
Fixes https://issues.apache.org/bugzilla/show_bug.cgi?id=47149

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

16 years agoMove everyone MarkMail says hasn't committed to trunk to retired. Crude, but results...
markt [Fri, 3 Jul 2009 06:55:26 +0000 (06:55 +0000)]
Move everyone MarkMail says hasn't committed to trunk to retired. Crude, but results match what I expected.

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

16 years agoAdd me. Needs more cleanup for TC7
markt [Fri, 3 Jul 2009 06:44:52 +0000 (06:44 +0000)]
Add me. Needs more cleanup for TC7

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

16 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=47443
markt [Fri, 3 Jul 2009 06:41:40 +0000 (06:41 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47443
Point to wiki for support rather than non-existent Jakarta page

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

16 years agobreak out javadoc into its own target
fhanik [Thu, 2 Jul 2009 17:35:26 +0000 (17:35 +0000)]
break out javadoc into its own target

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

16 years agoAdd some doco, make shared variables volatile
fhanik [Thu, 2 Jul 2009 17:08:50 +0000 (17:08 +0000)]
Add some doco, make shared variables volatile

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

16 years agoSince testing is an optional feature, as Sebb said, we don't need the licenses defined
fhanik [Thu, 2 Jul 2009 15:02:19 +0000 (15:02 +0000)]
Since testing is an optional feature, as Sebb said, we don't need the licenses defined

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

16 years agoBe consistent - use singular rather than plural
markt [Thu, 2 Jul 2009 08:15:15 +0000 (08:15 +0000)]
Be consistent - use singular rather than plural

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

16 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=37984
markt [Wed, 1 Jul 2009 22:13:33 +0000 (22:13 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37984
Strip {MD5} as well as {SHA} from digested passwords

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

16 years agoRemove unused import
markt [Wed, 1 Jul 2009 22:08:43 +0000 (22:08 +0000)]
Remove unused import

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

16 years agoRemove some obsolete (and partially broken)
rjung [Tue, 30 Jun 2009 20:48:05 +0000 (20:48 +0000)]
Remove some obsolete (and partially broken)
message strings.

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

16 years agoCorrect url
fhanik [Tue, 30 Jun 2009 20:42:17 +0000 (20:42 +0000)]
Correct url

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

16 years agoRevert r784853 - it broke most of the links in the left hand navigation menu for...
markt [Tue, 30 Jun 2009 20:16:32 +0000 (20:16 +0000)]
Revert r784853 - it broke most of the links in the left hand navigation menu for the docs

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

16 years agoApply patch by sebb from
fhanik [Tue, 30 Jun 2009 19:15:28 +0000 (19:15 +0000)]
Apply patch by sebb from
https://issues.apache.org/bugzilla/show_bug.cgi?id=47458
Store db properties in build.properties using a prefix of testdb

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

16 years agoUse statics to reduce number of instances to one per thread rather than one per threa...
markt [Tue, 30 Jun 2009 18:30:45 +0000 (18:30 +0000)]
Use statics to reduce number of instances to one per thread rather than one per thread per access log.
Also make thread local final as per discussion on dev list.

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

16 years agoRemove all usage of GPL or LGPL downloads.
fhanik [Mon, 29 Jun 2009 17:38:21 +0000 (17:38 +0000)]
Remove all usage of GPL or LGPL downloads.
Use H2 for test database (EPL1.0) as it can be downloaded and easily embedded.
Derby didn't work, too slow to populate test data with.
Add Javadoc per Sebb's suggestion.
Add EPL and CPL to LICENSE since we use it in the unit test cases.

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

16 years agoAdd props changes missed in r789389
markt [Mon, 29 Jun 2009 17:27:35 +0000 (17:27 +0000)]
Add props changes missed in r789389

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

16 years agoFix the JDBC driver clean-up. This was broken with the latest 1.4.x, 1.5.x and 1...
markt [Mon, 29 Jun 2009 17:20:24 +0000 (17:20 +0000)]
Fix the JDBC driver clean-up. This was broken with the latest 1.4.x, 1.5.x and 1.6.x JVMs as they checked if the classloader of the caller, which for the WebappClassLoader was the common loader.
It's not pretty, so there are plenty of comments explaining what is going on.

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

16 years agoMake alphabetical
markt [Mon, 29 Jun 2009 16:06:11 +0000 (16:06 +0000)]
Make alphabetical

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

16 years agoMake properties configurable and resolve https://issues.apache.org/bugzilla/show_bug...
fhanik [Mon, 29 Jun 2009 14:36:57 +0000 (14:36 +0000)]
Make properties configurable and resolve https://issues.apache.org/bugzilla/show_bug.cgi?id=47440

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

16 years agoBetter error message according to
fhanik [Sun, 28 Jun 2009 15:58:13 +0000 (15:58 +0000)]
Better error message according to
https://issues.apache.org/bugzilla/show_bug.cgi?id=47439

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

16 years agoAdjust Main
costin [Thu, 25 Jun 2009 15:22:55 +0000 (15:22 +0000)]
Adjust Main

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

16 years agoAdjusting the tests
costin [Thu, 25 Jun 2009 15:16:44 +0000 (15:16 +0000)]
Adjusting the tests

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

16 years ago- added new methods stups from servlet, so it compiles
costin [Thu, 25 Jun 2009 15:00:52 +0000 (15:00 +0000)]
- added new methods stups from servlet, so it compiles
- removed all deps on coyote, it can now run with the new async connector from sandbox ( still need to update ). Coyote is still the default
- various cleanups in the simple/example integration support
- still passes all watchdog servlet and all but 7 jsp tests
- more separation between the servlets/filters and the engine - and few tweaks to allow file servlet to be used in other containers.

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

16 years agoVery minor niggle
markt [Wed, 24 Jun 2009 20:56:19 +0000 (20:56 +0000)]
Very minor niggle

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

16 years agoAnt doesn't merge two zipfilesets
mturk [Wed, 24 Jun 2009 14:53:06 +0000 (14:53 +0000)]
Ant doesn't merge two zipfilesets

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

16 years agoDo not evaluate the same string twice.
kkolinko [Wed, 24 Jun 2009 11:44:45 +0000 (11:44 +0000)]
Do not evaluate the same string twice.

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

16 years agoUpdated the changelog
kkolinko [Wed, 24 Jun 2009 11:28:14 +0000 (11:28 +0000)]
Updated the changelog

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

16 years agoUpdated Jasper runtime and JspC to use "1.6" as the values for compilerSourceVM,...
kkolinko [Wed, 24 Jun 2009 11:17:24 +0000 (11:17 +0000)]
Updated Jasper runtime and JspC to use "1.6" as the values for compilerSourceVM, compilerTargetVM options by default,
as Tomcat 7 runs on JRE 1.6+

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

16 years agoRevert r787678. Needs a rethink as Catalina TLD scanning did not require a URLClassLo...
markt [Tue, 23 Jun 2009 19:31:39 +0000 (19:31 +0000)]
Revert r787678. Needs a rethink as Catalina TLD scanning did not require a URLClassLoader whereas the Jasper code does.

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

16 years agoUse correct encoding for error/debug messages include parameter bytes
markt [Tue, 23 Jun 2009 18:04:43 +0000 (18:04 +0000)]
Use correct encoding for error/debug messages include parameter bytes

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

16 years agoFix the if/else. Thanks Konstanting for spotting that
mturk [Tue, 23 Jun 2009 16:58:48 +0000 (16:58 +0000)]
Fix the if/else. Thanks Konstanting for spotting that

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

16 years agofix typos
fhanik [Tue, 23 Jun 2009 15:37:24 +0000 (15:37 +0000)]
fix typos

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

16 years agoUse correct return values from FindCpuType function
mturk [Tue, 23 Jun 2009 15:34:22 +0000 (15:34 +0000)]
Use correct return values from FindCpuType function

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

16 years agoshorten timeout
fhanik [Tue, 23 Jun 2009 14:48:06 +0000 (14:48 +0000)]
shorten timeout

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

16 years agoOnly test timeout
fhanik [Tue, 23 Jun 2009 14:47:28 +0000 (14:47 +0000)]
Only test timeout

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

16 years agoFix slow query report to keep stats if we set the count to larger than 0
fhanik [Tue, 23 Jun 2009 14:44:24 +0000 (14:44 +0000)]
Fix slow query report to keep stats if we set the count to larger than 0

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

16 years agoWrapped and shortened lines, to lessen horizontal scrolling.
kkolinko [Tue, 23 Jun 2009 14:37:27 +0000 (14:37 +0000)]
Wrapped and shortened lines, to lessen horizontal scrolling.
Replaced tabs with spaces in one of <source/> fragments, because tabs result in misalignment of box border in Firefox 3.

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

16 years agoDont try to run the base test
fhanik [Tue, 23 Jun 2009 14:29:00 +0000 (14:29 +0000)]
Dont try to run the base test

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

16 years agoFix halfway test
fhanik [Tue, 23 Jun 2009 14:14:01 +0000 (14:14 +0000)]
Fix halfway test

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

16 years agoFix message
fhanik [Tue, 23 Jun 2009 14:02:58 +0000 (14:02 +0000)]
Fix message

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

16 years agoAlign TLD scanning code between Jasper & Catalina (make Catalina like Jasper)
markt [Tue, 23 Jun 2009 14:02:48 +0000 (14:02 +0000)]
Align TLD scanning code between Jasper & Catalina (make Catalina like Jasper)
- Still two copies (no easy way to avoid that) but at least only a single algorithm
- Adds support for JAR URLs (useful when embedding) to TldConfig
- Add comments to remind people to keep code in sync
- JSP TCK passes

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

16 years agoExclipse download location changed. The previous now returns 404
mturk [Tue, 23 Jun 2009 13:56:50 +0000 (13:56 +0000)]
Exclipse download location changed. The previous now returns 404

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

16 years agoMake a default build target that builds automatically without need to know what.
fhanik [Tue, 23 Jun 2009 13:54:38 +0000 (13:54 +0000)]
Make a default build target that builds automatically without need to know what.

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

16 years agoRemove call that doesn't do anything.
markt [Tue, 23 Jun 2009 13:54:13 +0000 (13:54 +0000)]
Remove call that doesn't do anything.

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

16 years agoFix typo
markt [Tue, 23 Jun 2009 11:57:53 +0000 (11:57 +0000)]
Fix typo

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

16 years agoRemove a couple of unused classes
markt [Tue, 23 Jun 2009 11:44:26 +0000 (11:44 +0000)]
Remove a couple of unused classes

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

16 years agoClean up the debug logging impl
markt [Tue, 23 Jun 2009 11:38:05 +0000 (11:38 +0000)]
Clean up the debug logging impl

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

16 years agoRemove some unused code, some of which appears to date from Tomcat 3.
markt [Tue, 23 Jun 2009 11:34:43 +0000 (11:34 +0000)]
Remove some unused code, some of which appears to date from Tomcat 3.

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

16 years agoOnly copy the original parameters is debug is enabled. Otherwise, live with the corru...
markt [Tue, 23 Jun 2009 10:48:53 +0000 (10:48 +0000)]
Only copy the original parameters is debug is enabled. Otherwise, live with the corruption but tell user how to get non-corrupted data

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

16 years agoUse correct CPU names
mturk [Tue, 23 Jun 2009 09:47:13 +0000 (09:47 +0000)]
Use correct CPU names

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

16 years agoUse correct directoy names for exclusion
mturk [Tue, 23 Jun 2009 07:43:17 +0000 (07:43 +0000)]
Use correct directoy names for exclusion

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

16 years agoImplement new windows-[cpu].zip ditribution packages
mturk [Tue, 23 Jun 2009 07:41:28 +0000 (07:41 +0000)]
Implement new windows-[cpu].zip ditribution packages

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

16 years agoDon't create the test table during the run
fhanik [Mon, 22 Jun 2009 20:51:57 +0000 (20:51 +0000)]
Don't create the test table during the run

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

16 years agoAdd in test runner
fhanik [Mon, 22 Jun 2009 20:46:32 +0000 (20:46 +0000)]
Add in test runner

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

16 years agoRefactor to be more independent, so that one can build from source archive without...
fhanik [Mon, 22 Jun 2009 20:29:20 +0000 (20:29 +0000)]
Refactor to be more independent, so that one can build from source archive without too many hooplas as suggested by sebb

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

16 years agoA more sensible default to avoid too many character array allocations
fhanik [Mon, 22 Jun 2009 16:19:10 +0000 (16:19 +0000)]
A more sensible default to avoid too many  character array allocations

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

16 years agoMinimize thread local access when possible, since thread local does a map lookup.
fhanik [Mon, 22 Jun 2009 15:36:35 +0000 (15:36 +0000)]
Minimize thread local access when possible, since thread local does a map lookup.
Idea by kkolinko

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

16 years agoFix a couple of Eclipse warnings
markt [Mon, 22 Jun 2009 11:58:07 +0000 (11:58 +0000)]
Fix a couple of Eclipse warnings

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

16 years agoDon't call silent by default. Add the life-cycle listener to the silenced loggers.
markt [Mon, 22 Jun 2009 11:19:18 +0000 (11:19 +0000)]
Don't call silent by default. Add the life-cycle listener to the silenced loggers.

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

16 years agoRemove unnecessary code that just leads to a warning in the logs
markt [Mon, 22 Jun 2009 11:03:37 +0000 (11:03 +0000)]
Remove unnecessary code that just leads to a warning in the logs

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

16 years agoSimplify, simplify. Thanks to sebb.
markt [Sat, 20 Jun 2009 17:04:49 +0000 (17:04 +0000)]
Simplify, simplify. Thanks to sebb.

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

16 years agoCan't use queryMB as that isn't the only source.
markt [Fri, 19 Jun 2009 21:14:32 +0000 (21:14 +0000)]
Can't use queryMB as that isn't the only source.

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

16 years agoAs per http://www.apache.org/dev/crypto.html#inform add a crypto notice to each of...
markt [Fri, 19 Jun 2009 20:25:01 +0000 (20:25 +0000)]
As per apache.org/dev/crypto.html#inform add a crypto notice to each of the releases

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

16 years agoSwitch to ThreadLocal where possible. This removes all the syncs apart from those...
markt [Fri, 19 Jun 2009 20:21:53 +0000 (20:21 +0000)]
Switch to ThreadLocal where possible. This removes all the syncs apart from those related to accessing the log file.

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

16 years agoAdd two more implementations for the second test.
kkolinko [Fri, 19 Jun 2009 18:57:59 +0000 (18:57 +0000)]
Add two more implementations for the second test.
a) using a single ThreadLocal instead of multiple ones
b) also using StringBuilder instead of StringBuffer
Also, replaced class.getName() with class.getSimpleName() in the status message.

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

16 years agoAs per Filip's suggestions:
markt [Fri, 19 Jun 2009 17:13:00 +0000 (17:13 +0000)]
As per Filip's suggestions:
- reduce object creation
- better use of ThreadLocals

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

16 years agoshortened
fhanik [Fri, 19 Jun 2009 17:07:36 +0000 (17:07 +0000)]
shortened

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

16 years agocorrection
fhanik [Fri, 19 Jun 2009 16:16:16 +0000 (16:16 +0000)]
correction

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

16 years agoRemove duplicate code - my bad from r781779. Thanks to sebb for spotting it.
markt [Fri, 19 Jun 2009 15:12:02 +0000 (15:12 +0000)]
Remove duplicate code - my bad from r781779. Thanks to sebb for spotting it.

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

16 years agoCorrect per sebb/markt
fhanik [Fri, 19 Jun 2009 15:05:04 +0000 (15:05 +0000)]
Correct per sebb/markt

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

16 years agoUpdate to pool 1.5.1 - fixes regression in 1.5
markt [Fri, 19 Jun 2009 13:11:00 +0000 (13:11 +0000)]
Update to pool 1.5.1 - fixes regression in 1.5

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

16 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=38352
markt [Fri, 19 Jun 2009 13:03:42 +0000 (13:03 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38352
The JSPLoader needs to have read/write permission to the context's temp directory, as per the spec.

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

16 years agoHeaders should be compared ignoring case. Reported by Tim F.
markt [Fri, 19 Jun 2009 12:56:40 +0000 (12:56 +0000)]
Headers should be compared ignoring case. Reported by Tim F.

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

16 years agoAdd a header case-sensitivity test for 37794 test case (as reported by Tim)
markt [Fri, 19 Jun 2009 12:55:56 +0000 (12:55 +0000)]
Add a header case-sensitivity test for 37794 test case (as reported by Tim)

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

16 years agoAdded toString() call to the StringBuffer. The tests will run a bit slower because...
kkolinko [Fri, 19 Jun 2009 12:51:11 +0000 (12:51 +0000)]
Added toString() call to the StringBuffer. The tests will run a bit slower because of that.
Added two other implementation variants for the first test.

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

16 years agoAdd an additional volatile from a review of the associated benchmark tests.
markt [Fri, 19 Jun 2009 12:40:56 +0000 (12:40 +0000)]
Add an additional volatile from a review of the associated benchmark tests.
Add a sync to deal with the issue filip reported in the 5.5.x status file

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

16 years agoRewrote the benchmarks, to allow more than 2 different implementations to be compared.
kkolinko [Fri, 19 Jun 2009 12:27:08 +0000 (12:27 +0000)]
Rewrote the benchmarks, to allow more than 2 different implementations to be compared.

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

16 years agoUndo accidental commit of files that should not have been included in r786471. These...
markt [Fri, 19 Jun 2009 12:16:25 +0000 (12:16 +0000)]
Undo accidental commit of files that should not have been included in r786471. These will follow separately with the correct comments. Sorry for the noise.

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

16 years agoThe servletapi gives us a perfectly good constant for 'javax.servlet.context.tempdir...
markt [Fri, 19 Jun 2009 12:10:05 +0000 (12:10 +0000)]
The servletapi gives us a perfectly good constant for 'javax.servlet.context.tempdir'. Use it.

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

16 years agoAs per review comments:
markt [Fri, 19 Jun 2009 12:04:52 +0000 (12:04 +0000)]
As per review comments:
- use StringBuilder
- add comment to explain one possible cause
- better logging using original data

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

16 years agoMinor improvements
markt [Fri, 19 Jun 2009 11:11:06 +0000 (11:11 +0000)]
Minor improvements
- as per Sebb's comment on the dev list - need to add a volatile
- correct the log message

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

16 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=47308
fhanik [Thu, 18 Jun 2009 17:08:38 +0000 (17:08 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47308
Patch provided by Keiichi Fujino with one change, default is false

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

16 years agoFix demo
fhanik [Thu, 18 Jun 2009 16:57:17 +0000 (16:57 +0000)]
Fix demo

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

16 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=47389
fhanik [Thu, 18 Jun 2009 15:27:55 +0000 (15:27 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47389
patch provided by  Keiichi Fujino

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

16 years agoAdd volatiles as suggested by Tim to align code with AccessLogValve.
markt [Thu, 18 Jun 2009 12:58:07 +0000 (12:58 +0000)]
Add volatiles as suggested by Tim to align code with AccessLogValve.
No significant change to results (on my machine at least ;)

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

16 years agoExpand sync within rotatable block to fix a couple of issues:
markt [Thu, 18 Jun 2009 09:25:00 +0000 (09:25 +0000)]
Expand sync within rotatable block to fix a couple of issues:
 - fileDateFormatter is a SimpleDateFormat which is not thread safe
 - the rotationLastChecked needs to be volatile to ensure we don't execute the sync'd block multiple times
Although this is a sync on 'this' in log which gets called for every request:
 - a similar sync occurs in getDate() for every request with minimal performance impact
 - microbenchmarks suggest that a sync on 'this' has similar performance to using ThreadLocals

 Based on kkolinko's patch for Tomcat 5.5.x

 Note there remains an issue with writing to the log if the log files happens to be in the process of rotating

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

16 years agoAdd some micro-benchmarks that enable the differences between the Sync and ThreadLoca...
markt [Thu, 18 Jun 2009 08:32:29 +0000 (08:32 +0000)]
Add some micro-benchmarks that enable the differences between the Sync and ThreadLocal approach to be compared

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

16 years agoIt is followup to rev.785768.
kkolinko [Wed, 17 Jun 2009 23:52:11 +0000 (23:52 +0000)]
It is followup to rev.785768.
Updating the comment in the web.xml to align with the docs.
We know that this version of Tomcat cannot run on JDK 1.4.

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

16 years agoDisable the code that detects the value for compilerSourceVM, compilerTargetVM options,
kkolinko [Wed, 17 Jun 2009 19:58:30 +0000 (19:58 +0000)]
Disable the code that detects the value for compilerSourceVM, compilerTargetVM options,
because we know that this version of Tomcat cannot run on JDK 1.4.
Update the doc.

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

16 years agotrivial: corrected spelling errors in docs
kkolinko [Wed, 17 Jun 2009 15:51:55 +0000 (15:51 +0000)]
trivial: corrected spelling errors in docs

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

16 years agoAdd common FindCpuType function.
mturk [Wed, 17 Jun 2009 05:33:52 +0000 (05:33 +0000)]
Add common FindCpuType function.
The problem is that environment variable doesn't always set AMD64. This is true only for amd processors.
If present and not IA64 the %PROCESSOR_ARCHITEW6432% must be x86_64

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