tomcat7.0
15 years agoMisc Eclipse and FindBugs warnings
markt [Fri, 17 Sep 2010 15:02:45 +0000 (15:02 +0000)]
Misc Eclipse and FindBugs warnings

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

15 years agoRemove unused import
markt [Fri, 17 Sep 2010 14:56:58 +0000 (14:56 +0000)]
Remove unused import

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

15 years agoRemove unnecessary code. Superclass method does exactly the same thing.
markt [Fri, 17 Sep 2010 14:56:28 +0000 (14:56 +0000)]
Remove unnecessary code. Superclass method does exactly the same thing.

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

15 years agoCode clean-up.
markt [Fri, 17 Sep 2010 14:40:05 +0000 (14:40 +0000)]
Code clean-up.
Align BIO and NIO to make Async refactoring easier

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

15 years agoRemove more START/STOP actions and started attribute. They aren't adding anything.
markt [Fri, 17 Sep 2010 14:11:03 +0000 (14:11 +0000)]
Remove more START/STOP actions and started attribute. They aren't adding anything.

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

15 years agoRemove START/STOP actions and started attribute. They aren't adding anything.
markt [Fri, 17 Sep 2010 14:08:10 +0000 (14:08 +0000)]
Remove START/STOP actions and started attribute. They aren't adding anything.

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

