tomcat7.0
15 years agohttps://issues.apache.org/bugzilla/show_bug.cgi?id=49241
fhanik [Mon, 3 May 2010 19:12:48 +0000 (19:12 +0000)]
https://issues.apache.org/bugzilla/show_bug.cgi?id=49241

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

15 years agoRemove classes that are no longer in the source tree
markt [Mon, 3 May 2010 17:15:00 +0000 (17:15 +0000)]
Remove classes that are no longer in the source tree

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

15 years agoBetter error message
markt [Mon, 3 May 2010 15:47:15 +0000 (15:47 +0000)]
Better error message

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

15 years agoSearch to more jars and fix testcase!
pero [Mon, 3 May 2010 09:44:39 +0000 (09:44 +0000)]
Search to more jars and fix testcase!

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

15 years agoSimplify the connector. Keep a reference to just the Service rather than the Service...
markt [Sun, 2 May 2010 23:47:51 +0000 (23:47 +0000)]
Simplify the connector. Keep a reference to just the Service rather than the Service and the Engine.

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

15 years agoClean-up prior to MBean changes
markt [Sun, 2 May 2010 19:17:52 +0000 (19:17 +0000)]
Clean-up prior to MBean changes

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

15 years agoIncrease the threshold to try and catch if MBean registration breaks and MBeans don...
markt [Sun, 2 May 2010 19:13:34 +0000 (19:13 +0000)]
Increase the threshold to try and catch if MBean registration breaks and MBeans don't get registered.

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

15 years agoAdd a setDomain() method to LifecycleMBeanRegistration since not all components ...
markt [Sun, 2 May 2010 19:10:40 +0000 (19:10 +0000)]
Add a setDomain() method to LifecycleMBeanRegistration since not all components (eg Exectutor) retain a reference to their parent.
Implement this new method where required.
Implement MBean (de)registration for Executors using the new interface.

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

15 years agoJust log multiple calls to destroy rather than throwing an Exception.
markt [Sun, 2 May 2010 19:05:07 +0000 (19:05 +0000)]
Just log multiple calls to destroy rather than throwing an Exception.

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

15 years agoAdd LifecycleMBeanRegistration
markt [Sun, 2 May 2010 18:47:56 +0000 (18:47 +0000)]
Add LifecycleMBeanRegistration
Align init() and destroy()
Executors and Connectors need to handle their own (de)registration

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

15 years agoMake sure Server calls destroy() on subordinate Services
markt [Sun, 2 May 2010 18:31:41 +0000 (18:31 +0000)]
Make sure Server calls destroy() on subordinate Services

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

15 years agoRegister the MBeanFactory
markt [Sun, 2 May 2010 18:13:34 +0000 (18:13 +0000)]
Register the MBeanFactory
Make sure all the objects registered are unregistered

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

15 years agoNo longer need ServerLifecycleListener
markt [Sun, 2 May 2010 18:10:12 +0000 (18:10 +0000)]
No longer need ServerLifecycleListener

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

15 years agoAdd call to destroy() that should unregister all the MBeans
markt [Sun, 2 May 2010 18:02:34 +0000 (18:02 +0000)]
Add call to destroy() that should unregister all the MBeans

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

15 years agoAdd init() and destroy() support
markt [Sun, 2 May 2010 18:01:58 +0000 (18:01 +0000)]
Add init() and destroy() support

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

15 years agoAlign test with expected behaviour (currently fails). Will fix in following commits.
markt [Sun, 2 May 2010 17:58:28 +0000 (17:58 +0000)]
Align test with expected behaviour (currently fails). Will fix in following commits.

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

15 years agoRemove invalid auto-generated import.
markt [Sun, 2 May 2010 17:47:31 +0000 (17:47 +0000)]
Remove invalid auto-generated import.

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

15 years agoAdd new interface to StandardServer to enable MBean (de)registration on init/destroy
markt [Sun, 2 May 2010 17:36:38 +0000 (17:36 +0000)]
Add new interface to StandardServer to enable MBean (de)registration on init/destroy

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

15 years agoLine lengths. No functional change.
markt [Sun, 2 May 2010 17:35:10 +0000 (17:35 +0000)]
Line lengths. No functional change.

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

15 years agoAdd MBean registration and de-registration to LifecycleBase
markt [Sun, 2 May 2010 17:34:33 +0000 (17:34 +0000)]
Add MBean registration and de-registration to LifecycleBase
The new interface will need to be added to each component to get this to work.

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

15 years agoClean-up post init/destroy lifecycle refactoring
markt [Sun, 2 May 2010 14:26:54 +0000 (14:26 +0000)]
Clean-up post init/destroy lifecycle refactoring
Allow Manager objects to be restarted

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

