git.internetallee.de Git

markt [Tue, 11 May 2010 11:06:02 +0000 (11:06 +0000)]

No need to remove LifecycleListeners from destroyed components

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

commit | commitdiff | tree

markt [Tue, 11 May 2010 10:18:55 +0000 (10:18 +0000)]

ContainerListener != LifecycleListener. Use the correct one.

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

commit | commitdiff | tree

markt [Tue, 11 May 2010 09:46:42 +0000 (09:46 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49240
If a class can't be loaded, don't scan HandlesTypes for it
Also handle NoClassDefFoundError
Patch provided by pid

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

commit | commitdiff | tree

markt [Tue, 11 May 2010 08:01:52 +0000 (08:01 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49269
Set maxIdle to maxActive by default to prevent warning on start when maxIdle > maxActive
Patch provided by Matt Passell

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

commit | commitdiff | tree

markt [Mon, 10 May 2010 16:17:22 +0000 (16:17 +0000)]

Extend Lifecycle/MBean refactoring to ContainerBase

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

commit | commitdiff | tree

markt [Mon, 10 May 2010 15:44:52 +0000 (15:44 +0000)]

Make sure Tomcat instance is closed down correctly (prevents warnings in the logs).

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

commit | commitdiff | tree

markt [Mon, 10 May 2010 15:41:58 +0000 (15:41 +0000)]

Allow the transition from NEW to DESTROYED for objects that are never started.

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

commit | commitdiff | tree

markt [Sun, 9 May 2010 16:12:41 +0000 (16:12 +0000)]

Fix FindBugs warning

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

commit | commitdiff | tree

markt [Sat, 8 May 2010 16:01:16 +0000 (16:01 +0000)]

Stop the tests failing

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

commit | commitdiff | tree

markt [Sat, 8 May 2010 15:54:44 +0000 (15:54 +0000)]

Fix JULI configuration so JULI is actually used.
Fix FindBugs warnings

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

commit | commitdiff | tree

markt [Sat, 8 May 2010 15:31:53 +0000 (15:31 +0000)]

Clean up experimental (from Tomcat 5) MBean registration feature of StandardEngine prior to Lifecycle/MBean refactoring for ContainerBase

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

commit | commitdiff | tree

markt [Fri, 7 May 2010 17:38:03 +0000 (17:38 +0000)]

Add a simple CSRF prevention filter. It has been tested with the Tomcat 6 manager app and a back-port proposal will follow shortly.

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

commit | commitdiff | tree

markt [Thu, 6 May 2010 22:19:17 +0000 (22:19 +0000)]

IBM has agreed to re-license the affected files.
A patch was provided by an IBM employee with a CLA on file under https://issues.apache.org/bugzilla/show_bug.cgi?id=49259
The files can now therefore be treated the same way as the other BCEL files.
The updated files have been applied to BCEL and I have copied them across to Tomcat 7 and made the same set of changes as I made previously.
The various LICENSE and NOTICE changes made in r934220 have been reverted.
Thanks to Kevan Miller and his IBM colleagues for working to resolve this so quickly.

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

commit | commitdiff | tree

jfclere [Thu, 6 May 2010 13:44:15 +0000 (13:44 +0000)]

make sure the entropy can be converted to a String.

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

commit | commitdiff | tree

markt [Thu, 6 May 2010 12:13:20 +0000 (12:13 +0000)]

Descriptions need to be on a single line
Fix attribute alignment so file is consistent

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

commit | commitdiff | tree

markt [Thu, 6 May 2010 12:07:20 +0000 (12:07 +0000)]

GSoC 2010: Add missing attributes, use alphabetical ordering
Patch provided by Chamith Buddhika

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

commit | commitdiff | tree

markt [Thu, 6 May 2010 11:57:14 +0000 (11:57 +0000)]

GSoC 2010: Make some JMX attributes read-only
Based on a patch provided by Chamith Buddhika

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

commit | commitdiff | tree

markt [Wed, 5 May 2010 23:27:26 +0000 (23:27 +0000)]

Typo

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

commit | commitdiff | tree

markt [Wed, 5 May 2010 23:23:38 +0000 (23:23 +0000)]

Document comet package move

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

commit | commitdiff | tree

kkolinko [Wed, 5 May 2010 20:13:30 +0000 (20:13 +0000)]

More anchor handling improvements:
1) escape '#' character as well as spaces. See virtual-hosting-howto.html for an example.
2) allow to explicitly specify anchor name, using anchor="" attribute on a (sub)section. See default-servlet.html for an example.

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

commit | commitdiff | tree

kkolinko [Wed, 5 May 2010 18:50:49 +0000 (18:50 +0000)]

Correct a sentence

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

commit | commitdiff | tree

kkolinko [Wed, 5 May 2010 15:45:21 +0000 (15:45 +0000)]

Replace spaces with underscore in HTML anchor names.
To preserve compatibility each (sub)section will now generate two anchors:
the old one and the new one, if they differ.
It is port of r936982 from tomcat/site

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

commit | commitdiff | tree

markt [Wed, 5 May 2010 09:05:42 +0000 (09:05 +0000)]

GSoC 2010: Add missing JMX attributes
Patch provided by Chamith Buddhika

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

commit | commitdiff | tree

markt [Tue, 4 May 2010 21:51:37 +0000 (21:51 +0000)]

Re-factor Realms to use LifecycleMBeanBase

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

commit | commitdiff | tree

rjung [Tue, 4 May 2010 19:14:53 +0000 (19:14 +0000)]

Fix copy&paste error in script comment.

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

commit | commitdiff | tree

markt [Tue, 4 May 2010 15:07:33 +0000 (15:07 +0000)]

Rename Eclipse files so they become samples
Align the svn ignores list and the excludes list for the src tarball. The sample Eclipse files will be included, the 'real' ones will be excluded.
Add ALv2 headers to sample Eclipse files

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

commit | commitdiff | tree

markt [Tue, 4 May 2010 10:59:52 +0000 (10:59 +0000)]

Re-factor Valves to use LifecycleMBeanBase

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

commit | commitdiff | tree

markt [Mon, 3 May 2010 22:50:52 +0000 (22:50 +0000)]

Move ManagerBase to new Lifecycle/MBean implementation
Fix a bunch of Eclipse/FindBugs warnings

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

commit | commitdiff | tree

markt [Mon, 3 May 2010 22:29:11 +0000 (22:29 +0000)]

Remove unnecessary code

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

commit | commitdiff | tree

markt [Mon, 3 May 2010 22:18:43 +0000 (22:18 +0000)]

Fix the tests the Lifecycle/MBean refactoring in r940634 broke.

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

commit | commitdiff | tree

markt [Mon, 3 May 2010 21:40:52 +0000 (21:40 +0000)]

With the benefit of some sleep, refactor the MBean support for Lifecycle (still some components to convert)
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49134
Thanks to Marc Guillemot whose test case for 49134 provided the basis of o.a.c.mbeans.TestRegistration

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

commit | commitdiff | tree

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

commit | commitdiff | 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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

kkolinko [Thu, 29 Apr 2010 14:02:25 +0000 (14:02 +0000)]

commit | commitdiff | tree

kkolinko [Thu, 29 Apr 2010 14:01:02 +0000 (14:01 +0000)]

commit | commitdiff | tree

kkolinko [Thu, 29 Apr 2010 13:54:26 +0000 (13:54 +0000)]

commit | commitdiff | tree

kkolinko [Thu, 29 Apr 2010 13:43:39 +0000 (13:43 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

pero [Wed, 28 Apr 2010 22:16:49 +0000 (22:16 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Unnamed repository; edit this file to name it for gitweb.

RSS Atom