git.internetallee.de Git

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

kkolinko [Wed, 3 Mar 2010 14:21:09 +0000 (14:21 +0000)]

Add generated TOC,
replacing manual TOC if it was present earlier

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

commit | commitdiff | tree

kkolinko [Wed, 3 Mar 2010 13:16:55 +0000 (13:16 +0000)]

Add generated TOC,
replacing manual TOC if it was present earlier

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

commit | commitdiff | tree

kkolinko [Wed, 3 Mar 2010 12:37:43 +0000 (12:37 +0000)]

Replaced manual TOC with generated one and corrected tags nesting.

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

commit | commitdiff | tree

kkolinko [Wed, 3 Mar 2010 10:53:48 +0000 (10:53 +0000)]

Added "r" to the text of revision number links generated from <rev> tag.
As of now, those are used in changelog.xml only.

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

commit | commitdiff | tree

markt [Tue, 2 Mar 2010 16:02:25 +0000 (16:02 +0000)]

Better fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48660
As per Konstantin's comments, ensure a single Vary header is used and take account of * if present

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

commit | commitdiff | tree

kkolinko [Tue, 2 Mar 2010 15:23:06 +0000 (15:23 +0000)]

Implement support for automatic generation of Table of Contents.
It is triggered by <toc/> element.
Section header is not included into generation, so the complete code fragment to add will be
<section name="Table of Contents">
<toc/>
</section>
The html-manager-howto.xml provides a usage example for this.
Also corrected minor issues with tags nesting, reported by w3c validator.

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

commit | commitdiff | tree

mturk [Tue, 2 Mar 2010 13:08:14 +0000 (13:08 +0000)]

As per Remy's suggestion use the new ABI only if present

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

commit | commitdiff | tree

kkolinko [Tue, 2 Mar 2010 11:58:28 +0000 (11:58 +0000)]

Use definitions list instead of unordered list.
Add information about extras and sources.
Add charset information to the <META> tag.

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

commit | commitdiff | tree

mturk [Tue, 2 Mar 2010 11:48:02 +0000 (11:48 +0000)]

Fix typo

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

commit | commitdiff | tree

mturk [Tue, 2 Mar 2010 09:19:45 +0000 (09:19 +0000)]

With unsafe reneg, minimum required is 1.2.21 caused by API change

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

commit | commitdiff | tree

mturk [Tue, 2 Mar 2010 09:14:44 +0000 (09:14 +0000)]

Port SSLInsecureRenegotiation from mod_ssl

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

commit | commitdiff | tree

kkolinko [Tue, 2 Mar 2010 09:04:59 +0000 (09:04 +0000)]

Do not mention Tomcat version unless necessary.
Especially, do not mention Tomcat 6 in Tomcat 7 docs.

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

commit | commitdiff | tree

kkolinko [Tue, 2 Mar 2010 08:05:40 +0000 (08:05 +0000)]

Amend the documentation

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

commit | commitdiff | tree

markt [Mon, 1 Mar 2010 23:14:12 +0000 (23:14 +0000)]

Correct fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48050
NamingContext.createSubcontext method returns Context with wrong name

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

commit | commitdiff | tree

kkolinko [Mon, 1 Mar 2010 18:25:39 +0000 (18:25 +0000)]

Amend the messages displayed by Find Leaks diagnostics in the Manager application.

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

commit | commitdiff | tree

kkolinko [Mon, 1 Mar 2010 17:16:42 +0000 (17:16 +0000)]

Move sessionDetail.jsp sessionsList.jsp of Manager webapp into WEB-INF/jsp/
Those are not supposed to be callable directly.

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

commit | commitdiff | tree

mturk [Fri, 26 Feb 2010 14:51:31 +0000 (14:51 +0000)]

I suppose no one needs my home dir :) Revert to default

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

commit | commitdiff | tree

mturk [Fri, 26 Feb 2010 14:49:15 +0000 (14:49 +0000)]

Update to Commons Daemon 1.0.2 and use procrun from upsream distribution. Axe our binary spins

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

commit | commitdiff | tree

