tomcat7.0
14 years agoFix remaining warnings in javax package (with recently documented settings)
markt [Fri, 17 Dec 2010 21:49:54 +0000 (21:49 +0000)]
Fix remaining warnings in javax package (with recently documented settings)

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

14 years agoDocument the Eclipse compiler errors/warnings settings I am using
markt [Fri, 17 Dec 2010 21:47:52 +0000 (21:47 +0000)]
Document the Eclipse compiler errors/warnings settings I am using

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

14 years agoAvoid a possible NPE that in turn was masking the root cause from JspC
markt [Fri, 17 Dec 2010 13:52:22 +0000 (13:52 +0000)]
Avoid a possible NPE that in turn was masking the root cause from JspC

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

14 years agoFix massive memory leak in NIO connector. Http11NioProcessor objects were not being...
markt [Fri, 17 Dec 2010 00:17:18 +0000 (00:17 +0000)]
Fix massive memory leak in NIO connector. Http11NioProcessor objects were not being recycled.

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

14 years agohttps://issues.apache.org/bugzilla/show_bug.cgi?id=13731
markt [Thu, 16 Dec 2010 23:35:17 +0000 (23:35 +0000)]
https://issues.apache.org/bugzilla/show_bug.cgi?id=13731
Make variables in <code>_jspService()</code> method final where possible.

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

14 years agoStarting to work on maxConnections attribute for BIO/NIO connectors to allow administ...
fhanik [Thu, 16 Dec 2010 21:09:49 +0000 (21:09 +0000)]
Starting to work on maxConnections attribute for BIO/NIO connectors to allow administrators to throttle how accepting
connections is handled. Implement a CounterLatch to keep track of the
connection count while also allowing the acceptor
thread block while the max has been reached

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

14 years agobug 48822: Include contest name in reload and stop log statements
slaurent [Thu, 16 Dec 2010 21:07:55 +0000 (21:07 +0000)]
bug 48822: Include contest name in reload and stop log statements
https://issues.apache.org/bugzilla/show_bug.cgi?id=48822

changelog + proposed for tomcat 6

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

14 years agobug 48822: Include contest name in reload and stop log statements
slaurent [Thu, 16 Dec 2010 20:40:36 +0000 (20:40 +0000)]
bug 48822: Include contest name in reload and stop log statements
https://issues.apache.org/bugzilla/show_bug.cgi?id=48822

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

14 years agoFix Findbugs issues / Eclipse warnings.
markt [Thu, 16 Dec 2010 19:39:58 +0000 (19:39 +0000)]
Fix Findbugs issues / Eclipse warnings.
Some genuine issues
Some changes to make code easier to read (for humans and analysis tools)

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

14 years agoFix a FindBugs nag in the unit tests
markt [Thu, 16 Dec 2010 15:04:56 +0000 (15:04 +0000)]
Fix a FindBugs nag in the unit tests

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

