tomcat7.0
15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=48790
markt [Tue, 9 Mar 2010 22:19:44 +0000 (22:19 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48790
Make maxActive thread safe. Technically a bug but seems like overkill.

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

15 years agoMove the 48nnn bugs
markt [Tue, 9 Mar 2010 21:56:36 +0000 (21:56 +0000)]
Move the 48nnn bugs

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

15 years agoToo many 48nnn bugs in context root
markt [Tue, 9 Mar 2010 21:52:26 +0000 (21:52 +0000)]
Too many 48nnn bugs in context root

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

15 years agoBug 48701 test cases
markt [Tue, 9 Mar 2010 21:51:46 +0000 (21:51 +0000)]
Bug 48701 test cases

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

15 years agoComplete fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
markt [Tue, 9 Mar 2010 21:51:18 +0000 (21:51 +0000)]
Complete fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48701

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

15 years agoMake StandardContext aliases work with ServletContext.getResourcePaths()
markt [Tue, 9 Mar 2010 20:33:27 +0000 (20:33 +0000)]
Make StandardContext aliases work with ServletContext.getResourcePaths()

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

15 years agoRe-org some JSPs
markt [Tue, 9 Mar 2010 15:44:30 +0000 (15:44 +0000)]
Re-org some JSPs

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

15 years agoCreate a directory for all the bug 45nnn JSPs to make things more manageable. I'll...
markt [Tue, 9 Mar 2010 15:36:10 +0000 (15:36 +0000)]
Create a directory for all the bug 45nnn JSPs to make things more manageable. I'll do the same for other groups of bugs as the numers grow.

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

15 years agohttps://issues.apache.org/bugzilla/show_bug.cgi?id=48007#c5
kkolinko [Tue, 9 Mar 2010 15:04:53 +0000 (15:04 +0000)]
https://issues.apache.org/bugzilla/show_bug.cgi?id=48007#c5
Improve exception processing in CustomObjectInputStream#resolveClass(),
to help find the cause behind BZ 48007.

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

15 years agoReview feedback
markt [Tue, 9 Mar 2010 15:01:05 +0000 (15:01 +0000)]
Review feedback
1. getNameFromAttribute() returns the attribute name, not the variable name and
2. This is a translation time test so the attribute value is not known

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
kkolinko [Tue, 9 Mar 2010 14:04:58 +0000 (14:04 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
Add a system property to allow disabling enforcement of a requirement of JSP.5.3.
The specification recommends, but does not require us to enforce it.

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

15 years agoCorrect description for STRICT_QUOTE_ESCAPING system property
kkolinko [Tue, 9 Mar 2010 13:21:30 +0000 (13:21 +0000)]
Correct description for STRICT_QUOTE_ESCAPING system property
C-T-R

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=48760
markt [Tue, 9 Mar 2010 13:15:15 +0000 (13:15 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48760
Remove potential race condition that can result in multiple threads trying to use the same InputStream

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=48737
markt [Tue, 9 Mar 2010 12:30:37 +0000 (12:30 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48737
Don't assume paths that start with /META-INF/... are always in JARs. This is not true for some IDEs
Patch provided by Fabrizio Giustina

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=48729
markt [Tue, 9 Mar 2010 12:14:23 +0000 (12:14 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48729
Return roles defined by both userRoleName and roleName mechanisms
Patch provided by 'eric'

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

15 years agoRemove unnecessary duplication
markt [Tue, 9 Mar 2010 12:08:17 +0000 (12:08 +0000)]
Remove unnecessary duplication

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

15 years agoEclipse warnings
markt [Tue, 9 Mar 2010 12:02:43 +0000 (12:02 +0000)]
Eclipse warnings

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

15 years agoUpdated the tests because r920110 was reverted in r920608.
kkolinko [Tue, 9 Mar 2010 02:58:50 +0000 (02:58 +0000)]
Updated the tests because r920110 was reverted in r920608.

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

15 years agoRevert r920110
kkolinko [Tue, 9 Mar 2010 01:28:14 +0000 (01:28 +0000)]
Revert r920110
Compatibility with JSP 1.2 tag libraries had to be covered by JSP 2.0 specification,
see "Backwards Compatibility with JSP 1.2" in the Preface part of JSP 2.0 specification,
and there is no provision for this feature.
Discussed in the Re: r920055 thread on dev@

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

15 years agoAmendment for BZ 48668 fixes.
kkolinko [Tue, 9 Mar 2010 00:43:23 +0000 (00:43 +0000)]
Amendment for BZ 48668 fixes.
Use setter methods that accept String value to set pageInfo properties.
Throw an exception if tagInfo is not available for a tag file or requiredVersion is not parseable. (Both of that should not happen).

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

15 years agoJavaDoc correction
kkolinko [Tue, 9 Mar 2010 00:04:30 +0000 (00:04 +0000)]
JavaDoc correction
C-T-R

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

15 years agoRevisit https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
markt [Mon, 8 Mar 2010 21:53:29 +0000 (21:53 +0000)]
Revisit https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
Allow TagVariableInfo as well as VariableInfo to introduce objects later used by <jsp:getProperty> - JSP.5.3

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

15 years agoWhitespace
markt [Mon, 8 Mar 2010 20:59:18 +0000 (20:59 +0000)]
Whitespace

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=48661
markt [Mon, 8 Mar 2010 18:58:28 +0000 (18:58 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48661
If the response has been committed, include the error page like Jasper does

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=48629
markt [Mon, 8 Mar 2010 17:59:51 +0000 (17:59 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48629
Make nested role search work with username as well as DN
Add roleNested to the docs
Patch provided by Felix Schumacher

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

15 years agoUse the Lifecycle state to dtermine if the context is in the correct state to allow...
markt [Mon, 8 Mar 2010 17:22:33 +0000 (17:22 +0000)]
Use the Lifecycle state to dtermine if the context is in the correct state to allow configuration

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

15 years agomore work towards making the JIO connector ready for async
fhanik [Mon, 8 Mar 2010 16:38:35 +0000 (16:38 +0000)]
more work towards making the JIO connector ready for async

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

15 years agoAdd context name to leak detection log messages
markt [Mon, 8 Mar 2010 12:45:56 +0000 (12:45 +0000)]
Add context name to leak detection log messages

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

15 years agoHandle component failure without throwing a whole stack of exceptions
markt [Mon, 8 Mar 2010 12:39:57 +0000 (12:39 +0000)]
Handle component failure without throwing a whole stack of exceptions
Adds a new permitted transition from NEW to STOPPED that does not fire any events

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

15 years agoNo need for separate ant download
markt [Mon, 8 Mar 2010 10:14:44 +0000 (10:14 +0000)]
No need for separate ant download

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

15 years agoUpdate change log
markt [Sun, 7 Mar 2010 21:30:54 +0000 (21:30 +0000)]
Update change log

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

15 years agoLifecycle refactoring - ContainerBase
markt [Sun, 7 Mar 2010 21:30:32 +0000 (21:30 +0000)]
Lifecycle refactoring - ContainerBase
Adds a new CONFIGURE event to allow Context to fire the START event at the right time
Context fires START a little later
ReplicatedContext takes advantage of LifecycleBase ensuring start() is only called once

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

15 years agoFix intermittent test failures
markt [Sun, 7 Mar 2010 21:25:37 +0000 (21:25 +0000)]
Fix intermittent test failures

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

15 years agoisELIgnored depends on library version and web.xml declaration
markt [Sun, 7 Mar 2010 20:54:01 +0000 (20:54 +0000)]
isELIgnored depends on library version and web.xml declaration

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

15 years agoRename no-el to el-as-literal
markt [Sun, 7 Mar 2010 20:51:34 +0000 (20:51 +0000)]
Rename no-el to el-as-literal
Add tests for 2.3, 2.4 & 2.5 webapps with Tag libraries that require various JSP versions
These currently all work and I think some should fail - looking into that next

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

15 years agoTest that tags from libraries that declare various JSP versions have EL and deferred...
markt [Sun, 7 Mar 2010 20:32:26 +0000 (20:32 +0000)]
Test that tags from libraries that declare various JSP versions have EL and deferred EL enabled/disabled as appropriate.
This currently triggers a failure - fix to follow shortly.

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

15 years agoExtend the no-el test to cover deferred expressions
markt [Sun, 7 Mar 2010 20:29:39 +0000 (20:29 +0000)]
Extend the no-el test to cover deferred expressions

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

15 years agoBoth TLD and web.xml determine if deferred EL syntax is treated as EL or as a literal
markt [Sun, 7 Mar 2010 18:45:50 +0000 (18:45 +0000)]
Both TLD and web.xml determine if deferred EL syntax is treated as EL or as a literal

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

15 years agoLine length
markt [Sun, 7 Mar 2010 16:22:32 +0000 (16:22 +0000)]
Line length

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

15 years agoMake getVersion(), getMagorVersion() and getMinorVersion() return consistent values
markt [Sun, 7 Mar 2010 11:41:27 +0000 (11:41 +0000)]
Make getVersion(), getMagorVersion() and getMinorVersion() return consistent values

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

15 years agoEnsure result of getVersion() is consistent with getMajorVersion() and getMinorVersion()
markt [Sun, 7 Mar 2010 11:39:39 +0000 (11:39 +0000)]
Ensure result of getVersion() is consistent with getMajorVersion() and getMinorVersion()
With the current code this fails. Patch to fix this to follow.

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

15 years agoRemove the TestAll suite. Ant doesn't use it, IDEs don't need it and it is often...
markt [Sun, 7 Mar 2010 11:31:00 +0000 (11:31 +0000)]
Remove the TestAll suite. Ant doesn't use it, IDEs don't need it and it is often out of sync with the tests

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

15 years agoCheck all versions are correctly parsed
markt [Sun, 7 Mar 2010 11:27:20 +0000 (11:27 +0000)]
Check all versions are correctly parsed

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

15 years agoAdd a test the EL doesn't work if the web-app is a 2.3 web-app
markt [Sun, 7 Mar 2010 11:09:09 +0000 (11:09 +0000)]
Add a test the EL doesn't work if the web-app is a 2.3 web-app

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

15 years agoRename webapp to allow tetsing with webapps with different servlet spec versions...
markt [Sun, 7 Mar 2010 10:16:38 +0000 (10:16 +0000)]
Rename webapp to allow tetsing with webapps with different servlet spec versions in web.xml

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=48668
kkolinko [Sun, 7 Mar 2010 02:43:12 +0000 (02:43 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48668
Fix remaining issues in BZ48668
The idea behind this change is to make ELParser aware about isDeferredAsLiteral option.
Before this change ELParser was used to parse an attribute regardless of isELIgnored or isDeferredSyntaxAllowedAsLiteral values. With this change we do not use ELParser when isELIgnored is true and ELParser does not parse '#{' in expressions when isDeferredSyntaxAllowedAsLiteral is true.
It simplified the code in many places.
Also, servlet specification version from web.xml and JSP specification version from TLD file are now taken into account when determining the default values for isELIgnored and isDeferredSyntaxAllowedAsLiteral. As far as I understand the code, previously only isELIgnored was determined by the servlet specification version.

TstParser.java, bug48668a.jsp:
I reenabled the tests that now pass with these changes applied.

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=48668
kkolinko [Sat, 6 Mar 2010 21:03:14 +0000 (21:03 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48668
Honor isELIgnored and isDeferredSyntaxAllowed in the Parser

Uncommented the test cases in TestParser/bug48668a.jsp that now are passing.
The ##12,13,16,17 remain commented, because they are still failing.

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

15 years agoAdditional tests for https://issues.apache.org/bugzilla/show_bug.cgi?id=48668
kkolinko [Sat, 6 Mar 2010 20:46:06 +0000 (20:46 +0000)]
Additional tests for https://issues.apache.org/bugzilla/show_bug.cgi?id=48668
The TestCase currently passes:
the parts that do not pass currently are commented-out:
- in bug48668a.jsp: those that prevent JSP from being compiled
- in TestParser.java: also those that provide wrong output.

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

15 years agoremove extra newline character
kkolinko [Sat, 6 Mar 2010 19:36:53 +0000 (19:36 +0000)]
remove extra newline character

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

15 years agoShave a few seconds of the rebuild time if the manifests don't need to be updated
markt [Sat, 6 Mar 2010 15:52:40 +0000 (15:52 +0000)]
Shave a few seconds of the rebuild time if the manifests don't need to be updated

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

15 years agoAdd comment to the tomcat-users.xml template used by the Tomcat exe installer on...
kkolinko [Sat, 6 Mar 2010 15:32:42 +0000 (15:32 +0000)]
Add comment to the tomcat-users.xml template used by the Tomcat exe installer on Windows.

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

15 years agoAdd comment about the "manager" role (copied from TC 5.5)
kkolinko [Sat, 6 Mar 2010 15:14:37 +0000 (15:14 +0000)]
Add comment about the "manager" role (copied from TC 5.5)

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

15 years agoAdd a comment about comment to tomcat-users.xml
kkolinko [Sat, 6 Mar 2010 15:08:58 +0000 (15:08 +0000)]
Add a comment about comment to tomcat-users.xml

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

15 years agotrivial: correct a link on an image on the jsp-examples index page
kkolinko [Sat, 6 Mar 2010 14:28:21 +0000 (14:28 +0000)]
trivial: correct a link on an image on the jsp-examples index page

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

15 years agoLifecycle refactoring - Manager
markt [Sat, 6 Mar 2010 13:03:11 +0000 (13:03 +0000)]
Lifecycle refactoring - Manager
Lifecycle.START event fired too early in a number of cases
Added toString() for use in Lifecycle error messages

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

15 years agoLine length
markt [Sat, 6 Mar 2010 12:42:36 +0000 (12:42 +0000)]
Line length

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

15 years agoLifecycle refactoring - Store
markt [Sat, 6 Mar 2010 12:02:19 +0000 (12:02 +0000)]
Lifecycle refactoring - Store
Added toString() for use in Lifecycle error messages

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

15 years agoFix two message strings where natively encoded chars
rjung [Sat, 6 Mar 2010 11:49:56 +0000 (11:49 +0000)]
Fix two message strings where natively encoded chars
had been lost and replaced by '?'.

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

15 years agoCorrection
kkolinko [Sat, 6 Mar 2010 11:41:30 +0000 (11:41 +0000)]
Correction

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

15 years agoLifecycle refactoring - Cluster
markt [Sat, 6 Mar 2010 10:54:38 +0000 (10:54 +0000)]
Lifecycle refactoring - Cluster
Added toString() for use in Lifecycle error messages

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

15 years agoFix utf-8 encoding in message string properties.
rjung [Sat, 6 Mar 2010 10:35:12 +0000 (10:35 +0000)]
Fix utf-8 encoding in message string properties.

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

15 years agoLifecycle refactoring - Executor
markt [Sat, 6 Mar 2010 10:02:16 +0000 (10:02 +0000)]
Lifecycle refactoring - Executor
The LifecycleState.STARTING event was being fired too early

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

15 years agoFix some Eclipse warnings
markt [Sat, 6 Mar 2010 09:42:33 +0000 (09:42 +0000)]
Fix some Eclipse warnings

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

15 years agoTabs to 8 spaces - no functional change
markt [Sat, 6 Mar 2010 09:34:08 +0000 (09:34 +0000)]
Tabs to 8 spaces - no functional change

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

15 years agoLifecycle refactoring - Valves
markt [Sat, 6 Mar 2010 09:31:47 +0000 (09:31 +0000)]
Lifecycle refactoring - Valves
Most valves were firing the LifecycleState.STARTING event too early
Make the toString() consistent for all Valves
Some copy and paste errors in i18n start/stop messages are fixed as a side effect. Some unused messages were also removed.

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

15 years agoFix some inconsistencies identified during lifecycle refactoring for valves
markt [Sat, 6 Mar 2010 09:26:33 +0000 (09:26 +0000)]
Fix some inconsistencies identified during lifecycle refactoring for valves
- don't start a basic valve when adding it to the pipeline if the pipeline is not started
- if pipeline is started when adding a basic valve, register the basic valve

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

15 years agoAdd some additional debugging information when components are started or stopped...
markt [Fri, 5 Mar 2010 17:11:27 +0000 (17:11 +0000)]
Add some additional debugging information when components are started or stopped multiple times

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

15 years agoArrange the french translation submitted by Henri Gomez.
jfclere [Fri, 5 Mar 2010 17:07:14 +0000 (17:07 +0000)]
Arrange the french translation submitted by Henri Gomez.

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

15 years agoLifecycle refactoring
markt [Fri, 5 Mar 2010 14:49:39 +0000 (14:49 +0000)]
Lifecycle refactoring
o.a.c.loader - Note WebappClassloader only has a stubbed Lifecycle implementation

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

15 years agoRevert r919347. On error , we don't need the read lock.
markt [Fri, 5 Mar 2010 14:04:57 +0000 (14:04 +0000)]
Revert r919347. On error , we don't need the read lock.

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

15 years agoEnsure read lock is obtained before write lock is released on an error condition
markt [Fri, 5 Mar 2010 09:35:17 +0000 (09:35 +0000)]
Ensure read lock is obtained before write lock is released on an error condition

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=48861 for Tomcat 7 (missed...
markt [Fri, 5 Mar 2010 09:08:45 +0000 (09:08 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48861 for Tomcat 7 (missed a couple)

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=48861 for Tomcat 7. Still...
markt [Fri, 5 Mar 2010 09:03:30 +0000 (09:03 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48861 for Tomcat 7. Still an issue for Tomcat-lite

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

15 years agoLifecycle refactoring
markt [Thu, 4 Mar 2010 22:16:50 +0000 (22:16 +0000)]
Lifecycle refactoring
Realm: Note most implementations were firing the start event too early

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

15 years agoFix svn properties. Patch provided by sebb
markt [Thu, 4 Mar 2010 21:20:59 +0000 (21:20 +0000)]
Fix svn properties. Patch provided by sebb

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

15 years agoLifecycle refactoring
markt [Thu, 4 Mar 2010 21:18:03 +0000 (21:18 +0000)]
Lifecycle refactoring
StandardPipeline
(and turn Eclipse compilation warnings up to 11)

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

15 years agoLifecycle refactoring
markt [Thu, 4 Mar 2010 19:17:32 +0000 (19:17 +0000)]
Lifecycle refactoring
StandardService - Note use of LifecycleState.MUST_STOP in Catalina to ensure shutdown

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

15 years agoFix eol-style
markt [Thu, 4 Mar 2010 18:55:30 +0000 (18:55 +0000)]
Fix eol-style

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

15 years agoMake toString() consistent with other components
markt [Thu, 4 Mar 2010 18:49:21 +0000 (18:49 +0000)]
Make toString() consistent with other components

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

15 years agoLifecycle refactoring
markt [Thu, 4 Mar 2010 18:47:17 +0000 (18:47 +0000)]
Lifecycle refactoring
StandardServer - relatively straight forward

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

15 years agoLifecycle refactoring
markt [Thu, 4 Mar 2010 18:34:36 +0000 (18:34 +0000)]
Lifecycle refactoring
Connector - relatively straight forward

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

15 years agoLifecycle refactoring.
markt [Thu, 4 Mar 2010 18:07:59 +0000 (18:07 +0000)]
Lifecycle refactoring.
In an effort to reduce code duplication and improve consistency, provide a base Lifecycle implementation. This will be used as the basis of the refactoring of the components that implement Lifecycle

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

15 years agoLifecycle refactoring.
markt [Thu, 4 Mar 2010 18:06:21 +0000 (18:06 +0000)]
Lifecycle refactoring.
Part 1 of many.
Better define the start and stop methods as well as the overall component lifecycle and the relationship between start/stop, component state and events.
Add a getState() method but it is commented out in this checkin to prevent compilation errors. It will be uncommented once the method has been added to the components that implement Lifecycle.

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

15 years agoAdd in and document more XA support
fhanik [Thu, 4 Mar 2010 17:21:41 +0000 (17:21 +0000)]
Add in and document more XA support

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

15 years agoRevert r917784 and r905722 - changes associated with the invalid bug 48050
markt [Thu, 4 Mar 2010 12:05:06 +0000 (12:05 +0000)]
Revert r917784 and r905722 - changes associated with the invalid bug 48050

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

15 years agoMove source/target JDK versions to the main section of the manifest,
kkolinko [Thu, 4 Mar 2010 10:19:52 +0000 (10:19 +0000)]
Move source/target JDK versions to the main section of the manifest,
because these values belong to the JAR file as the whole, not to some subset of it.

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

15 years agoIf subsection name is not unique, prefix the anchor name with the name of section...
kkolinko [Thu, 4 Mar 2010 09:47:35 +0000 (09:47 +0000)]
If subsection name is not unique, prefix the anchor name with the name of section that contains it.
This is especially useful for the Tomcat configuration docs, where names such as "Introduction" or "Attributes" are not unique. See e.g.
config/filter.html
config/valve.html

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

15 years agosvn:eol-style, no functional change
kkolinko [Thu, 4 Mar 2010 08:49:38 +0000 (08:49 +0000)]
svn:eol-style, no functional change
(followup to r918682)

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

15 years agoFix 1. of https://issues.apache.org/bugzilla/show_bug.cgi?id=48831#c3
kkolinko [Thu, 4 Mar 2010 08:05:36 +0000 (08:05 +0000)]
Fix 1. of https://issues.apache.org/bugzilla/show_bug.cgi?id=48831#c3
Ignore the reset() call from java.util.logging.LogManager.Cleaner,
because we have our own shutdown hook that will take care.

There are three hooks that run at VM shutdown:
1. j.u.l.LogManager.Cleaner
2. o.a.j.ClassLoaderLogManager.Cleaner
3. o.a.c.startup.Catalina.CatalinaShutdownHook
2. vs. 3. was taken care by r910974 and r918594. This takes care of 1. vs. (2.,3.)

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

15 years agoIf CATALINA_BASE is not defined we would try to read directly from /bin/setenv.sh...
mturk [Thu, 4 Mar 2010 07:27:32 +0000 (07:27 +0000)]
If CATALINA_BASE is not defined we would try to read directly from /bin/setenv.sh file

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

15 years agoUse eval instead direct call or exec command so that arguments with spaces are proper...
mturk [Thu, 4 Mar 2010 06:43:30 +0000 (06:43 +0000)]
Use eval instead direct call or exec command so that arguments with spaces are properly handled

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

15 years agoMark JNDIRealm.User class constructor as public. The class itself remains protected.
kkolinko [Thu, 4 Mar 2010 01:01:48 +0000 (01:01 +0000)]
Mark JNDIRealm.User class constructor as public. The class itself remains protected.

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

15 years agoFollowup to r918594
kkolinko [Thu, 4 Mar 2010 00:46:44 +0000 (00:46 +0000)]
Followup to r918594
Be more strict with try/finally when locking

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

15 years agoFollowup to markt's r918594
kkolinko [Thu, 4 Mar 2010 00:28:47 +0000 (00:28 +0000)]
Followup to markt's r918594
Replace tabs with four spaces. No functional change.

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

15 years agoFix 2. of https://issues.apache.org/bugzilla/show_bug.cgi?id=48831#c3
kkolinko [Thu, 4 Mar 2010 00:18:44 +0000 (00:18 +0000)]
Fix 2. of https://issues.apache.org/bugzilla/show_bug.cgi?id=48831#c3
When resetting a logger do not close handlers that do not belong to the current class loader.

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

15 years agoRevert previous fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=47977...
markt [Wed, 3 Mar 2010 21:00:22 +0000 (21:00 +0000)]
Revert previous fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=47977 that caused regression https://issues.apache.org/bugzilla/show_bug.cgi?id=48827 and implement an alternative fix

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

15 years agoAdd tests for bugs 47977 and 48827
markt [Wed, 3 Mar 2010 20:59:23 +0000 (20:59 +0000)]
Add tests for bugs 47977 and 48827

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

15 years agoEcho tags are not expected to have bodies. Has the happy side-effect of providing...
markt [Wed, 3 Mar 2010 19:27:25 +0000 (19:27 +0000)]
Echo tags are not expected to have bodies. Has the happy side-effect of providing a tag that can be used to test bug 48827.

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=48831
markt [Wed, 3 Mar 2010 17:26:54 +0000 (17:26 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48831
Address issues 1 & 2 by using a ReadWriteLock to control access to the writer. This ensures messages won't be written while the writer is null. Note there is no (easy) way to not close the handler.
Address issue 3 by re-enabling the JULI shutdown hook if JULI is being used and Tomcat isn't stopped via a shutdown hook.
Address issue 4 by making ClassLoaderLogManager#useShutdownHook volatile

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

15 years agoImplement review feedback
markt [Wed, 3 Mar 2010 14:38:01 +0000 (14:38 +0000)]
Implement review feedback

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