git.internetallee.de Git - tomcat7.0/log

projects / tomcat7.0 / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

markt [Thu, 7 Jan 2010 16:06:45 +0000 (16:06 +0000)]

Add various EL test cases, mostly extracted from local test JSPs I have used for individual issues.
Thanks to kkolinko and the numerous bug reporters that provided the basis for many of these.
At present, although this is Tomcat 7, the tests only cover JSP 2.1 functionality.

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

commit | commitdiff | tree

markt [Thu, 7 Jan 2010 14:20:30 +0000 (14:20 +0000)]

Update for JSP 2.2

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

commit | commitdiff | tree

markt [Wed, 6 Jan 2010 19:04:32 +0000 (19:04 +0000)]

Prevent NPE in emebedded case when no web.xml is provided at all

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

commit | commitdiff | tree

markt [Wed, 6 Jan 2010 18:51:24 +0000 (18:51 +0000)]

Add a test case for bug 48112 (note this passes - need to check when used in a JSP)

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

commit | commitdiff | tree

markt [Wed, 6 Jan 2010 18:28:02 +0000 (18:28 +0000)]

Ignore the imtermediate file for the parser generation

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

commit | commitdiff | tree

markt [Wed, 6 Jan 2010 18:18:09 +0000 (18:18 +0000)]

Fix the remaining test failures

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

commit | commitdiff | tree

markt [Wed, 6 Jan 2010 18:10:41 +0000 (18:10 +0000)]

Fix some test failures. '\' should not be skipped in lierals. Align the definition of LiteralExpression with the EL 2.2 spec otherwise parsing errors result.

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

commit | commitdiff | tree

markt [Wed, 6 Jan 2010 17:44:15 +0000 (17:44 +0000)]

Don't edit the generated files at all - makes regeneration simpler

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

commit | commitdiff | tree

markt [Wed, 6 Jan 2010 17:41:11 +0000 (17:41 +0000)]

Additional tests for the specific escaping (of "${" and "#{") for LiteralExpressions

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

commit | commitdiff | tree

markt [Wed, 6 Jan 2010 17:39:58 +0000 (17:39 +0000)]

Fix the test case failures. There is at least one bug still present - more test cases to follow.

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

commit | commitdiff | tree

markt [Wed, 6 Jan 2010 17:33:26 +0000 (17:33 +0000)]

Start to expand the EL test cases

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

commit | commitdiff | tree

rjung [Wed, 6 Jan 2010 17:33:22 +0000 (17:33 +0000)]

Fix indentation.

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

commit | commitdiff | tree

rjung [Wed, 6 Jan 2010 17:07:14 +0000 (17:07 +0000)]

Cleanup tabs and trailing whitespace.

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

commit | commitdiff | tree

rjung [Wed, 6 Jan 2010 16:55:45 +0000 (16:55 +0000)]

Tab police.

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

commit | commitdiff | tree

markt [Wed, 6 Jan 2010 10:56:48 +0000 (10:56 +0000)]

Move declaration as per Knostantin's review comment

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

commit | commitdiff | tree

markt [Wed, 6 Jan 2010 10:24:31 +0000 (10:24 +0000)]

Fix typos / inconsistencies
Rainer's review comments on r894580

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

commit | commitdiff | tree

costin [Wed, 6 Jan 2010 00:08:33 +0000 (00:08 +0000)]

More work on tomcat-lite connector: more experimenting with spdy, few more tests and fixes.

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

commit | commitdiff | tree

markt [Tue, 5 Jan 2010 22:34:17 +0000 (22:34 +0000)]

Correct default

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

commit | commitdiff | tree

costin [Tue, 5 Jan 2010 21:28:53 +0000 (21:28 +0000)]

Not used any more ( were part of the mini-servlet on top of coyote )

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

commit | commitdiff | tree

costin [Tue, 5 Jan 2010 21:28:13 +0000 (21:28 +0000)]

Remove the mini-servlet on top of coyote impl - can be reverted if anyone finds a use for it.

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

commit | commitdiff | tree

markt [Tue, 5 Jan 2010 20:56:14 +0000 (20:56 +0000)]

Improve JavaDoc generation
Based on the proposed patch for https://issues.apache.org/bugzilla/show_bug.cgi?id=48299
Also ensure the clean targets clean up fully

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

commit | commitdiff | tree

