tomcat7.0
15 years agoRevert r944511
markt [Sat, 15 May 2010 20:23:06 +0000 (20:23 +0000)]
Revert r944511

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

15 years agoList array elements in the JMX proxy output of the
rjung [Sat, 15 May 2010 12:59:21 +0000 (12:59 +0000)]
List array elements in the JMX proxy output of the
Manager application.

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

15 years agoTCK failures: Fix remaining failures with APR/native and a security Manager
markt [Fri, 14 May 2010 23:43:51 +0000 (23:43 +0000)]
TCK failures: Fix remaining failures with APR/native and a security Manager

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

15 years agoCheck whether context is null.
rjung [Fri, 14 May 2010 23:14:51 +0000 (23:14 +0000)]
Check whether context is null.

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

15 years agoBetter handling for public ID when validation is enabled
markt [Fri, 14 May 2010 20:57:34 +0000 (20:57 +0000)]
Better handling for public ID when validation is enabled

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

15 years agoBetter comment
markt [Fri, 14 May 2010 19:32:17 +0000 (19:32 +0000)]
Better comment

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

15 years agoRemove whitespace
markt [Fri, 14 May 2010 19:19:42 +0000 (19:19 +0000)]
Remove whitespace

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

15 years agoAdd the new contextName property of WebappClassLoader
rjung [Fri, 14 May 2010 18:59:22 +0000 (18:59 +0000)]
Add the new contextName property of WebappClassLoader
to its toString() and expose a read only via JMX.

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

15 years agoAdd Token Poller protection to our list
rjung [Fri, 14 May 2010 17:33:40 +0000 (17:33 +0000)]
Add Token Poller protection to our list
of special leak protection.
It initializes Java Cryptography Architecture
early during startup to prevent the occasional
Token Poller thread being started with the web app
class loader as TCCL.

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

15 years agoPreparation be fore adding a new leak prevention feature:
rjung [Fri, 14 May 2010 17:31:50 +0000 (17:31 +0000)]
Preparation be fore adding a new leak prevention feature:
change order of features to alphabetic like in listener docs.
Makes checking easier.

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