15 years agoClean-up post init/destroy lifecycle refactoring
markt [Sun, 2 May 2010 14:26:34 +0000 (14:26 +0000)]
Clean-up post init/destroy lifecycle refactoring
Allow Loader objects to be restarted

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

15 years agoClean-up post init/destroy lifecycle refactoring
markt [Sun, 2 May 2010 14:25:42 +0000 (14:25 +0000)]
Clean-up post init/destroy lifecycle refactoring
By default, remove children on destroy, not stop

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

15 years agotry to fix async for APR.
jfclere [Sun, 2 May 2010 10:02:56 +0000 (10:02 +0000)]
try to fix async for APR.

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

15 years agoRevert... Editor seams display problem... Sorry!
pero [Sun, 2 May 2010 09:44:01 +0000 (09:44 +0000)]
Revert... Editor seams display problem... Sorry!

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

15 years agoAdd License Header
pero [Sun, 2 May 2010 09:40:46 +0000 (09:40 +0000)]
Add License Header

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

15 years agoRemove the controller - MBean registration will always happen in init()/destroy(...
markt [Sat, 1 May 2010 17:44:26 +0000 (17:44 +0000)]
Remove the controller - MBean registration will always happen in init()/destroy() after Lifecycle refactoring
Fix a handful of Eclipse/FindBugs warnings

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

15 years agoLog any unexpected errors that might occur during server shutdown from the shutdown...
kkolinko [Sat, 1 May 2010 16:00:29 +0000 (16:00 +0000)]
Log any unexpected errors that might occur during server shutdown from the shutdown hook,
and do not forget to shutdown (read: flush) the logging subsystem.

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

15 years agoMake md volatile to be sure there are no threading issues
markt [Sat, 1 May 2010 15:44:33 +0000 (15:44 +0000)]
Make md volatile to be sure there are no threading issues

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

15 years agoI can't see any reason why a Realm shouldn't be re-startable by default. Individual...
markt [Sat, 1 May 2010 15:41:46 +0000 (15:41 +0000)]
I can't see any reason why a Realm shouldn't be re-startable by default. Individual Realms can always override this.

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

15 years agoAnother fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=49092
markt [Sat, 1 May 2010 15:20:31 +0000 (15:20 +0000)]
Another fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=49092
Make constant final

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

15 years agoMinor clean-up having reviewed the diff between current code and the code prior to...
markt [Sat, 1 May 2010 14:26:50 +0000 (14:26 +0000)]
Minor clean-up having reviewed the diff between current code and the code prior to the Lifecycle re-factoring

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

15 years agoGet the shutdown hook working again.
markt [Sat, 1 May 2010 14:18:05 +0000 (14:18 +0000)]
Get the shutdown hook working again.
Now LifecycleBase uses synchronized methods, Catalina can't extend it else the shutdown hook can't function.

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

15 years agoClarify
markt [Sat, 1 May 2010 14:12:34 +0000 (14:12 +0000)]
Clarify

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

15 years agoClean up start code. Catalina no longer implements Service. The model is now: Bootstr...
markt [Sat, 1 May 2010 14:08:47 +0000 (14:08 +0000)]
Clean up start code. Catalina no longer implements Service. The model is now: Bootstrap sorts out the class loaders, Catalina does the remaining plumbing and holds a reference to a Server object which in turn contains 1 or more services etc. Still need to fix the shutdown hook.

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

15 years agoDocument must destroy state
markt [Sat, 1 May 2010 13:43:03 +0000 (13:43 +0000)]
Document must destroy state

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

15 years agoAdd init() and destroy() to the Lifecycle interface
markt [Sat, 1 May 2010 13:31:46 +0000 (13:31 +0000)]
Add init() and destroy() to the Lifecycle interface
Note that this commit breaks the shutdown hook. I'll fix that in a following commit.

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

15 years agoFix wrapped and thus broken $Id$. Use $Revision$ instead, because it is shorter.
kkolinko [Sat, 1 May 2010 11:59:54 +0000 (11:59 +0000)]
Fix wrapped and thus broken $Id$. Use $Revision$ instead, because it is shorter.

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

15 years agoSpace to tab
pero [Fri, 30 Apr 2010 18:49:52 +0000 (18:49 +0000)]
Space to tab

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

15 years agoAdd second resource jar and testcase failed again :-( You can switch assert resourceF...
pero [Fri, 30 Apr 2010 12:10:08 +0000 (12:10 +0000)]
Add second resource jar and testcase failed again :-( You can switch assert resourceF and see that also resourceB test failed..

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

15 years agoFix NPE if no encoding parameter exists at request!
pero [Fri, 30 Apr 2010 11:25:10 +0000 (11:25 +0000)]
Fix NPE if no encoding parameter exists at request!

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

15 years agoweb.xml or fragment must merge with annotations s. Servlet Spec 3.0 8.2.3
pero [Fri, 30 Apr 2010 11:23:41 +0000 (11:23 +0000)]
web.xml or fragment must merge with annotations s. Servlet Spec 3.0 8.2.3

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49236
kkolinko [Fri, 30 Apr 2010 09:56:35 +0000 (09:56 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49236
Do not use indexing when packing Tomcat JARs.

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49218
kkolinko [Fri, 30 Apr 2010 04:00:01 +0000 (04:00 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49218
The test runs successfully if JreMemoryLeakPreventionListener is present.

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

15 years agoLog unexpected runtima and IO errors in ApplicationContext#getResource() and Applicat...
kkolinko [Fri, 30 Apr 2010 03:49:40 +0000 (03:49 +0000)]
Log unexpected runtima and IO errors in ApplicationContext#getResource() and ApplicationContext#getResourceAsStream(). This is inspired by BZ 49218.

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

15 years agoPer documentation:
fhanik [Thu, 29 Apr 2010 22:00:17 +0000 (22:00 +0000)]
Per documentation:
http://java.sun.com/javase/6/docs/api/javax/security/auth/Subject.html
Therefore all concrete Principal implementations associated with Subjects must implement Serializable.

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

15 years agoFix to correct JarScanner (StandardJarScanner) default!
pero [Thu, 29 Apr 2010 15:21:54 +0000 (15:21 +0000)]
Fix to correct JarScanner (StandardJarScanner) default!

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

15 years agoSet svn:keywords=Id where there is unexpanded $Id$ keyword in the files
kkolinko [Thu, 29 Apr 2010 14:23:46 +0000 (14:23 +0000)]
Set svn:keywords=Id where there is unexpanded $Id$ keyword in the files

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

15 years agoReplace $Date$ with $Id$ because of its i18n and timezone issues
kkolinko [Thu, 29 Apr 2010 14:11:01 +0000 (14:11 +0000)]
Replace $Date$ with $Id$ because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

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

15 years agoReplace $Date$ with $Id$ because of its i18n and timezone issues
kkolinko [Thu, 29 Apr 2010 14:02:25 +0000 (14:02 +0000)]
Replace $Date$ with $Id$ because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

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

15 years agoReplace $Date$ with $Id$ because of its i18n and timezone issues
kkolinko [Thu, 29 Apr 2010 14:01:02 +0000 (14:01 +0000)]
Replace $Date$ with $Id$ because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

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

15 years agoReplace $Date$ with $Id$ because of its i18n and timezone issues
kkolinko [Thu, 29 Apr 2010 13:54:26 +0000 (13:54 +0000)]
Replace $Date$ with $Id$ because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

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

15 years agoReplace $Date$ with $Id$ because of its i18n and timezone issues
kkolinko [Thu, 29 Apr 2010 13:43:39 +0000 (13:43 +0000)]
Replace $Date$ with $Id$ because of its i18n and timezone issues
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

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

15 years agoRemove MultiMap class. It is never used.
kkolinko [Thu, 29 Apr 2010 12:52:36 +0000 (12:52 +0000)]
Remove MultiMap class. It is never used.
Note, that its implementation was incomplete, e.g. MultiMap.Field#name and #value fields are never assigned.

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

15 years agoMove and rename the aliases support test.
kkolinko [Thu, 29 Apr 2010 11:48:38 +0000 (11:48 +0000)]
Move and rename the aliases support test.

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

15 years agoTests for Servlet 3.0 support of bundling static resources in META-INF/resources...
kkolinko [Thu, 29 Apr 2010 10:24:14 +0000 (10:24 +0000)]
Tests for Servlet 3.0 support of bundling static resources in META-INF/resources subdirectory of a jar file.
It is a separate web application, because the old "webapp-3.0" has metadata-complete="true".

The tests in TestStandardContextResources are currently failing,
and thus are disabled until a solution is found. See the comment in TestStandardContextResources.java

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

15 years ago$Date$ was wrapped and thus broken in r939212
kkolinko [Thu, 29 Apr 2010 07:30:29 +0000 (07:30 +0000)]
$Date$ was wrapped and thus broken in r939212

Replacing with $Id$ because of i18n and timezone issues that $Date$ has
(http://subversion.tigris.org/issues/show_bug.cgi?id=2332)

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

15 years agoFix my IDE and use spaces. - No functional change
pero [Thu, 29 Apr 2010 06:37:20 +0000 (06:37 +0000)]
Fix my IDE and use spaces. - No functional change

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

15 years agoIt isn't practical to list every single commit that implemented Servlet 3.0.
markt [Thu, 29 Apr 2010 00:36:35 +0000 (00:36 +0000)]
It isn't practical to list every single commit that implemented Servlet 3.0.

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

15 years agoFollow up on pero's review comments.
markt [Wed, 28 Apr 2010 23:07:43 +0000 (23:07 +0000)]
Follow up on pero's review comments.

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

15 years agoweb.xml and fragments overwrite annotation parameters (s. Servlet API Sepc Nov 2009...
pero [Wed, 28 Apr 2010 22:18:24 +0000 (22:18 +0000)]
web.xml and fragments overwrite annotation parameters (s. Servlet API Sepc Nov 2009 Section 8.2.3.3 pages 80-84)
not yet complete -- filter support is missing!

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

15 years agoweb.xml and fragments overwrite annotation parameters (s. Servlet API Sepc Nov 2009...
pero [Wed, 28 Apr 2010 22:16:49 +0000 (22:16 +0000)]
web.xml and fragments overwrite annotation parameters (s. Servlet API Sepc Nov 2009 Section 8.2.3.3 pages 80-84)
not yet complete -- filter support is missing!

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

15 years agoImplement support for running the tests when the build output directory has non-defau...
kkolinko [Wed, 28 Apr 2010 18:49:11 +0000 (18:49 +0000)]
Implement support for running the tests when the build output directory has non-default value.

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49207
kkolinko [Wed, 28 Apr 2010 16:21:32 +0000 (16:21 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49207
FilterMap#filterName was null when it was configured dynamically with addMappingForUrlPatterns()
Patch provided by Pid

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

15 years agoMark StandardContext#aliases as private, because there is a getter method.
kkolinko [Wed, 28 Apr 2010 09:08:52 +0000 (09:08 +0000)]
Mark StandardContext#aliases as private, because there is a getter method.

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

15 years agoUse a helper class to manage the filter mappings.
kkolinko [Wed, 28 Apr 2010 08:21:32 +0000 (08:21 +0000)]
Use a helper class to manage the filter mappings.
Fix ArrayIndexOutOfBoundsException in addFilterMapBefore as reported in re: r937975 thread.

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

15 years agominor tweaks for versions
funkman [Wed, 28 Apr 2010 00:34:46 +0000 (00:34 +0000)]
minor tweaks for versions

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

15 years agojava 6, not java5
funkman [Wed, 28 Apr 2010 00:26:27 +0000 (00:26 +0000)]
java 6, not java5

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

15 years agos/2.1/2.2/ for jsp spec version
funkman [Wed, 28 Apr 2010 00:24:13 +0000 (00:24 +0000)]
s/2.1/2.2/ for jsp spec version

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49073
markt [Tue, 27 Apr 2010 12:50:38 +0000 (12:50 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49073

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

15 years agoIf the class implements both interfaces then call addApplicationLifecycleListener...
kkolinko [Tue, 27 Apr 2010 09:01:37 +0000 (09:01 +0000)]
If the class implements both interfaces then call addApplicationLifecycleListener only once.

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

15 years agoSimplify code
kkolinko [Tue, 27 Apr 2010 08:04:41 +0000 (08:04 +0000)]
Simplify code

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

15 years agoInclude .project and .classpath files to src distribution.
pero [Mon, 26 Apr 2010 10:46:01 +0000 (10:46 +0000)]
Include .project and .classpath files to src distribution.
s. http://ant.apache.org/manual/dirtasks.html#defaultexcludes to not include scm files!

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49184
markt [Mon, 26 Apr 2010 09:17:46 +0000 (09:17 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49184
Prevent ArrayIndexOutOfBoundsException
Patch provided by Pid

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=48689
markt [Sun, 25 Apr 2010 12:56:32 +0000 (12:56 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48689
Access TLD files through a new JarResource interface to make extending Jasper simpler, particularly in OSGi environments.
Patch provided by Jarek Gawor.

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=48358
markt [Sun, 25 Apr 2010 12:19:19 +0000 (12:19 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48358
Add the ability to limit the number of JSPs loaded at any one time.

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

15 years agoFix leftover bug from changing the design
markt [Sun, 25 Apr 2010 11:26:29 +0000 (11:26 +0000)]
Fix leftover bug from changing the design

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

15 years agoFix SCI when there is more than one JAR on the classpath
markt [Sun, 25 Apr 2010 11:24:41 +0000 (11:24 +0000)]
Fix SCI when there is more than one JAR on the classpath

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

15 years agoUpdate ignore list now ecj-x.x.x.jar is used directly
markt [Sun, 25 Apr 2010 11:21:41 +0000 (11:21 +0000)]
Update ignore list now ecj-x.x.x.jar is used directly

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

15 years agoAllow time for the OS to do a context switch. Otherwise this fails 100% of the time...
billbarker [Sun, 25 Apr 2010 01:24:33 +0000 (01:24 +0000)]
Allow time for the OS to do a context switch.  Otherwise this fails 100% of the time on my Windows 7 box

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

15 years agoUpdate
markt [Sat, 24 Apr 2010 23:30:28 +0000 (23:30 +0000)]
Update

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49181
markt [Sat, 24 Apr 2010 23:26:20 +0000 (23:26 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49181
Patch provided by Pid

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

15 years agoTrigger a DBCP rebuild if src or bin is missing
markt [Sat, 24 Apr 2010 23:23:23 +0000 (23:23 +0000)]
Trigger a DBCP rebuild if src or bin is missing
Should fix buildbot

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=48222
markt [Sat, 24 Apr 2010 23:11:50 +0000 (23:11 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48222
Provide src JARs for Maven

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

15 years agoBuild script improvements:
markt [Sat, 24 Apr 2010 21:18:40 +0000 (21:18 +0000)]
Build script improvements:
 - build src jars for every jar
 - use ecj-x.x.x.jar directly
 - add an embed-release target

Note: src JARs are required to fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48222 (providing src JARs for Maven)

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

15 years agoThe release build doesn't run the tests
markt [Sat, 24 Apr 2010 21:10:25 +0000 (21:10 +0000)]
The release build doesn't run the tests

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=48644
markt [Sat, 24 Apr 2010 19:26:17 +0000 (19:26 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48644
Don't silently swallow Throwables that need to be re-thrown
Patch provided by Charlotte H (with a few tweaks)
Patch developed during the London GDC OS Jumpstart 2010

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

15 years agoRestore global JNDI support broken in r937542
markt [Sat, 24 Apr 2010 19:21:14 +0000 (19:21 +0000)]
Restore global JNDI support broken in r937542

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49132
markt [Fri, 23 Apr 2010 22:20:33 +0000 (22:20 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49132
Need to start JNDI before listeners are called

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

15 years agoAdd test case for bug 49132.
markt [Fri, 23 Apr 2010 22:19:12 +0000 (22:19 +0000)]
Add test case for bug 49132.
Check JNDI is available when ServletContextListeners start

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

15 years agoRemove unnecessary instanceof tests ID'd by FindBugs
markt [Fri, 23 Apr 2010 15:09:58 +0000 (15:09 +0000)]
Remove unnecessary instanceof tests ID'd by FindBugs

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

15 years agoRemove impossible tests ID'd by FindBugs
markt [Fri, 23 Apr 2010 15:06:40 +0000 (15:06 +0000)]
Remove impossible tests ID'd by FindBugs

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49140
markt [Fri, 23 Apr 2010 15:03:28 +0000 (15:03 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49140
Use appropriate iterators and for-each where possible

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49143
markt [Fri, 23 Apr 2010 14:23:45 +0000 (14:23 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49143
Threading / initialisation issues. Not all were valid. Make them volatile anyway so FindBugs doesn't complain.
Fix some additional issues - use of valueOf() - found along the way

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49144
markt [Fri, 23 Apr 2010 13:59:54 +0000 (13:59 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49144
Not an issue but stop FindBugs complaining
Also fix one other FindBugs report for this class.

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49164
markt [Fri, 23 Apr 2010 13:48:16 +0000 (13:48 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49164
Improve unit tests by propagating failures from spawned threads to main thread.
Patch provided by Felix Schumacher.

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49171
markt [Fri, 23 Apr 2010 13:43:27 +0000 (13:43 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49171
Fix IDE warning
Patch provided by sebb

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

15 years agoServlet 3. Implement ServletContainerInitializer support
markt [Fri, 23 Apr 2010 13:34:17 +0000 (13:34 +0000)]
Servlet 3. Implement ServletContainerInitializer support

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

15 years agoContext aliases:
rjung [Fri, 23 Apr 2010 12:16:56 +0000 (12:16 +0000)]
Context aliases:
- add a little to the docs
- disallow an alias for "/"

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

15 years agoRespect configurable search order in getURLs().
rjung [Thu, 22 Apr 2010 15:14:11 +0000 (15:14 +0000)]
Respect configurable search order in getURLs().

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