15 years agoNIO and APR processors don't use START/STOP so this code is unnecessary
markt [Fri, 17 Sep 2010 14:00:10 +0000 (14:00 +0000)]
NIO and APR processors don't use START/STOP so this code is unnecessary

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49909
markt [Fri, 17 Sep 2010 11:05:39 +0000 (11:05 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49909
Re-enable JSTL. This was a regression in the fix for bz 47950

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

15 years agoRemove empty dir
markt [Wed, 15 Sep 2010 14:03:13 +0000 (14:03 +0000)]
Remove empty dir

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

15 years agoFix niggle
markt [Wed, 15 Sep 2010 13:39:08 +0000 (13:39 +0000)]
Fix niggle

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

15 years agoInclude the suffix in the version number
markt [Wed, 15 Sep 2010 13:34:42 +0000 (13:34 +0000)]
Include the suffix in the version number

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

15 years agoFix Javadoc
markt [Wed, 15 Sep 2010 13:29:47 +0000 (13:29 +0000)]
Fix Javadoc

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

15 years agoUpdate changelog
markt [Wed, 15 Sep 2010 13:26:12 +0000 (13:26 +0000)]
Update changelog

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49584
markt [Wed, 15 Sep 2010 13:24:14 +0000 (13:24 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49584
Move the offering of a new thread on release from the abandoned connection code to the release code to eliminate the possibility of a blocked thread on release.

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

15 years agoAddress a concern raised in https://issues.apache.org/bugzilla/show_bug.cgi?id=49584
markt [Wed, 15 Sep 2010 11:42:55 +0000 (11:42 +0000)]
Address a concern raised in https://issues.apache.org/bugzilla/show_bug.cgi?id=49584
Re-factor code to clarify con is never null when release is called.

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

15 years agoMore re-factoring: AsyncContext will throw exception
markt [Tue, 14 Sep 2010 12:38:53 +0000 (12:38 +0000)]
More re-factoring: AsyncContext will throw exception

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

15 years agoMore re-factoring: expose the Executor
markt [Tue, 14 Sep 2010 12:09:50 +0000 (12:09 +0000)]
More re-factoring: expose the Executor

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

15 years agoMore re-factoring prior to large async changes
markt [Tue, 14 Sep 2010 11:47:57 +0000 (11:47 +0000)]
More re-factoring prior to large async changes

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

15 years agoCode clean-up and a little preparatory re-factoring prior to large async changes
markt [Tue, 14 Sep 2010 11:43:22 +0000 (11:43 +0000)]
Code clean-up and a little preparatory re-factoring prior to large async changes

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

15 years agoFix most of the warnings in this package
markt [Tue, 14 Sep 2010 07:55:26 +0000 (07:55 +0000)]
Fix most of the warnings in this package

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49924
kfujino [Tue, 14 Sep 2010 07:49:33 +0000 (07:49 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49924
When non-primary node changes into a primary node, make sure isPrimarySession is changed to true.

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

15 years agoAdd @Override markers to package
markt [Tue, 14 Sep 2010 07:23:19 +0000 (07:23 +0000)]
Add @Override markers to package

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

15 years agoConvert ActionCode to an enum.
markt [Mon, 13 Sep 2010 20:23:22 +0000 (20:23 +0000)]
Convert ActionCode to an enum.
Shorten all the names by removing ACTION_ from the beginning. We have to use ActionCode.XXX to ACTION_ is just wasted screen space.

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

15 years agoRe-factoring the connectors. Remove large chunks of duplicated code in the Processors...
markt [Mon, 13 Sep 2010 20:03:17 +0000 (20:03 +0000)]
Re-factoring the connectors. Remove large chunks of duplicated code in the Processors. Some minor changes elsewhere to support the re-factoring.

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

15 years agoCode clean-up
markt [Mon, 13 Sep 2010 17:28:53 +0000 (17:28 +0000)]
Code clean-up

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

15 years agoFix Eclipse warnings prior to working on bz49884 refactoring
markt [Sun, 12 Sep 2010 08:05:35 +0000 (08:05 +0000)]
Fix Eclipse warnings prior to working on bz49884 refactoring

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

15 years agoFix typos. Remove attributes that don't exist. Add a missing attribute.
markt [Sun, 12 Sep 2010 01:38:30 +0000 (01:38 +0000)]
Fix typos. Remove attributes that don't exist. Add a missing attribute.

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

15 years agoFurther work for https://issues.apache.org/bugzilla/show_bug.cgi?id=49234
markt [Sun, 12 Sep 2010 01:25:03 +0000 (01:25 +0000)]
Further work for https://issues.apache.org/bugzilla/show_bug.cgi?id=49234
GSOC 2010. Enable the creation of Services, Engines, Connectors, Hosts and Contexts via JMX from a minimal server.xml that contains only a Server element.
Based on a patch by Chamith Buddhika. I added the additional changes to pass the parent class loader down the hierarchy.

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

15 years agoUpdate commons pool to 1.5.5
markt [Sat, 11 Sep 2010 16:32:02 +0000 (16:32 +0000)]
Update commons pool to 1.5.5

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

15 years agoUpdate changelog
markt [Sat, 11 Sep 2010 15:47:01 +0000 (15:47 +0000)]
Update changelog

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

15 years agoFix an issue where <Context .../> elements defined in server.xml did not use the...
markt [Sat, 11 Sep 2010 10:44:50 +0000 (10:44 +0000)]
Fix an issue where <Context .../> elements defined in server.xml did not use the configClass specified by the parent <Host .../> element

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

15 years agoRevert r996112. At least some of that config is required.
markt [Sat, 11 Sep 2010 10:17:07 +0000 (10:17 +0000)]
Revert r996112. At least some of that config is required.

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

15 years agoRemove unnecessary digester configuration
markt [Sat, 11 Sep 2010 09:48:32 +0000 (09:48 +0000)]
Remove unnecessary digester configuration
hostConfigClass and engineConfigClass were removed before 6.0.x

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

15 years agoRemove pointless comment.
markt [Fri, 10 Sep 2010 21:35:55 +0000 (21:35 +0000)]
Remove pointless comment.
Schema validation moved to the context

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

15 years agoCode clean up
markt [Thu, 9 Sep 2010 21:08:50 +0000 (21:08 +0000)]
Code clean up

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

15 years agoRefactor log messages to use logger from concrete class
markt [Thu, 9 Sep 2010 21:07:37 +0000 (21:07 +0000)]
Refactor log messages to use logger from concrete class

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

15 years agoShorten the debug output
markt [Thu, 9 Sep 2010 20:34:27 +0000 (20:34 +0000)]
Shorten the debug output

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

15 years agoUpdate change log
markt [Thu, 9 Sep 2010 14:03:12 +0000 (14:03 +0000)]
Update change log

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

15 years agoTrim whitespace from interceptor class names, property names and property values.
markt [Thu, 9 Sep 2010 14:01:50 +0000 (14:01 +0000)]
Trim whitespace from interceptor class names, property names and property values.

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

15 years agoUpdate changelog
markt [Wed, 8 Sep 2010 19:46:34 +0000 (19:46 +0000)]
Update changelog

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49892
markt [Wed, 8 Sep 2010 19:45:16 +0000 (19:45 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49892
Correct JNDI name for method resource injections
Based on a patch by Gurkan Erdogdu

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

15 years agoFix @Override warnings
markt [Wed, 8 Sep 2010 19:39:36 +0000 (19:39 +0000)]
Fix @Override warnings

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

15 years agoUpdate changelog
markt [Wed, 8 Sep 2010 15:35:48 +0000 (15:35 +0000)]
Update changelog

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

15 years agoDocument new validation class (https://issues.apache.org/bugzilla/show_bug.cgi?id...
markt [Wed, 8 Sep 2010 15:31:27 +0000 (15:31 +0000)]
Document new validation class (https://issues.apache.org/bugzilla/show_bug.cgi?id=48817)
Patch provided by Matt Passell.

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49831
markt [Wed, 8 Sep 2010 15:27:00 +0000 (15:27 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49831
Make sure pooled XA connections are properly closed when the pool shuts down.
Based on a patch by Daniel Mikusa.

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

15 years agoRemove some unused code
markt [Wed, 8 Sep 2010 15:19:00 +0000 (15:19 +0000)]
Remove some unused code

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

15 years agoUpdate changelog
markt [Wed, 8 Sep 2010 15:11:49 +0000 (15:11 +0000)]
Update changelog

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

15 years agoUpdate to latest Tomact 6.0.x and DBCP 1.3.x release
markt [Wed, 8 Sep 2010 15:09:49 +0000 (15:09 +0000)]
Update to latest Tomact 6.0.x and DBCP 1.3.x release

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

15 years agoBring changelog up to date
markt [Wed, 8 Sep 2010 15:09:16 +0000 (15:09 +0000)]
Bring changelog up to date

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

15 years agoFix warnings in the host manager package
markt [Wed, 8 Sep 2010 06:03:33 +0000 (06:03 +0000)]
Fix warnings in the host manager package

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

15 years agoRemove unused attributes. This all moved to Context.
markt [Wed, 8 Sep 2010 05:57:44 +0000 (05:57 +0000)]
Remove unused attributes. This all moved to Context.

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

15 years agoRemove unused attributes. This all moved to Context.
markt [Wed, 8 Sep 2010 05:43:39 +0000 (05:43 +0000)]
Remove unused attributes. This all moved to Context.

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

15 years agoAdditional debug logging to investigate
markt [Tue, 7 Sep 2010 12:56:29 +0000 (12:56 +0000)]
Additional debug logging to investigate
https://issues.apache.org/bugzilla/show_bug.cgi?id=49884
- logs hashcodes for current request, coyote request and request processor
- logs thread name
- makes debug stack trace optional (enabled with trace level logging)
- adds debug statements to additional methods

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

15 years agoReduce visibility, remove unused/unnecessary methods prior to fixing bz49884
markt [Mon, 6 Sep 2010 16:53:34 +0000 (16:53 +0000)]
Reduce visibility, remove unused/unnecessary methods prior to fixing bz49884

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

15 years agoAdd @Override to test code
markt [Mon, 6 Sep 2010 16:34:19 +0000 (16:34 +0000)]
Add @Override to test code

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

15 years agoAvoid NPE when a parallel request invalidates the current session
markt [Mon, 6 Sep 2010 14:39:48 +0000 (14:39 +0000)]
Avoid NPE when a parallel request invalidates the current session

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

15 years agoCouple of trivial Eclipse nags
markt [Mon, 6 Sep 2010 14:20:11 +0000 (14:20 +0000)]
Couple of trivial Eclipse nags

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

15 years agomanager -> manager-script
markt [Mon, 6 Sep 2010 12:20:32 +0000 (12:20 +0000)]
manager -> manager-script

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

15 years agoIf a ping message fails, removed the failed members from the map rather than propagat...
markt [Mon, 6 Sep 2010 12:07:42 +0000 (12:07 +0000)]
If a ping message fails, removed the failed members from the map rather than propagating the exception

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

15 years agoExtend fix for bz49883
markt [Mon, 6 Sep 2010 09:55:44 +0000 (09:55 +0000)]
Extend fix for bz49883

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

15 years agoFix typo
markt [Mon, 6 Sep 2010 09:28:07 +0000 (09:28 +0000)]
Fix typo

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

15 years agoSwitch to a JSP for the Tomcat home page and make the version numebr dynamic as the...
markt [Mon, 6 Sep 2010 09:24:54 +0000 (09:24 +0000)]
Switch to a JSP for the Tomcat home page and make the version numebr dynamic as the hard-coded version number in the static page can cause confusion in when using CATALINA_BASE and switching between multiple CATALINA_HOMEs

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

15 years agogit-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@992981 13f79535-47bb-0310...
markt [Mon, 6 Sep 2010 09:23:16 +0000 (09:23 +0000)]
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@992981 13f79535-47bb-0310-9956-ffa450edef68

15 years agoMisc code clean-up.
markt [Sun, 5 Sep 2010 21:08:42 +0000 (21:08 +0000)]
Misc code clean-up.

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49883
markt [Sun, 5 Sep 2010 20:43:38 +0000 (20:43 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49883
Return a name for use in log messages rather than throwing an UnsupportedOperationException

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49802
markt [Sun, 5 Sep 2010 20:36:16 +0000 (20:36 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49802
Allow the connectors to be stopped via JMX.

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

15 years agoMake sure async timeout thread is stopped when the connector is stopped.
markt [Sun, 5 Sep 2010 19:49:53 +0000 (19:49 +0000)]
Make sure async timeout thread is stopped when the connector is stopped.
Correct copy and pasted comment
Also fix @Override warning for the method

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

15 years agoMake sure acceptor threads are stopped when the connector is stopped.
markt [Sun, 5 Sep 2010 19:47:36 +0000 (19:47 +0000)]
Make sure acceptor threads are stopped when the connector is stopped.
Also fix @Override warnings for the method

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

15 years agoFix an Eclispe nag.
markt [Fri, 3 Sep 2010 20:45:41 +0000 (20:45 +0000)]
Fix an Eclispe nag.

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

15 years agoRemove debug code that was added in r991959
markt [Fri, 3 Sep 2010 20:41:25 +0000 (20:41 +0000)]
Remove debug code that was added in r991959

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49865
markt [Fri, 3 Sep 2010 20:37:46 +0000 (20:37 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49865
Allow Tomcat to start if catalina.properties is not present

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

15 years agoUse shutdown instead close for hard closing the socket which is inside Socket.accept...
mturk [Fri, 3 Sep 2010 20:30:10 +0000 (20:30 +0000)]
Use shutdown instead close for hard closing the socket which is inside Socket.accept call

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

15 years agoHard close the accepting socket if unlockAccept failed
mturk [Fri, 3 Sep 2010 19:54:02 +0000 (19:54 +0000)]
Hard close the accepting socket if unlockAccept failed

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

15 years agohttps://issues.apache.org/bugzilla/show_bug.cgi?id=49876
markt [Fri, 3 Sep 2010 18:50:57 +0000 (18:50 +0000)]
https://issues.apache.org/bugzilla/show_bug.cgi?id=49876
Generics warnings in the copied Apache Jakarta BCEL code. Based on a patch by Gábor. (markt)

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

15 years agoRemove some unnecessary code and fix an Eclipse warning
markt [Fri, 3 Sep 2010 18:47:29 +0000 (18:47 +0000)]
Remove some unnecessary code and fix an Eclipse warning

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

15 years agoWhite-space clean-up
markt [Fri, 3 Sep 2010 18:35:59 +0000 (18:35 +0000)]
White-space clean-up
Reduce sequences of three or more blank lines to two blank lines

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

15 years agoAdd @Override markers. Auto generated by Eclipse. Checked manually.
markt [Fri, 3 Sep 2010 17:57:33 +0000 (17:57 +0000)]
Add @Override markers. Auto generated by Eclipse. Checked manually.

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

15 years agoTrace through some unused code and remove it.
markt [Fri, 3 Sep 2010 17:50:32 +0000 (17:50 +0000)]
Trace through some unused code and remove it.

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

15 years agoUpdate merge info
markt [Fri, 3 Sep 2010 17:45:05 +0000 (17:45 +0000)]
Update merge info

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

15 years agoSync with Jakarta. Add generated serialVersionUID's.
markt [Fri, 3 Sep 2010 17:40:12 +0000 (17:40 +0000)]
Sync with Jakarta. Add generated serialVersionUID's.
Don't use the same values as Jakarta since the code has been structurally modified (to removed unused elements)

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

15 years agoKeep MBean names consistent with Tomact 6.
markt [Fri, 3 Sep 2010 13:20:22 +0000 (13:20 +0000)]
Keep MBean names consistent with Tomact 6.

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

15 years agoMake destroy method returning when the worker thread finishes instead separately...
mturk [Fri, 3 Sep 2010 10:37:53 +0000 (10:37 +0000)]
Make destroy method returning when the worker thread finishes instead separately calling destroy followed by join

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

15 years agoCall join only for alive threads
mturk [Fri, 3 Sep 2010 10:16:00 +0000 (10:16 +0000)]
Call join only for alive threads

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

15 years agoAdd wrapper over Socket.destroy which will make sure we don't call destory for socket...
mturk [Fri, 3 Sep 2010 10:12:57 +0000 (10:12 +0000)]
Add wrapper over Socket.destroy which will make sure we don't call destory for sockets already closed by the parent pool cleanup

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

15 years agoRemove method that no longer exists
markt [Fri, 3 Sep 2010 09:49:52 +0000 (09:49 +0000)]
Remove method that no longer exists

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

15 years agoExpose current state of Lifecycle components via JMX beans (where a component has...
markt [Fri, 3 Sep 2010 09:48:46 +0000 (09:48 +0000)]
Expose current state of Lifecycle components via JMX beans (where a component has one). Mainly useful for monitoring web application status.

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

15 years agoBZ 49869: Javadoc Fix.
rjung [Fri, 3 Sep 2010 08:54:20 +0000 (08:54 +0000)]
BZ 49869: Javadoc Fix.

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

15 years agoJoin poller and sendfile threads on destroy. This requires to change the Poller and...
mturk [Fri, 3 Sep 2010 05:27:24 +0000 (05:27 +0000)]
Join poller and sendfile threads on destroy. This requires to change the Poller and Sendile to Thread instead Runnable for simplicity.

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

15 years agoMake sure we exit the thread if not running. Otherwise the thread will block in run...
mturk [Fri, 3 Sep 2010 04:36:46 +0000 (04:36 +0000)]
Make sure we exit the thread if not running. Otherwise the thread will block in run until the VM shuts down

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

15 years agoStore the Acceptor instances in the array like we do for other threads
mturk [Fri, 3 Sep 2010 04:26:23 +0000 (04:26 +0000)]
Store the Acceptor instances in the array like we do for other threads

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

15 years agoTrim trailing spaces. No functional change
mturk [Fri, 3 Sep 2010 04:09:25 +0000 (04:09 +0000)]
Trim trailing spaces. No functional change

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

15 years agoBZ 49865: ExceptionUtils throw NoClassDefFoundError
rjung [Thu, 2 Sep 2010 16:52:48 +0000 (16:52 +0000)]
BZ 49865: ExceptionUtils throw NoClassDefFoundError
during startup. Add TODO markers.

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

15 years agoFollowup to r991959.
rjung [Thu, 2 Sep 2010 15:02:52 +0000 (15:02 +0000)]
Followup to r991959.

Forgot the two classes.

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

15 years agoBZ 48967: Replace strings "catalina.base" and "catalina.home"
rjung [Thu, 2 Sep 2010 14:52:11 +0000 (14:52 +0000)]
BZ 48967: Replace strings "catalina.base" and "catalina.home"
by globally defined constants.

Patch provided by Marc Guillemot.

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

15 years agoFix warnings
markt [Thu, 2 Sep 2010 12:36:23 +0000 (12:36 +0000)]
Fix warnings

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

15 years agoUpdate the Servlet, JSP & EL javadoc links and add spec links.
markt [Thu, 2 Sep 2010 09:08:46 +0000 (09:08 +0000)]
Update the Servlet, JSP & EL javadoc links and add spec links.

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

15 years agoAdd a comment as a reminder
markt [Thu, 2 Sep 2010 08:01:20 +0000 (08:01 +0000)]
Add a comment as a reminder

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

15 years agoRemove setting distributable on the Context from the docs. It gets lost on webapp...
markt [Thu, 2 Sep 2010 07:55:11 +0000 (07:55 +0000)]
Remove setting distributable on the Context from the docs. It gets lost on webapp reload() e.g. when triggered from the manager app.

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

15 years agoRemove excludes for files no longer in source tree
markt [Wed, 1 Sep 2010 13:53:28 +0000 (13:53 +0000)]
Remove excludes for files no longer in source tree

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

15 years agoRe-factoring. Reduce code duplication. More still to be done.
markt [Tue, 31 Aug 2010 22:07:58 +0000 (22:07 +0000)]
Re-factoring. Reduce code duplication. More still to be done.

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