fhanik [Thu, 25 Feb 2010 19:34:55 +0000 (19:34 +0000)]

correct download location

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

commit | commitdiff | tree

fhanik [Thu, 25 Feb 2010 17:21:10 +0000 (17:21 +0000)]

upgrade location and version of H2, this location should not change as frequently

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

commit | commitdiff | tree

kkolinko [Thu, 25 Feb 2010 09:32:08 +0000 (09:32 +0000)]

correct a typo

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

commit | commitdiff | tree

kkolinko [Thu, 25 Feb 2010 08:06:19 +0000 (08:06 +0000)]

Correct the number

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

commit | commitdiff | tree

kkolinko [Thu, 25 Feb 2010 07:03:14 +0000 (07:03 +0000)]

Improvements for JspC:
- allow the encoding used for web.xml files to be specified explicitly,
- allow the addWebXmlMappings option to be specified on the command line

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

commit | commitdiff | tree

kkolinko [Thu, 25 Feb 2010 06:08:58 +0000 (06:08 +0000)]

Remove unused public methods

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

commit | commitdiff | tree

kkolinko [Thu, 25 Feb 2010 06:05:55 +0000 (06:05 +0000)]

updated the JavaDoc

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

commit | commitdiff | tree

kkolinko [Thu, 25 Feb 2010 02:58:25 +0000 (02:58 +0000)]

fix for #mergeIntoWebXml()
Note that the "inserted" flag was never set to true in the old code.

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

commit | commitdiff | tree

fhanik [Wed, 24 Feb 2010 19:27:09 +0000 (19:27 +0000)]

https://issues.apache.org/bugzilla/show_bug.cgi?id=48392
Add an interceptor to be able to wrap existing statements and result sets to prevent code from accessing the connection
Patch submitted by gsfernandes@gmail.com

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

commit | commitdiff | tree

costin [Wed, 24 Feb 2010 18:03:00 +0000 (18:03 +0000)]

Moved utils to connector ( the servlet part will either go away or be a separate package ). Make it compile again on android. Few sync
issues found while load testing. SSL fixes. Separate build target for connector.

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

commit | commitdiff | tree

mturk [Wed, 24 Feb 2010 16:49:19 +0000 (16:49 +0000)]

Fix thrown accept error on shutdown

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

commit | commitdiff | tree

rjung [Wed, 24 Feb 2010 11:35:58 +0000 (11:35 +0000)]

Add remark about reliability of System.gc() to
manager diagnostics docs.

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

commit | commitdiff | tree

kkolinko [Wed, 24 Feb 2010 10:12:58 +0000 (10:12 +0000)]

fixes for #getElement():
- avoid infinite looping on unexpected end of file
- fix XML comment reading

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

commit | commitdiff | tree

kkolinko [Tue, 23 Feb 2010 07:36:05 +0000 (07:36 +0000)]

Update version of native bundled in distributives to 1.1.20.

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

commit | commitdiff | tree

markt [Mon, 22 Feb 2010 21:45:35 +0000 (21:45 +0000)]

Remove comment. jvmRoute replacement happens elsewhere

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

commit | commitdiff | tree

markt [Mon, 22 Feb 2010 21:44:43 +0000 (21:44 +0000)]

Remove comment - odds of session duplication are so small to be insignificant

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

commit | commitdiff | tree