markt [Tue, 5 Jan 2010 19:53:38 +0000 (19:53 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48424
Based on a patch by Ivan
Ensure that the ObjectNames for the Connectors are always generated using the same method

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

commit | commitdiff | tree

markt [Tue, 5 Jan 2010 10:53:36 +0000 (10:53 +0000)]

Remove empty dirs

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

commit | commitdiff | tree

markt [Tue, 5 Jan 2010 09:51:45 +0000 (09:51 +0000)]

Fix schema location

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

commit | commitdiff | tree

kkolinko [Mon, 4 Jan 2010 22:48:58 +0000 (22:48 +0000)]

Update version of tomcat-native included in TC binary bundles and Windows installer to 1.1.18.

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

commit | commitdiff | tree

rjung [Mon, 4 Jan 2010 17:05:01 +0000 (17:05 +0000)]

Guess that's safe.

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

commit | commitdiff | tree

markt [Mon, 4 Jan 2010 11:29:45 +0000 (11:29 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48464
Provide an option to specify the command window title
Patch provided by LiuYan

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

commit | commitdiff | tree

markt [Sun, 3 Jan 2010 19:02:13 +0000 (19:02 +0000)]

Fix odd whitespace - no functional change

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

commit | commitdiff | tree

markt [Sun, 3 Jan 2010 16:11:27 +0000 (16:11 +0000)]

Suppress some invalid compiler warnings

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

commit | commitdiff | tree

markt [Sun, 3 Jan 2010 16:10:27 +0000 (16:10 +0000)]

Remove some declared exceptions that are never thrown

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

commit | commitdiff | tree

markt [Sun, 3 Jan 2010 16:03:29 +0000 (16:03 +0000)]

Remove some declared exceptions that are never thrown

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

commit | commitdiff | tree

markt [Sun, 3 Jan 2010 15:58:39 +0000 (15:58 +0000)]

Remove unused methods

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

commit | commitdiff | tree

markt [Sun, 3 Jan 2010 15:43:37 +0000 (15:43 +0000)]

Mark the implementations of deprecated methods as deprecated

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

commit | commitdiff | tree

markt [Sun, 3 Jan 2010 15:42:57 +0000 (15:42 +0000)]

Don't use deprecated methods. Use recommended alternative.

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

commit | commitdiff | tree

kkolinko [Sun, 3 Jan 2010 14:02:31 +0000 (14:02 +0000)]

Followup to r895191
Fix calling Tomcat Windows scripts from a directory containing '&' character,
and allow to use this character in the names of CATALINA_HOME/CATALINA_BASE directories.
https://issues.apache.org/bugzilla/show_bug.cgi?id=48464#c4

Note, that both 'set' and 'echo' commands have to use quotes.

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

commit | commitdiff | tree

markt [Sun, 3 Jan 2010 11:32:32 +0000 (11:32 +0000)]

Mark the implementations of deprecated methods as deprecated

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

commit | commitdiff | tree

rjung [Sat, 2 Jan 2010 15:31:04 +0000 (15:31 +0000)]

Replace copyright year in nsi and html file
with the YEAR tag. It will be automatically
updated via our ant version filter.

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

commit | commitdiff | tree

rjung [Sat, 2 Jan 2010 15:22:41 +0000 (15:22 +0000)]

Borrow a few things from the main Tomcat build.xml:
- use general version filter
- automatically set year to the current year
- use patch version property without dot.
The dot is added when combining it into a version number

I don't know whether the double '@' are intended for the
ant replacement markers in MANIFEST.MF (the outer ones remain
after ant filtering), but that is unchanged from the previous
behaviour.

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

commit | commitdiff | tree

rjung [Sat, 2 Jan 2010 14:24:51 +0000 (14:24 +0000)]

Allow to patch the current year via our
ant version strings filter.

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

commit | commitdiff | tree

rjung [Sat, 2 Jan 2010 14:22:50 +0000 (14:22 +0000)]

Update copyright year for TC trunk.

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

commit | commitdiff | tree

rjung [Sat, 2 Jan 2010 14:08:45 +0000 (14:08 +0000)]

Change license header in tomcat-lite java source files
using the copy2license.pl script.

Although the previous form is what the license file states how to
correctly apply ASL 2.0, usually the ASF copyright notice is not
applied to every source file. See

http://www.apache.org/legal/src-headers.html#headers

for details.

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

commit | commitdiff | tree

kkolinko [Sat, 2 Jan 2010 13:47:10 +0000 (13:47 +0000)]

Fix calling Tomcat Windows scripts from a directory containg spaces,
as noted in https://issues.apache.org/bugzilla/show_bug.cgi?id=48464#c4 by LiuYan

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

commit | commitdiff | tree

rjung [Sat, 2 Jan 2010 13:26:32 +0000 (13:26 +0000)]

Change license header in two tomcat-lite java source files
using the copy2license.pl script.

Although the previous form is what the license file states how to
correctly apply ASL 2.0, usually the ASF copyright notice is not
applied to every source file. See

http://www.apache.org/legal/src-headers.html#headers

for details.

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

commit | commitdiff | tree

rjung [Sat, 2 Jan 2010 13:17:11 +0000 (13:17 +0000)]

Change license header in bcel java source files using
the copy2license.pl script.

Although the previous form is what the license file states how to
correctly apply ASL 2.0, usually the ASF copyright notice is not
applied to every source file. See

http://www.apache.org/legal/src-headers.html#headers

for details.

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

commit | commitdiff | tree

kkolinko [Fri, 1 Jan 2010 19:24:48 +0000 (19:24 +0000)]

Followup to r895045
Per JavaDoc format, the tags (@deprected, @see etc.) should follow the main description, not precede it. Otherwise the description is swallowed by the tag.

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

commit | commitdiff | tree

markt [Fri, 1 Jan 2010 18:36:21 +0000 (18:36 +0000)]

Remove unused imports

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

commit | commitdiff | tree

markt [Fri, 1 Jan 2010 18:33:13 +0000 (18:33 +0000)]

Mark the implementations of deprecated javax.servlet.jsp.el classes as deprecated

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

commit | commitdiff | tree

markt [Fri, 1 Jan 2010 18:31:17 +0000 (18:31 +0000)]

Fix some trivial Eclipse warnings

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

commit | commitdiff | tree

markt [Fri, 1 Jan 2010 18:22:36 +0000 (18:22 +0000)]

Add some missing deprecation markers

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

commit | commitdiff | tree

markt [Fri, 1 Jan 2010 15:00:52 +0000 (15:00 +0000)]

Update javacc from 4.1 to 5.0. Update generated code.

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

commit | commitdiff | tree

kkolinko [Fri, 1 Jan 2010 14:10:25 +0000 (14:10 +0000)]

Followup to r894586
Correct some lines in the French translation, modified in r894586

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

commit | commitdiff | tree

markt [Thu, 31 Dec 2009 16:01:04 +0000 (16:01 +0000)]

A little more JSP 2.2 EL impl

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

commit | commitdiff | tree

markt [Thu, 31 Dec 2009 15:13:31 +0000 (15:13 +0000)]

Correct location.
Spotted by Christoph Beck

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

commit | commitdiff | tree

markt [Thu, 31 Dec 2009 13:51:33 +0000 (13:51 +0000)]

A little more JSP 2.2 EL impl

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

commit | commitdiff | tree

markt [Thu, 31 Dec 2009 12:44:49 +0000 (12:44 +0000)]

Fix src build.
- When <include .../> is nested in a <patternset .../> each include can only specify a single pattern
- Reference existing <patternset .../> in <fixcrlf .../> rather than defining a new one

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

commit | commitdiff | tree

markt [Thu, 31 Dec 2009 11:05:45 +0000 (11:05 +0000)]

Add the Java EE 6 schemas to support validation

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

commit | commitdiff | tree

markt [Thu, 31 Dec 2009 10:54:17 +0000 (10:54 +0000)]

Re-order constants to match DigestFactory usage to make it easier to check for consistency

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

commit | commitdiff | tree

markt [Thu, 31 Dec 2009 10:46:24 +0000 (10:46 +0000)]

Update X-Powered-By header for Servlet 3.0 / JSP 2.2 and add additional information as suggested by the Servlet Spec and https://issues.apache.org/bugzilla/show_bug.cgi?id=48006

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

commit | commitdiff | tree

markt [Wed, 30 Dec 2009 22:20:30 +0000 (22:20 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43819
Implement ExpressionFactory.newInstance() and ensure that Jasper does not refer to org.apache.el directly
JSP 2.1 TCK passes with these changes applied
Based on a patch by Christoph Beck

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

commit | commitdiff | tree

markt [Wed, 30 Dec 2009 21:50:33 +0000 (21:50 +0000)]

Fix an problem highlighted by the JSP 2.1 TCK. Only provide merged 3.0+ web.xml for 3.0+ apps.

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

commit | commitdiff | tree

markt [Wed, 30 Dec 2009 18:21:26 +0000 (18:21 +0000)]

API changes for JSP/EL 2.2 changes. Dummy implementations where implmentation is required.

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

commit | commitdiff | tree

markt [Wed, 30 Dec 2009 16:51:52 +0000 (16:51 +0000)]

New helper class to provide web.xml to those Jasper classes that need to parse it. JspConfig was not consistent with TldLocationsCache. These are now consistent. JspConfig now has access to the merged web.xml generated by Catalina from web-fragment.xml files and/or annotations.

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

commit | commitdiff | tree

markt [Wed, 30 Dec 2009 16:04:23 +0000 (16:04 +0000)]

Get Jasper to use same web.xml (including merging if appropriate) as Catalina by default. If no merged web.xml is found, fall back to previous behaviour.

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

commit | commitdiff | tree

markt [Wed, 30 Dec 2009 12:02:26 +0000 (12:02 +0000)]

Prevent definition of duplicate URIs for tag libraries and improve error messages for all duplicates

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

commit | commitdiff | tree

markt [Wed, 30 Dec 2009 11:30:33 +0000 (11:30 +0000)]

Fix indent

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

commit | commitdiff | tree

markt [Wed, 30 Dec 2009 11:30:01 +0000 (11:30 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48345
Patch provided by Keiichi Fujino

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

commit | commitdiff | tree

markt [Wed, 30 Dec 2009 11:07:22 +0000 (11:07 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48417
Correct French trabslations
Patches provided by André Warnier

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

commit | commitdiff | tree

markt [Wed, 30 Dec 2009 10:45:34 +0000 (10:45 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48454
Give the stderr reader a chance to finish before terminating the CGI process. This avoids "Bad file descriptor" errors. The period to wait is configurable.
Based on a patch by Markus Grieder

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

commit | commitdiff | tree

markt [Wed, 30 Dec 2009 10:13:05 +0000 (10:13 +0000)]

Update to 3.0 schema

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

commit | commitdiff | tree

markt [Wed, 30 Dec 2009 09:29:19 +0000 (09:29 +0000)]

Fix some Eclipse warnings

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

commit | commitdiff | tree

markt [Wed, 30 Dec 2009 09:24:17 +0000 (09:24 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48443
Correct FileNotFoundException on ROOT context start when annotation scanning is enabled
Patch provided by wujunchen

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

commit | commitdiff | tree

markt [Tue, 29 Dec 2009 21:21:59 +0000 (21:21 +0000)]

Add support for http-method-omission

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

commit | commitdiff | tree

markt [Tue, 29 Dec 2009 20:19:44 +0000 (20:19 +0000)]

Don't override method that has a more complete implementation (handles more edge cases) in RealmBase

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

commit | commitdiff | tree

markt [Tue, 29 Dec 2009 17:47:36 +0000 (17:47 +0000)]

XML output tweaks
Fix some NPEs in the merge of session-config elements
Fix a copy and paste error in the merge of session-config elements

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

commit | commitdiff | tree

markt [Tue, 29 Dec 2009 17:33:22 +0000 (17:33 +0000)]

Add support for configuring session cookies and session tracking in web.xml

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

commit | commitdiff | tree

markt [Tue, 29 Dec 2009 14:13:24 +0000 (14:13 +0000)]

Add support for the enabled attribute for servlets in web.xml

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

commit | commitdiff | tree

markt [Tue, 29 Dec 2009 13:04:33 +0000 (13:04 +0000)]

Fix copy/paste error

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

commit | commitdiff | tree

markt [Tue, 29 Dec 2009 13:03:46 +0000 (13:03 +0000)]

Make handling of ServletDef.asyncSupport consistent

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

commit | commitdiff | tree

markt [Tue, 29 Dec 2009 12:50:54 +0000 (12:50 +0000)]

Add configuration option that allows the effective web.xml to be logged on context start.
Expose the effective web.xml through a context attribute so other components (eg Jasper) can use it.

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

commit | commitdiff | tree

markt [Tue, 29 Dec 2009 12:23:07 +0000 (12:23 +0000)]

Interface and type are separate

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

commit | commitdiff | tree

markt [Tue, 29 Dec 2009 12:21:42 +0000 (12:21 +0000)]

Expose string array of dispatcher names

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

commit | commitdiff | tree

markt [Mon, 28 Dec 2009 22:23:14 +0000 (22:23 +0000)]

JSP 2.2 - Add support for the new jsp-property-group elements to the web.xml parsing

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

commit | commitdiff | tree

markt [Mon, 28 Dec 2009 22:12:06 +0000 (22:12 +0000)]

Revert r893208. Catalina does have a requirement to access the full jsp-property-group info

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

commit | commitdiff | tree

fhanik [Thu, 24 Dec 2009 17:28:20 +0000 (17:28 +0000)]

Allow all kinds of data sources to be mapped to the connection pool

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

commit | commitdiff | tree

markt [Thu, 24 Dec 2009 14:37:57 +0000 (14:37 +0000)]

Make naming consistent with elsewhere in Tomcat

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

commit | commitdiff | tree

markt [Thu, 24 Dec 2009 12:49:46 +0000 (12:49 +0000)]

Clean up i18n resources after JarScanner changes

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

commit | commitdiff | tree

markt [Thu, 24 Dec 2009 12:43:22 +0000 (12:43 +0000)]

Move StringManager to the tomcat-util jar

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

commit | commitdiff | tree

markt [Thu, 24 Dec 2009 12:35:27 +0000 (12:35 +0000)]

Have one list of JARs to ignore when scanning for config and make it configurable

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

commit | commitdiff | tree

markt [Thu, 24 Dec 2009 11:14:46 +0000 (11:14 +0000)]

Move JAR scanning into a new JAR used by both Catalina and Jasper

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

commit | commitdiff | tree

markt [Wed, 23 Dec 2009 22:20:59 +0000 (22:20 +0000)]

JSP 2.2 - Update to JSP.5.1 - Sync only required for session and application scope

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

commit | commitdiff | tree

markt [Wed, 23 Dec 2009 20:05:25 +0000 (20:05 +0000)]

JSP 2.2 - Add omit attribute to <jsp:attribute>

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

commit | commitdiff | tree

fhanik [Wed, 23 Dec 2009 17:12:10 +0000 (17:12 +0000)]

Allow null usernames and passwords to be passed in, so that one can call DataSource.getConnection()

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

commit | commitdiff | tree

fhanik [Wed, 23 Dec 2009 16:40:47 +0000 (16:40 +0000)]

Fix how we detect what class is being invoked so we can multiplex the method invocation correctly

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

commit | commitdiff | tree

kkolinko [Wed, 23 Dec 2009 12:40:59 +0000 (12:40 +0000)]

Enforce presence of charset in content-type header of textual mime-types in the Examples webapp
a) by using a filter, b) by adding mime-type mappings for htm/html files

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

commit | commitdiff | tree

kkolinko [Wed, 23 Dec 2009 12:36:57 +0000 (12:36 +0000)]

Properly close <head> tags in tagplugin documentation pages.

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

commit | commitdiff | tree

markt [Wed, 23 Dec 2009 08:40:00 +0000 (08:40 +0000)]

Restore alphabetical order

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

commit | commitdiff | tree

kkolinko [Wed, 23 Dec 2009 02:28:04 +0000 (02:28 +0000)]

Apply r893375 to extras.xml as well.
This changes format of md5 files generated for the extras from "checksum" only to "checksum *filename".
So, those md5 files will be in the same format as the ones generated by dist.xml.

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

commit | commitdiff | tree

kkolinko [Wed, 23 Dec 2009 01:53:00 +0000 (01:53 +0000)]

Fix EOLN issues in md5 files generated for our releases.

1. Do not add an EOLN after checksum value.
This was caused by difference in behaviour between Ant 1.6 and 1.7. Ant 1.6 did not add the newline.
We could use 'pattern' or 'format' attributes of the <checksum> task, but those are since Ant 1.7 only, not available in 1.6.5. This solution siplifies code and preserves compatibility with Ant 1.6.

2. Do not add an EOLN after the file name.
I removed ${line.separator} from the echoed text.
If the build is generated on Windows and verified on *nix, extra CR in a file name will cause complaints. I won't object to using an explicit LF here, though.

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

commit | commitdiff | tree

kkolinko [Wed, 23 Dec 2009 00:41:58 +0000 (00:41 +0000)]

Slight correction to the list of file extensions used to enforce LF/CRLF conventions in source distros.
1. Replace *.default with *.properties.default, to be explicit about file type.
2. Add *.htm We have such a file in TC7, though not in TC6.
3. Add *.tagx. Though we do not have examples of tag files in XML syntax yet, but I think we better have this pattern included.

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

commit | commitdiff | tree

markt [Tue, 22 Dec 2009 21:17:41 +0000 (21:17 +0000)]

Fix regression (JSP TCK failure) with fix for bug 47453

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

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