14 years agohttps://issues.apache.org/bugzilla/show_bug.cgi?id=10972
markt [Wed, 15 Dec 2010 17:58:05 +0000 (17:58 +0000)]
https://issues.apache.org/bugzilla/show_bug.cgi?id=10972
Improve error message if the className attribute is missing on an element in server.xml where it is required.

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=10526
markt [Wed, 15 Dec 2010 16:41:31 +0000 (16:41 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=10526
Add alwaysUseSession option to authenticators

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

14 years agoWhilst I am thinking about excluding stuff from FindBugs - add some exceptions for...
markt [Wed, 15 Dec 2010 14:54:23 +0000 (14:54 +0000)]
Whilst I am thinking about excluding stuff from FindBugs - add some exceptions for the generated code with issues and fix the remaining issues in the same package

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

14 years agoAdd a FindBugs filter config for known false positives
markt [Wed, 15 Dec 2010 14:35:22 +0000 (14:35 +0000)]
Add a FindBugs filter config for known false positives

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

14 years agoFix various warnings (FindBugs, Eclipse etc.)
markt [Wed, 15 Dec 2010 14:34:32 +0000 (14:34 +0000)]
Fix various warnings (FindBugs, Eclipse etc.)

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

14 years agoFix another FindBugs niggle
markt [Wed, 15 Dec 2010 13:53:22 +0000 (13:53 +0000)]
Fix another FindBugs niggle

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

14 years agoRemove unnecessary override
markt [Wed, 15 Dec 2010 13:31:28 +0000 (13:31 +0000)]
Remove unnecessary override

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

14 years agoFix my stupid mistake.
markt [Wed, 15 Dec 2010 10:46:23 +0000 (10:46 +0000)]
Fix my stupid mistake.

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

14 years agoFix a typo
markt [Wed, 15 Dec 2010 00:57:58 +0000 (00:57 +0000)]
Fix a typo

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

14 years agoAdded documentation to parseBodyMethods and parseBodyMethodSet members.
schultz [Tue, 14 Dec 2010 20:53:07 +0000 (20:53 +0000)]
Added documentation to parseBodyMethods and parseBodyMethodSet members.

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

14 years agoFixed bug #49125: toString on byte[] array probably is not correct
schultz [Tue, 14 Dec 2010 20:49:28 +0000 (20:49 +0000)]
Fixed bug #49125: toString on byte[] array probably is not correct
- Added HexUtils.toHexString method
- Wrapped output of byte[] objects with a call to HexUtils.toHexString

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

14 years agoLog mis-configuration in context.xml
markt [Mon, 13 Dec 2010 15:57:54 +0000 (15:57 +0000)]
Log mis-configuration in context.xml

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

14 years agoAliases were broken if the context was reloaded
markt [Mon, 13 Dec 2010 15:06:13 +0000 (15:06 +0000)]
Aliases were broken if the context was reloaded

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

14 years agoFix various FindBugs and Eclipse warnings
markt [Mon, 13 Dec 2010 14:50:17 +0000 (14:50 +0000)]
Fix various FindBugs and Eclipse warnings

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

14 years agoUsing abstract classes means impl isn't clear in the startup log. Modify name so...
markt [Mon, 13 Dec 2010 12:47:04 +0000 (12:47 +0000)]
Using abstract classes means impl isn't clear in the startup log. Modify name so it is clear.

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

14 years agoImprove the fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=50201
kkolinko [Mon, 13 Dec 2010 02:09:32 +0000 (02:09 +0000)]
Improve the fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=50201
- Use AtomicReference to guard against possible duplicate registration of
  listeners when logAccess() is called by several threads at the same time.
- Added install() and uninstall() method to AccessLogListener
  to help register/unregister the listeners.
- When defaultAccessLog is nulled, always unregister the listener as well.
  The listener does not need to be reused, because now we do create a listener
  when there is no log and it will take care of things.

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

14 years agochangelog for r1044987
kkolinko [Mon, 13 Dec 2010 01:21:58 +0000 (01:21 +0000)]
changelog for r1044987

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=50460
kkolinko [Mon, 13 Dec 2010 00:58:11 +0000 (00:58 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50460
Avoid leak caused by using a cached exception instance

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

14 years agoUse i18n for the messages
kkolinko [Sun, 12 Dec 2010 22:33:09 +0000 (22:33 +0000)]
Use i18n for the messages
It is followup to r1042022 which was a fix for BZ 48973

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

14 years agoAdd some tests for bug50449 but haven't reproduced it yet
markt [Sun, 12 Dec 2010 19:50:45 +0000 (19:50 +0000)]
Add some tests for bug50449 but haven't reproduced it yet

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

14 years agoFix FindBugs issues in this class
markt [Sun, 12 Dec 2010 19:35:56 +0000 (19:35 +0000)]
Fix FindBugs issues in this class

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

14 years agoFix FindBugs issues in this class
markt [Sun, 12 Dec 2010 19:27:13 +0000 (19:27 +0000)]
Fix FindBugs issues in this class

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

14 years agoi18n changes for r1044874
markt [Sun, 12 Dec 2010 18:55:52 +0000 (18:55 +0000)]
i18n changes for r1044874

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

14 years agoUse the newly refactored session id generator when generating sso session IDs
markt [Sun, 12 Dec 2010 18:47:10 +0000 (18:47 +0000)]
Use the newly refactored session id generator when generating sso session IDs

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

14 years agoRe-factor session ID generation into a separate class so it can be re-used for SSO...
markt [Sun, 12 Dec 2010 18:30:03 +0000 (18:30 +0000)]
Re-factor session ID generation into a separate class so it can be re-used for SSO (patch for that to follow)

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

14 years agoFix FindBugs issues in this class
markt [Sun, 12 Dec 2010 17:24:47 +0000 (17:24 +0000)]
Fix FindBugs issues in this class

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

14 years agobug 50459: StandardContext.bindThread() and unbindThread() are not symmetrical and...
slaurent [Sun, 12 Dec 2010 00:16:33 +0000 (00:16 +0000)]
bug 50459: StandardContext.bindThread() and unbindThread() are not symmetrical and not limited to current thread
https://issues.apache.org/bugzilla/show_bug.cgi?id=50459

Fixed incorrect comment in code

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

14 years agobug 50459: StandardContext.bindThread() and unbindThread() are not symmetrical and...
slaurent [Sun, 12 Dec 2010 00:10:39 +0000 (00:10 +0000)]
bug 50459: StandardContext.bindThread() and unbindThread() are not symmetrical and not limited to current thread
https://issues.apache.org/bugzilla/show_bug.cgi?id=50459

This fixes the bug that was introduced by http://svn.apache.org/viewvc?rev=1044145&view=rev (introduced a dedicated thread when starting and stopping web applications to avoid mem leak)

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

14 years agoTRy and sync up the deps in the POMs with what Checkstyle validates
markt [Sat, 11 Dec 2010 22:21:02 +0000 (22:21 +0000)]
TRy and sync up the deps in the POMs with what Checkstyle validates

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

14 years agoTribes should only depend on JULI
markt [Sat, 11 Dec 2010 22:20:10 +0000 (22:20 +0000)]
Tribes should only depend on JULI

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

14 years agoo.a.tomcat.jni should not have any external dependencies
markt [Sat, 11 Dec 2010 21:48:22 +0000 (21:48 +0000)]
o.a.tomcat.jni should not have any external dependencies
OK for o.a.naming to have dependencies

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

14 years agoo.a.tomcat.util.net should not depend on o.a.coyote
markt [Sat, 11 Dec 2010 21:35:18 +0000 (21:35 +0000)]
o.a.tomcat.util.net should not depend on o.a.coyote

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

14 years agoo.a.tomcat.util.net should not depend on o.a.catalina
markt [Sat, 11 Dec 2010 21:14:45 +0000 (21:14 +0000)]
o.a.tomcat.util.net should not depend on o.a.catalina

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

14 years agoGet the checkstyle configs to play nicely with Ant and the Eclipse plug-in
markt [Sat, 11 Dec 2010 20:58:28 +0000 (20:58 +0000)]
Get the checkstyle configs to play nicely with Ant and the Eclipse plug-in

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

14 years agoAdd import-control checks to Checkstyle (these found the recent dependency issues)
markt [Sat, 11 Dec 2010 20:38:42 +0000 (20:38 +0000)]
Add import-control checks to Checkstyle (these found the recent dependency issues)
Move checkstyle config to res/checkstyle to stop it cluttering up the root

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

14 years agojavax.el should not depend on javax.servlet.jsp.el
markt [Sat, 11 Dec 2010 20:36:29 +0000 (20:36 +0000)]
javax.el should not depend on javax.servlet.jsp.el

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

14 years agoCoyote should not depend on Catalina
markt [Sat, 11 Dec 2010 18:27:15 +0000 (18:27 +0000)]
Coyote should not depend on Catalina

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=50448
markt [Fri, 10 Dec 2010 13:54:16 +0000 (13:54 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50448
Regression caused by http://svn.apache.org/viewvc?view=revision&revision=1036281

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

15 years agoAvoid duplicate constant definition.
markt [Fri, 10 Dec 2010 12:28:20 +0000 (12:28 +0000)]
Avoid duplicate constant definition.
Use Constants defined by the Servlet/JSP specs where appropriate
Use Constants in preference to local Strings

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=50413
markt [Fri, 10 Dec 2010 10:11:38 +0000 (10:11 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50413
Ensure 304s are not returned when using static files as error pages

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

15 years agoMissed file in r1044255
markt [Fri, 10 Dec 2010 10:06:44 +0000 (10:06 +0000)]
Missed file in r1044255

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

15 years agoFix FindBugs / unused code warnings
markt [Fri, 10 Dec 2010 09:47:05 +0000 (09:47 +0000)]
Fix FindBugs / unused code warnings

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

15 years agoFix Eclipse warnings in package
markt [Thu, 9 Dec 2010 23:58:20 +0000 (23:58 +0000)]
Fix Eclipse warnings in package

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

15 years agoFix Eclipse warnings in package
markt [Thu, 9 Dec 2010 23:54:21 +0000 (23:54 +0000)]
Fix Eclipse warnings in package

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

15 years agoRemove redundant interface definitions and fix other warnings (missing @Overrides...
markt [Thu, 9 Dec 2010 23:47:57 +0000 (23:47 +0000)]
Remove redundant interface definitions and fix other warnings (missing @Overrides) in same files

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

15 years agoGrrr. Missed a couple of @Override markers
markt [Thu, 9 Dec 2010 23:30:15 +0000 (23:30 +0000)]
Grrr. Missed a couple of @Override markers

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

15 years agoFix missing @Override markers in Jasper and remove an unnecessary null check
markt [Thu, 9 Dec 2010 23:29:15 +0000 (23:29 +0000)]
Fix missing @Override markers in Jasper and remove an unnecessary null check

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

15 years agobug 49159: Improve ThreadLocal memory leak clean-up
slaurent [Thu, 9 Dec 2010 22:11:27 +0000 (22:11 +0000)]
bug 49159: Improve ThreadLocal memory leak clean-up
https://issues.apache.org/bugzilla/show_bug.cgi?id=49159

Use a dedicated thread when calling web application code when it is started and stopped (calls to Listeners, Filters, Servlets).

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

15 years agoRegister the correct object after the refactoring
markt [Thu, 9 Dec 2010 21:11:39 +0000 (21:11 +0000)]
Register the correct object after the refactoring

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=50360
markt [Thu, 9 Dec 2010 19:49:24 +0000 (19:49 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50360
Add an option to control when the socket is bound

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

15 years agomserver != null will never be true if the mbean was registered. Drop the check since...
markt [Thu, 9 Dec 2010 19:15:30 +0000 (19:15 +0000)]
mserver != null will never be true if the mbean was registered. Drop the check since the unregister method will handle things correctly anyway

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

15 years agoRe-factoring in support of https://issues.apache.org/bugzilla/show_bug.cgi?id=50360
markt [Thu, 9 Dec 2010 19:02:01 +0000 (19:02 +0000)]
Re-factoring in support of https://issues.apache.org/bugzilla/show_bug.cgi?id=50360
Log the right message at the right point

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

15 years agoignore work and logs directories as discussed on dev list
slaurent [Thu, 9 Dec 2010 18:59:14 +0000 (18:59 +0000)]
ignore work and logs directories as discussed on dev list

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

15 years agobug 49159: Improve ThreadLocal memory leak clean-up
slaurent [Thu, 9 Dec 2010 18:55:04 +0000 (18:55 +0000)]
bug 49159: Improve ThreadLocal memory leak clean-up
https://issues.apache.org/bugzilla/show_bug.cgi?id=49159

some formatting after discussion over the list (operator at the end of line, unnecessary cast)

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

15 years agoRe-factoring in support of https://issues.apache.org/bugzilla/show_bug.cgi?id=50360
markt [Thu, 9 Dec 2010 18:10:38 +0000 (18:10 +0000)]
Re-factoring in support of https://issues.apache.org/bugzilla/show_bug.cgi?id=50360
Move ad-hoc attribute handling from the ProtocolHandler to the Endpoint and expose the Endpoint to ServerSocketFactory objects so they can retrieve additional configuration if required. All default components now use explicit configuration rather than relying on the ad-hoc mechanism.
Ensure the hooks for alternative SSL implementations are in place (were partially removed).
Remove the hooks for alternative ServerSocketFactory implementations (had been hard-coded / half implemented for some time).
Make the sslEnabledProtocols attribute work with BIO as well.

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

15 years ago- Fixed brace and paren placement
schultz [Thu, 9 Dec 2010 14:35:28 +0000 (14:35 +0000)]
- Fixed brace and paren placement
- Changed Connector.isParseBodyMethod from public -> protected
- Relaxed language claiming that use of parseBodyMethods may "violate" the servlet spec
- Moved error message to LocalStrings.properties (Translations requested)

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

15 years agoRemoved a little more unused code
markt [Wed, 8 Dec 2010 22:25:04 +0000 (22:25 +0000)]
Removed a little more unused code

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

15 years agoRe-factoring in support of https://issues.apache.org/bugzilla/show_bug.cgi?id=50360
markt [Wed, 8 Dec 2010 17:15:50 +0000 (17:15 +0000)]
Re-factoring in support of https://issues.apache.org/bugzilla/show_bug.cgi?id=50360
ProtocolHandler should register itself with MBean server rather than have the connector do it.

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

15 years agoRemove some unused code
markt [Wed, 8 Dec 2010 15:07:20 +0000 (15:07 +0000)]
Remove some unused code
Fix some FindBugs niggles

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

15 years agoRe-factoring in support of https://issues.apache.org/bugzilla/show_bug.cgi?id=50360
markt [Wed, 8 Dec 2010 14:51:10 +0000 (14:51 +0000)]
Re-factoring in support of https://issues.apache.org/bugzilla/show_bug.cgi?id=50360
Pull up start()

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

15 years agoRe-factoring in support of https://issues.apache.org/bugzilla/show_bug.cgi?id=50360
markt [Wed, 8 Dec 2010 14:36:26 +0000 (14:36 +0000)]
Re-factoring in support of https://issues.apache.org/bugzilla/show_bug.cgi?id=50360
Move MBean registration from start() to init(). More MBean refactoring expected

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

15 years agoFix copy/paste error
markt [Wed, 8 Dec 2010 14:33:51 +0000 (14:33 +0000)]
Fix copy/paste error

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

15 years agoRe-factoring in support of https://issues.apache.org/bugzilla/show_bug.cgi?id=50360
markt [Wed, 8 Dec 2010 14:19:23 +0000 (14:19 +0000)]
Re-factoring in support of https://issues.apache.org/bugzilla/show_bug.cgi?id=50360
Pull up init()

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

15 years agoAlign BIO+JSSE with NIO+JSSE
markt [Wed, 8 Dec 2010 14:09:26 +0000 (14:09 +0000)]
Align BIO+JSSE with NIO+JSSE

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

15 years agoFix indents
markt [Wed, 8 Dec 2010 13:52:06 +0000 (13:52 +0000)]
Fix indents

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

15 years agoJSSE will always be available in Tomcat 7
markt [Wed, 8 Dec 2010 13:51:42 +0000 (13:51 +0000)]
JSSE will always be available in Tomcat 7

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

15 years agoRe-factoring in support of https://issues.apache.org/bugzilla/show_bug.cgi?id=50360
markt [Wed, 8 Dec 2010 13:37:11 +0000 (13:37 +0000)]
Re-factoring in support of https://issues.apache.org/bugzilla/show_bug.cgi?id=50360
Align the init() methods (JSSE still to go)

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

15 years agoNice idea, but need i18n for the actions so each needs its own string
markt [Wed, 8 Dec 2010 13:10:34 +0000 (13:10 +0000)]
Nice idea, but need i18n for the actions so each needs its own string

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

15 years agoRe-factoring in support of https://issues.apache.org/bugzilla/show_bug.cgi?id=50360
markt [Wed, 8 Dec 2010 13:06:46 +0000 (13:06 +0000)]
Re-factoring in support of https://issues.apache.org/bugzilla/show_bug.cgi?id=50360
Pull up stop()

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

15 years agoRe-factoring in support of https://issues.apache.org/bugzilla/show_bug.cgi?id=50360
markt [Wed, 8 Dec 2010 12:57:54 +0000 (12:57 +0000)]
Re-factoring in support of https://issues.apache.org/bugzilla/show_bug.cgi?id=50360
Pull up pause() and resume() methods

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

15 years agoRemove unused welcome file handling code
markt [Wed, 8 Dec 2010 11:36:49 +0000 (11:36 +0000)]
Remove unused welcome file handling code

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

15 years agoRemove unused code
markt [Wed, 8 Dec 2010 01:31:51 +0000 (01:31 +0000)]
Remove unused code

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

15 years agoRemove unused code
markt [Wed, 8 Dec 2010 01:21:12 +0000 (01:21 +0000)]
Remove unused code

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

15 years agoRemove unused code.
markt [Wed, 8 Dec 2010 01:14:43 +0000 (01:14 +0000)]
Remove unused code.
Make spacing consistent.

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

15 years agoJasper should not depend on Catalina
markt [Wed, 8 Dec 2010 01:12:03 +0000 (01:12 +0000)]
Jasper should not depend on Catalina
Re-use constants where possible
Fix a FindBugs niggle

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

15 years agoAnother Findbugs niggle
markt [Wed, 8 Dec 2010 01:01:56 +0000 (01:01 +0000)]
Another Findbugs niggle

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

15 years agoFix some FindBugs warnings - all unclosed streams. These could potentially lead to...
markt [Tue, 7 Dec 2010 18:36:39 +0000 (18:36 +0000)]
Fix some FindBugs warnings - all unclosed streams. These could potentially lead to locked files and maybe memory leaks.
Fix some other simple FindBugs/Eclipse warnings in affected files.

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

15 years agoFix a couple of 'high priority' FindBugs warnings
markt [Tue, 7 Dec 2010 18:05:31 +0000 (18:05 +0000)]
Fix a couple of 'high priority' FindBugs warnings

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

15 years agoAdd checkstyle rule for modifier order and fix remaining issues in current code base
markt [Tue, 7 Dec 2010 15:43:37 +0000 (15:43 +0000)]
Add checkstyle rule for modifier order and fix remaining issues in current code base

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

15 years agoFix modifier order in org.apache.catalina.*
markt [Tue, 7 Dec 2010 15:42:32 +0000 (15:42 +0000)]
Fix modifier order in org.apache.catalina.*

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

15 years agoFix modifier order in org.apache.naming.*
markt [Tue, 7 Dec 2010 15:40:49 +0000 (15:40 +0000)]
Fix modifier order in org.apache.naming.*

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

15 years agoFix modifier order in org.apache.tomcat.*
markt [Tue, 7 Dec 2010 15:40:06 +0000 (15:40 +0000)]
Fix modifier order in org.apache.tomcat.*

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

15 years agoFix modifier order in org.apache.jasper.*
markt [Tue, 7 Dec 2010 15:39:09 +0000 (15:39 +0000)]
Fix modifier order in org.apache.jasper.*

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

15 years agoFix modifier order in org.apache.el.*
markt [Tue, 7 Dec 2010 15:38:06 +0000 (15:38 +0000)]
Fix modifier order in org.apache.el.*

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

15 years agoFix modifier order in javax.*
markt [Tue, 7 Dec 2010 15:36:36 +0000 (15:36 +0000)]
Fix modifier order in javax.*

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

15 years agoAnother day, another check
markt [Tue, 7 Dec 2010 14:01:21 +0000 (14:01 +0000)]
Another day, another check

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

15 years agoTypo
markt [Tue, 7 Dec 2010 14:00:42 +0000 (14:00 +0000)]
Typo

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

15 years agoRe-factoring in support of https://issues.apache.org/bugzilla/show_bug.cgi?id=50360
markt [Tue, 7 Dec 2010 00:08:38 +0000 (00:08 +0000)]
Re-factoring in support of https://issues.apache.org/bugzilla/show_bug.cgi?id=50360
Pull up the concrete destroy() method - required a fair bit of refactoring
Pull up the abstract init() method()

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

15 years agoRe-factoring in support of https://issues.apache.org/bugzilla/show_bug.cgi?id=50360
markt [Mon, 6 Dec 2010 23:22:44 +0000 (23:22 +0000)]
Re-factoring in support of https://issues.apache.org/bugzilla/show_bug.cgi?id=50360
Add the necessary plumbing for the AbstractProtocolHandler to perform the JMX registration

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

15 years agoFix auto-completion snafu
markt [Mon, 6 Dec 2010 22:19:35 +0000 (22:19 +0000)]
Fix auto-completion snafu

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