markt [Mon, 22 Feb 2010 21:21:06 +0000 (21:21 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48783
Correct defaults

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

commit | commitdiff | tree

fhanik [Fri, 19 Feb 2010 23:02:49 +0000 (23:02 +0000)]

In some drivers, the call to setTransactionIsolation should be the very first call

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

commit | commitdiff | tree

markt [Thu, 18 Feb 2010 21:35:48 +0000 (21:35 +0000)]

Comment typo

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

commit | commitdiff | tree

mturk [Thu, 18 Feb 2010 16:44:57 +0000 (16:44 +0000)]

Make sure we favor the values from AjpMessage.processHeader. If the signature is invalid len can be any random number in that case

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

commit | commitdiff | tree

markt [Wed, 17 Feb 2010 13:53:08 +0000 (13:53 +0000)]

More (minor) lifecycle clean-up

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

commit | commitdiff | tree

markt [Wed, 17 Feb 2010 13:51:37 +0000 (13:51 +0000)]

Improve logging behaviour when shutdown occurs via a shutdownhook. If present, use Catalina's shutdown hook to shutdown Tomcat and JULI. This enables them to be shutdown in the correct order.

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

commit | commitdiff | tree

markt [Wed, 17 Feb 2010 13:44:28 +0000 (13:44 +0000)]

Hold off on update until archive syncs (should be no more than 24 hrs)

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

commit | commitdiff | tree

markt [Wed, 17 Feb 2010 12:28:13 +0000 (12:28 +0000)]

Update to latest native connector

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

commit | commitdiff | tree

markt [Wed, 17 Feb 2010 09:38:07 +0000 (09:38 +0000)]

More lifecycle clean-up

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

commit | commitdiff | tree

markt [Wed, 17 Feb 2010 09:21:30 +0000 (09:21 +0000)]

Remove unused imports

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

commit | commitdiff | tree

markt [Wed, 17 Feb 2010 09:20:59 +0000 (09:20 +0000)]

Add Lifecycle to Container, Server and Service
Remove casts instanceof tests and any other code this makes unnecessary

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

commit | commitdiff | tree

kkolinko [Wed, 17 Feb 2010 02:26:41 +0000 (02:26 +0000)]

Provide slightly more efficient implementations for ScopeMap.size() and ScopeMap.containsKey().

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

commit | commitdiff | tree

kkolinko [Wed, 17 Feb 2010 01:52:41 +0000 (01:52 +0000)]

Fix a bug in ImplicitObjectELResolver.ScopeMap intruduced when applying generics there:
the get(String) and remove(String) methods were not overwriting the ones of AbstractMap,
because those are declared as get(Object) and remove(Object),
thus using ineffective implementations provided by AbstractMap.

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

commit | commitdiff | tree

kkolinko [Wed, 17 Feb 2010 01:10:34 +0000 (01:10 +0000)]

Apply my patch from https://issues.apache.org/bugzilla/show_bug.cgi?id=48616#c20
This patch
- Reverts r905145,
- Provides an alternative fix for bug 48616 and bug 42390,
- Replaces Vector -> List, Hashtable -> HashMap in the affected API.

JspFragments are scriptless, so no need to declare or sync scripting
variables for fragments. Since errors in syncing the scripting variables for
JSP Fragments caused 48616 & 42390, this fixes both these bugs too.

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

commit | commitdiff | tree

markt [Tue, 16 Feb 2010 21:15:21 +0000 (21:15 +0000)]

Revert r904914. https://issues.apache.org/bugzilla/show_bug.cgi?id=48629
now proposes a better solution

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

commit | commitdiff | tree

kkolinko [Tue, 16 Feb 2010 17:29:57 +0000 (17:29 +0000)]

If the memory leak occured in the ROOT application, display "/" instead on an empty line

It might be better to apply this fix to StandardHost.findReloadedContextMemoryLeaks(),
as it is equally hard to see an empty string when calling this method through JConsole,
but I am not sure that I want to introduce irregularity into the API.

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

commit | commitdiff | tree

markt [Tue, 16 Feb 2010 17:23:23 +0000 (17:23 +0000)]

Manifest improvements
- automate copyright year
- add manifests for el & annotations
- improve default NOTICE
- add info to bootstrap manifest

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

commit | commitdiff | tree

kkolinko [Tue, 16 Feb 2010 16:34:10 +0000 (16:34 +0000)]

correct a misprint

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

commit | commitdiff | tree

markt [Tue, 16 Feb 2010 11:40:55 +0000 (11:40 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48589
Make JNDIRealm easier to extend by making the User class protected
Based on a patch by Candid Dauth

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

commit | commitdiff | tree

markt [Tue, 16 Feb 2010 11:07:00 +0000 (11:07 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48582
Avoid NPE as config may be null but ctxt won't be

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

commit | commitdiff | tree

markt [Tue, 16 Feb 2010 09:27:49 +0000 (09:27 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48580
Prevent AccessControlException if first access is to a JSP that uses a FunctionMapper

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

commit | commitdiff | tree

kkolinko [Tue, 16 Feb 2010 04:52:38 +0000 (04:52 +0000)]

Additional test for BZ 48616

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

commit | commitdiff | tree

markt [Tue, 16 Feb 2010 00:46:07 +0000 (00:46 +0000)]

Workaround Java 6/7 bug described in https://issues.apache.org/bugzilla/show_bug.cgi?id=48498
Avoid the ArrayIndexOutOfBoundsException

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

commit | commitdiff | tree

markt [Mon, 15 Feb 2010 17:14:27 +0000 (17:14 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48545
Truststores don't have to have passwords
Based on a patch by 'smmwpf54'

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

commit | commitdiff | tree

markt [Mon, 15 Feb 2010 08:09:39 +0000 (08:09 +0000)]

Spacing

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

commit | commitdiff | tree

markt [Mon, 15 Feb 2010 08:09:05 +0000 (08:09 +0000)]

Update to dbcp 1.4 release that supports JDBC4 and compiles on Java 6

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

commit | commitdiff | tree

markt [Mon, 15 Feb 2010 00:06:05 +0000 (00:06 +0000)]

Use the Context interface rather than StandardEngine

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

commit | commitdiff | tree

markt [Sun, 14 Feb 2010 23:54:52 +0000 (23:54 +0000)]

Use the Context interface rather than StandardContext

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

commit | commitdiff | tree

markt [Sun, 14 Feb 2010 23:45:18 +0000 (23:45 +0000)]

Use interfaces in o.a.c.startup.Tomcat and update tests as appropriate

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

commit | commitdiff | tree

markt [Sun, 14 Feb 2010 23:44:20 +0000 (23:44 +0000)]

Add missing test

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

commit | commitdiff | tree

markt [Sat, 13 Feb 2010 20:12:11 +0000 (20:12 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48384
Add a per context xslt option for directory listings
Make the fallback options work as described in the docs

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

commit | commitdiff | tree

markt [Sat, 13 Feb 2010 19:22:02 +0000 (19:22 +0000)]

Address review comments
Don't use toString() to try and co-erce any old object to an Enum - the spec only mentions String

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

commit | commitdiff | tree

markt [Sat, 13 Feb 2010 18:25:07 +0000 (18:25 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48371
Skip comments when working out where to insert generated servlets and associated mappings

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

commit | commitdiff | tree

kkolinko [Sat, 13 Feb 2010 18:14:32 +0000 (18:14 +0000)]

JavaDoc correction

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

commit | commitdiff | tree

kkolinko [Sat, 13 Feb 2010 18:04:52 +0000 (18:04 +0000)]

JavaDoc correction

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

commit | commitdiff | tree

kkolinko [Sat, 13 Feb 2010 16:37:49 +0000 (16:37 +0000)]

reverted Filip's r909673

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

commit | commitdiff | tree

markt [Sat, 13 Feb 2010 11:02:23 +0000 (11:02 +0000)]

Change a few variable names to reduce potential confusion - no functional change

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

commit | commitdiff | tree

fhanik [Sat, 13 Feb 2010 00:51:47 +0000 (00:51 +0000)]

fix compilation error

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

commit | commitdiff | tree

markt [Fri, 12 Feb 2010 22:12:48 +0000 (22:12 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48318
Handle case where WebDAV resource is in directory listing but is not accessible

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

commit | commitdiff | tree

markt [Fri, 12 Feb 2010 21:34:20 +0000 (21:34 +0000)]

Update for new Eclipse lib
Align with new trunk build script

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

commit | commitdiff | tree

markt [Fri, 12 Feb 2010 19:15:32 +0000 (19:15 +0000)]

Add listener before child is added else listener won't get called on first load

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

commit | commitdiff | tree

markt [Fri, 12 Feb 2010 18:03:48 +0000 (18:03 +0000)]

Document new findleaks command

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

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

RSS Atom