15 years agoFix change fragment absolute-ordering at web.xml with manager redeploy! (Add test...
pero [Fri, 14 May 2010 15:03:35 +0000 (15:03 +0000)]
Fix change fragment absolute-ordering at web.xml with manager redeploy! (Add test fragment samples)

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

15 years agoFix change fragment absolute-ordering at web.xml with manager redeploy!
pero [Fri, 14 May 2010 15:00:06 +0000 (15:00 +0000)]
Fix change fragment absolute-ordering at web.xml with manager redeploy!

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

15 years agoWarn to be used wrong fragment name at web.xml!
pero [Fri, 14 May 2010 12:07:00 +0000 (12:07 +0000)]
Warn to be used wrong fragment name at web.xml!

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

15 years agoFix copy/paste error
markt [Thu, 13 May 2010 21:17:44 +0000 (21:17 +0000)]
Fix copy/paste error
Add whitespace to aid readability

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

15 years agoWhitespace tweaks
markt [Thu, 13 May 2010 20:51:10 +0000 (20:51 +0000)]
Whitespace tweaks

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

15 years agoEssentially revert r943726
markt [Thu, 13 May 2010 20:04:05 +0000 (20:04 +0000)]
Essentially revert r943726
Children may be added prior to calling Context.start() and they *do* need to be started in that case.

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

15 years agoUpdate to JSTL 1.1.2 to fix numerous XML validation issues with TLD files
markt [Thu, 13 May 2010 12:22:05 +0000 (12:22 +0000)]
Update to JSTL 1.1.2 to fix numerous XML validation issues with TLD files

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

15 years agoIdentify source of TLD validation errors to aid debugging
markt [Thu, 13 May 2010 12:19:43 +0000 (12:19 +0000)]
Identify source of TLD validation errors to aid debugging

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

15 years agoSimplify xml validation configuration. It is now configurable per context and can...
markt [Thu, 13 May 2010 09:04:39 +0000 (09:04 +0000)]
Simplify xml validation configuration. It is now configurable per context and can be set per host using a host-level context.xml file so remove the attributes on the host.
If running with STRICT_SERVLET_COMPLIANCE, enable validation by default.

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

15 years agoRemove some stuff we have already done.
markt [Wed, 12 May 2010 23:08:10 +0000 (23:08 +0000)]
Remove some stuff we have already done.

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

15 years agoRemove completed item
markt [Wed, 12 May 2010 23:01:57 +0000 (23:01 +0000)]
Remove completed item

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

15 years agoFix HTML niggles.
markt [Wed, 12 May 2010 22:40:54 +0000 (22:40 +0000)]
Fix HTML niggles.

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

15 years agoWrappers are started when added to the Context (since the Context is already starting...
markt [Wed, 12 May 2010 22:32:22 +0000 (22:32 +0000)]
Wrappers are started when added to the Context (since the Context is already starting). Don't try and start them twice.

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

15 years agoFix TCK failure
markt [Wed, 12 May 2010 20:03:40 +0000 (20:03 +0000)]
Fix TCK failure
Restore initialisation of logger that was triggering an NPE

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

15 years agoRemove unused imports
markt [Wed, 12 May 2010 19:50:07 +0000 (19:50 +0000)]
Remove unused imports

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

15 years agoMultiple TCK failures. Child containers are started during the STARTING_PREP state...
markt [Wed, 12 May 2010 19:49:26 +0000 (19:49 +0000)]
Multiple TCK failures. Child containers are started during the STARTING_PREP state so if a child whilst the container is in that state, it must also be started.

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

15 years agoFix remaining issue described in https://issues.apache.org/bugzilla/show_bug.cgi...
markt [Wed, 12 May 2010 11:10:03 +0000 (11:10 +0000)]
Fix remaining issue described in https://issues.apache.org/bugzilla/show_bug.cgi?id=49218
doLookup should return null if the resource cannot be found and should not throw an exception
Fixes a potential infinite loop in VirtualDirContext

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49221
markt [Wed, 12 May 2010 10:31:04 +0000 (10:31 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49221
Ensure case conversion behaves as expected
Patch provided by sebb

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49224
markt [Wed, 12 May 2010 10:29:06 +0000 (10:29 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49224
Only try setting the username and password if they are non-null
Patch provided by Matt Passell

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

15 years agoFix remainder of https://issues.apache.org/bugzilla/show_bug.cgi?id=49181
markt [Wed, 12 May 2010 10:24:00 +0000 (10:24 +0000)]
Fix remainder of https://issues.apache.org/bugzilla/show_bug.cgi?id=49181
Add additional check to prevent adding Servlet context listeners once the calls to the Servlet Context listeners start

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

15 years agoChange role name for Manager GUI access to manager-gui to align with planned changes...
markt [Tue, 11 May 2010 21:02:19 +0000 (21:02 +0000)]
Change role name for Manager GUI access to manager-gui to align with planned changes to Tomcat 5/6

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49226
markt [Tue, 11 May 2010 20:05:15 +0000 (20:05 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49226
Ensure case conversion behaves as expected
Patch provided by sebb

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49227
markt [Tue, 11 May 2010 19:51:45 +0000 (19:51 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49227
Ensure case conversion behaves as expected
Patch provided by sebb

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

15 years agohttps://issues.apache.org/bugzilla/show_bug.cgi?id=49228
markt [Tue, 11 May 2010 15:53:10 +0000 (15:53 +0000)]
https://issues.apache.org/bugzilla/show_bug.cgi?id=49228
Use English Locale since other Locale's may give add results

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

15 years agohttps://issues.apache.org/bugzilla/show_bug.cgi?id=49235
markt [Tue, 11 May 2010 15:48:36 +0000 (15:48 +0000)]
https://issues.apache.org/bugzilla/show_bug.cgi?id=49235
Fix handlesTypes with annotations. The annotated class should be reported, not the annotation class.

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

15 years agoNPE protection
markt [Tue, 11 May 2010 13:09:43 +0000 (13:09 +0000)]
NPE protection

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

15 years agoFix typos
markt [Tue, 11 May 2010 13:01:50 +0000 (13:01 +0000)]
Fix typos

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

15 years agoNo need to remove LifecycleListeners from destroyed components
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

15 years agoContainerListener != LifecycleListener. Use the correct one.
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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49240
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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49269
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

15 years agoExtend Lifecycle/MBean refactoring to ContainerBase
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

15 years agoMake sure Tomcat instance is closed down correctly (prevents warnings in the logs).
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

15 years agoAllow the transition from NEW to DESTROYED for objects that are never started.
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

15 years agoFix FindBugs warning
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

15 years agoStop the tests failing
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

15 years agoFix JULI configuration so JULI is actually used.
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

15 years agoClean up experimental (from Tomcat 5) MBean registration feature of StandardEngine...
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

15 years agoAdd a simple CSRF prevention filter. It has been tested with the Tomcat 6 manager...
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

15 years agoIBM has agreed to re-license the affected files.
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

15 years agomake sure the entropy can be converted to a String.
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

15 years agoDescriptions need to be on a single line
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

15 years agoGSoC 2010: Add missing attributes, use alphabetical ordering
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

15 years agoGSoC 2010: Make some JMX attributes read-only
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

15 years agoTypo
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

15 years agoDocument comet package move
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

15 years agoMore anchor handling improvements:
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

15 years agoCorrect a sentence
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

15 years agoReplace spaces with underscore in HTML anchor names.
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

15 years agoGSoC 2010: Add missing JMX attributes
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

15 years agoRe-factor Realms to use LifecycleMBeanBase
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

15 years agoFix copy&paste error in script comment.
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

15 years agoRename Eclipse files so they become samples
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

15 years agoRe-factor Valves to use LifecycleMBeanBase
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

15 years agoMove ManagerBase to new Lifecycle/MBean implementation
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

15 years agoRemove unnecessary code
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

15 years agoFix the tests the Lifecycle/MBean refactoring in r940634 broke.
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

15 years agoWith the benefit of some sleep, refactor the MBean support for Lifecycle (still some...
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

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