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

projects / tomcat7.0 / log

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

commit | commitdiff | tree

rjung [Fri, 24 Jun 2011 12:48:20 +0000 (12:48 +0000)]

Fix IllegalStateException for JavaScript files
when switching from Writer to OutputStream.

The special handling of this case in the
DefaultServlet was broken due to a MIME type
change for JavaScript.

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

commit | commitdiff | tree

rjung [Fri, 24 Jun 2011 05:39:19 +0000 (05:39 +0000)]

Correctly support 'S' and 'SSS' in SimpleDateFormat
timestamps for the AccessLogValve.

We prefer "msec_frac" as documented, but the common
other cases should at least work.

Other multiples of the 'S' formatting character
will produce bogus results (but don't make much
sense either).

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

commit | commitdiff | tree

rjung [Fri, 24 Jun 2011 05:33:35 +0000 (05:33 +0000)]

Remove dead code and correct comment about
thread-safetyness.

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

commit | commitdiff | tree

markt [Thu, 23 Jun 2011 23:24:36 +0000 (23:24 +0000)]

Prep for fixing https://issues.apache.org/bugzilla/show_bug.cgi?id=50949
Use a variable for the service name and ensure the uninstaller still works

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

commit | commitdiff | tree

markt [Thu, 23 Jun 2011 22:35:22 +0000 (22:35 +0000)]

Use a function to start the service so the service name can be changed during the install

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

commit | commitdiff | tree

markt [Thu, 23 Jun 2011 22:25:12 +0000 (22:25 +0000)]

Remove inaccurate comment

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

commit | commitdiff | tree

markt [Thu, 23 Jun 2011 22:01:41 +0000 (22:01 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=40510
Provide an option to install shortcuts for the current user or all users. Also ensure registry is correctly cleaned on uninstall for 64-bit platforms.

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

commit | commitdiff | tree

markt [Thu, 23 Jun 2011 18:27:39 +0000 (18:27 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=33262
Install monitor to auto-start for current user only rather than all users to be consistent with menu item creation.

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

commit | commitdiff | tree

markt [Thu, 23 Jun 2011 15:54:43 +0000 (15:54 +0000)]

Add important missing word

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

commit | commitdiff | tree

markt [Thu, 23 Jun 2011 15:51:55 +0000 (15:51 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=36362
Handle the case where tag file attributes (which can use any valid XML name) have a name which is not a Java identifier.

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

commit | commitdiff | tree

rjung [Thu, 23 Jun 2011 13:50:40 +0000 (13:50 +0000)]

Improve JMX unit test.

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

commit | commitdiff | tree

markt [Thu, 23 Jun 2011 12:18:20 +0000 (12:18 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51425
Update Spanish translations.
Based on a patch provided by Jesus Marin.

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

commit | commitdiff | tree

rjung [Thu, 23 Jun 2011 12:08:31 +0000 (12:08 +0000)]

Follow-up to r1137925:
Use buf.add(char) when there is a single character string.

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

commit | commitdiff | tree

markt [Thu, 23 Jun 2011 11:44:39 +0000 (11:44 +0000)]

Move the statics out of the "instance variable" section

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

commit | commitdiff | tree

rjung [Thu, 23 Jun 2011 11:27:57 +0000 (11:27 +0000)]

Remove unnecessary variable BASEDIR from scripts.

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

commit | commitdiff | tree

rjung [Thu, 23 Jun 2011 11:01:02 +0000 (11:01 +0000)]

Use system properties loaded from catalina.properties
via the class path in unit tests.

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

commit | commitdiff | tree

rjung [Thu, 23 Jun 2011 10:57:18 +0000 (10:57 +0000)]

Remove redundant copy of catalina.properties from
o.a.c.startup. Generate this copy for inclusion in
bin and src jars during the ant "compile" task.

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

commit | commitdiff | tree

markt [Thu, 23 Jun 2011 09:31:39 +0000 (09:31 +0000)]

Remove unused code

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

commit | commitdiff | tree

markt [Thu, 23 Jun 2011 09:31:10 +0000 (09:31 +0000)]

Don't cache xml parsing config locally, get it from the Context

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

commit | commitdiff | tree

markt [Thu, 23 Jun 2011 09:26:10 +0000 (09:26 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51395
Better fix for memory leak that aligns ContextConfig with TldConfig

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

commit | commitdiff | tree

markt [Thu, 23 Jun 2011 09:00:51 +0000 (09:00 +0000)]

Revert r1137753 - I have a better soution in mind

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

commit | commitdiff | tree

kkolinko [Thu, 23 Jun 2011 00:10:23 +0000 (00:10 +0000)]

Amend description for the fix applied in r1132700.
The problem there was less severe than it sounds:
The port number was not treated as hex. The arithmetics to summ up the digits has already been using base 10.

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

commit | commitdiff | tree

markt [Wed, 22 Jun 2011 23:40:30 +0000 (23:40 +0000)]

Connector refactoring
SocketWrapper changes for AJP processor

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

commit | commitdiff | tree

kkolinko [Wed, 22 Jun 2011 23:39:58 +0000 (23:39 +0000)]

Followup to r1138573
Improve support for embedding Tomcat 7.

Expose the string that was used to suppress loading default web.xml as a constant. Short-circuit the attempt to load the web.xml file when this magic value is used. Thus saving us from unneeded getResourceAsStream() call.

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

commit | commitdiff | tree

markt [Wed, 22 Jun 2011 23:39:05 +0000 (23:39 +0000)]

Connector refactoring
SocketWrapper changes for HTTP processor

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

commit | commitdiff | tree

markt [Wed, 22 Jun 2011 23:33:39 +0000 (23:33 +0000)]

Connector refactoring
Rename socketWrapper to socket to align with BIO/APR

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

commit | commitdiff | tree

markt [Wed, 22 Jun 2011 23:32:17 +0000 (23:32 +0000)]

Remove the local socket object

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

commit | commitdiff | tree

markt [Wed, 22 Jun 2011 23:29:51 +0000 (23:29 +0000)]

Connector refactoring
Another small step towards SocketWrapper for NIO

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

commit | commitdiff | tree

markt [Wed, 22 Jun 2011 23:25:43 +0000 (23:25 +0000)]

Connector refactoring
Another small step towards SocketWrapper for NIO

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

commit | commitdiff | tree

markt [Wed, 22 Jun 2011 23:17:14 +0000 (23:17 +0000)]

Connector refactoring
Another small step towards SocketWrapper for NIO

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

commit | commitdiff | tree

markt [Wed, 22 Jun 2011 23:13:37 +0000 (23:13 +0000)]

Connector refactoring.
Start moving the NIO connectors towards using SocketWrapper<NioChannel> rather than NioChannel to align them with BIO/APR and permit further refactoring.
Do this in small steps since when I tried to do it in one hit, everything broke.

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

commit | commitdiff | tree

markt [Wed, 22 Jun 2011 18:30:41 +0000 (18:30 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51418
Provide more control over Context creation when embedding Tomcat.
Based on a patch by Benson Margulies.

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

commit | commitdiff | tree

markt [Wed, 22 Jun 2011 17:11:03 +0000 (17:11 +0000)]

Fix copy/paste error that broke crl handling

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

commit | commitdiff | tree

markt [Wed, 22 Jun 2011 16:53:58 +0000 (16:53 +0000)]

No functional change.
Refactoring so all attributes are handled the same way.

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

commit | commitdiff | tree

markt [Wed, 22 Jun 2011 14:59:11 +0000 (14:59 +0000)]

Further improvements to startup performance.
Use File URLs where they can be determined for speed.

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

commit | commitdiff | tree

markt [Tue, 21 Jun 2011 18:44:58 +0000 (18:44 +0000)]

Fix Eclipse warnings in Valves

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

commit | commitdiff | tree

markt [Tue, 21 Jun 2011 18:41:42 +0000 (18:41 +0000)]

Fix Eclipse warnings / remove unused code

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

commit | commitdiff | tree

markt [Tue, 21 Jun 2011 18:34:46 +0000 (18:34 +0000)]

Another fp

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

commit | commitdiff | tree

markt [Tue, 21 Jun 2011 18:32:41 +0000 (18:32 +0000)]

Fix warnings in SSI package

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

commit | commitdiff | tree

markt [Tue, 21 Jun 2011 18:15:56 +0000 (18:15 +0000)]

Remove unused code

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

commit | commitdiff | tree

markt [Tue, 21 Jun 2011 14:39:17 +0000 (14:39 +0000)]

Revert to previous, no need for Charset here.

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

commit | commitdiff | tree

markt [Tue, 21 Jun 2011 14:29:49 +0000 (14:29 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51400
Avoid known bottleneck in JVM when converting between Strings and bytes by always providing a Charset rather than an encoding name.
Based on a patch by Dave Engberg.

Note: There are some Charsets that the JVM must support and in those cases Charset.forName(String) should not throw an exception.

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

commit | commitdiff | tree

kkolinko [Tue, 21 Jun 2011 13:24:44 +0000 (13:24 +0000)]

Avoid NullPointerException in JULI FileHandler if formatter is misconfigured
Fixes https://issues.apache.org/bugzilla/post_bug.cgi

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

commit | commitdiff | tree

markt [Tue, 21 Jun 2011 11:10:47 +0000 (11:10 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51401
Correctly initialise shared WebRuleSet instance used by the digesters that parse web.xml and prevent incorrect warnings about multiple occurrences of elements that are only allowed to appear once in web.xml and web-fragment.xml.
Patch by kfujino

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

commit | commitdiff | tree

kkolinko [Tue, 21 Jun 2011 10:20:28 +0000 (10:20 +0000)]

Add missing comma

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

commit | commitdiff | tree

kkolinko [Tue, 21 Jun 2011 10:17:17 +0000 (10:17 +0000)]

Align tomcat.util.scan.DefaultJarScanner.jarsToSkip value in TomcatBaseTest.
Add junit and ant-launcher to the value in catalina.properties

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

commit | commitdiff | tree

kkolinko [Tue, 21 Jun 2011 10:02:56 +0000 (10:02 +0000)]

Add @Override
Use buf.add(char) when there is a single character string

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

commit | commitdiff | tree

kkolinko [Tue, 21 Jun 2011 08:58:19 +0000 (08:58 +0000)]

Fix typos in committer ids

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

commit | commitdiff | tree

rjung [Tue, 21 Jun 2011 08:42:13 +0000 (08:42 +0000)]

Add comment on item ordering, update
one entry, add one entry.

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

commit | commitdiff | tree

rjung [Tue, 21 Jun 2011 07:39:44 +0000 (07:39 +0000)]

Fix typo and more clarification about CATALINA_OPTS
vs. JAVA_OPTS.

Thanks to Rainer Frey.

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

commit | commitdiff | tree

rjung [Tue, 21 Jun 2011 06:17:38 +0000 (06:17 +0000)]

Add an info about setenv.sh before listing the
customizable variables.

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

commit | commitdiff | tree

rjung [Tue, 21 Jun 2011 06:13:44 +0000 (06:13 +0000)]

Clarify difference between CATALINA_OPTS and
JAVA_OPTS in the scripts.

Feel free to improve wording and examples.

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

commit | commitdiff | tree

rjung [Tue, 21 Jun 2011 05:30:55 +0000 (05:30 +0000)]

Define CATALINA_BASE fallback earlier,
so one can use CATALINA_BASE and CATALINA_HOME
variables in setenv without knowing, whether
the two have been split (i.e. CATALINA_BASE is
set) or not.

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

commit | commitdiff | tree

markt [Mon, 20 Jun 2011 23:09:49 +0000 (23:09 +0000)]

Auto format

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

commit | commitdiff | tree

markt [Mon, 20 Jun 2011 23:02:10 +0000 (23:02 +0000)]

Deprecated TagPool that may trigger memory leaks.

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

commit | commitdiff | tree

markt [Mon, 20 Jun 2011 22:34:16 +0000 (22:34 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51396
Correctly handle jsp-file entries in web.xml when the JSP servlet has been configured via code when embedding Tomcat.

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

commit | commitdiff | tree

markt [Mon, 20 Jun 2011 22:28:57 +0000 (22:28 +0000)]

Ordering

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

commit | commitdiff | tree

markt [Mon, 20 Jun 2011 20:20:27 +0000 (20:20 +0000)]

Fix odd looking code

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 20:12:26 +0000 (20:12 +0000)]

Make sure we never use the DateFormatCache with
millisecond patterns.

Tidy the format pattern like we do in the
AccessLogValve.

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 19:47:57 +0000 (19:47 +0000)]

Let OneLineFormatter use DateFormatCache.

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 19:44:04 +0000 (19:44 +0000)]

More Jars to skip: ant-junit and Java Help.

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

commit | commitdiff | tree

markt [Mon, 20 Jun 2011 19:26:45 +0000 (19:26 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51395
Fix memory leak triggered when an application that includes a SAXParserFactory is the first web application to be loaded.

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 19:01:14 +0000 (19:01 +0000)]

Remove unused code.

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

commit | commitdiff | tree

markt [Mon, 20 Jun 2011 18:19:08 +0000 (18:19 +0000)]

Address kkolinko's review comments

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

commit | commitdiff | tree

markt [Mon, 20 Jun 2011 18:02:25 +0000 (18:02 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=33453
Recompile JSPs if last modified time of the source or any of its dependencies changes either forwards or backwards. Note that this introduces an incompatible change to the code generated for JSPs. Tomcat will automatically re-compile any JSPs and tag files found in the work directory when upgrading from 7.0.16 or earlier to 7.0.17 or later. If you later downgrade from 7.0.17 or later to 7.0.16 or earlier, you must empty the work directory as part of the downgrade process.

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

commit | commitdiff | tree

markt [Mon, 20 Jun 2011 16:38:40 +0000 (16:38 +0000)]

The fix for bug 51310 caused a regression that re-introduced bug 49957 and deleted the contents of the work directory when Tomcat was shutdown. This fix ensures that that work directory for an application is not deleted when Tomcat is shutdown.

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 15:11:59 +0000 (15:11 +0000)]

Add note about script changes.

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

commit | commitdiff | tree

markt [Mon, 20 Jun 2011 14:57:37 +0000 (14:57 +0000)]

Packages tag files have jndi URLs not file URLs

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

commit | commitdiff | tree

markt [Mon, 20 Jun 2011 14:24:19 +0000 (14:24 +0000)]

Remove unnecessary code.

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 12:37:57 +0000 (12:37 +0000)]

Add configtest to Windows catalina.bat.

Not yet complete:

- No error code escalation
- No log message

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 12:37:01 +0000 (12:37 +0000)]

Slight improvement of configtest handling in
Unix shell script:

- add to usage
- don't use CATALINA_OPTS (think memory size etc.)
- log a message if status != 0

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 09:53:37 +0000 (09:53 +0000)]

Make variable explanations for catalina.bat
and tool-wrapper.bat consistent with their Unix
counterparts.

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 09:52:45 +0000 (09:52 +0000)]

Make tool-wrapper.sh consistent with catalina.sh.

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 09:52:16 +0000 (09:52 +0000)]

- Clarify JRE_HOME in catalina.sh
- sort OS detection by OS name

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 09:50:17 +0000 (09:50 +0000)]

Make JRE / JDK detection on Windows work
the same way as on Unix:
- if "debug" is demanded, only use JAVA_HOME
and check for a JDK there
- without "debug", either use JRE_HOME
or JAVA_HOME with precedence on JRE_HOME

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 09:27:44 +0000 (09:27 +0000)]

Add missing Windows configtest script.

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 09:27:30 +0000 (09:27 +0000)]

Make Windows shell scripts for individual
commands consistent.

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 09:26:36 +0000 (09:26 +0000)]

Make Unix shell scripts for individual
commands consistent.

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 08:06:56 +0000 (08:06 +0000)]

Add the Tomcat extras JARs to the list of JARs
to skip when scanning for TLDs and web fragments.

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 21:39:58 +0000 (21:39 +0000)]

Method is identical to method in superclass so remove it

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 21:33:55 +0000 (21:33 +0000)]

Pull up prepareRequest()

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 21:27:38 +0000 (21:27 +0000)]

Align with BIO (add debug log messages)
Prepare for pulling up (add tests around adverts for comet support)

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 21:23:14 +0000 (21:23 +0000)]

Add flags that indicate optional feature support

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 21:15:22 +0000 (21:15 +0000)]

Reset sendfile data in recycle method so prepareRequest can be pulled up

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 19:21:34 +0000 (19:21 +0000)]

Extend margin lese tests fail on Linux VM

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 17:28:26 +0000 (17:28 +0000)]

Add an additional error margin to avoid false test failures

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 17:08:59 +0000 (17:08 +0000)]

Add missing sync that triggered test failures on Linux VM post re-factoring

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 17:08:11 +0000 (17:08 +0000)]

Align with JIoEndpoint

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 16:30:26 +0000 (16:30 +0000)]

Pull up getBody message

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 15:56:22 +0000 (15:56 +0000)]

Pull up common code

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 15:50:17 +0000 (15:50 +0000)]

Pull up more common code in Processor constructors

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 15:00:40 +0000 (15:00 +0000)]

Pull up common endpoint code in Processor constructors

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

commit | commitdiff | tree

rjung [Sun, 19 Jun 2011 14:27:52 +0000 (14:27 +0000)]

No need to for addToPoller in APR HTTP.

When returning SocketState.OPEN the socket is
always added to the poller.

Fixes some crashes due to putting the same socket
twice in the poller.

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

commit | commitdiff | tree

rjung [Sun, 19 Jun 2011 11:22:20 +0000 (11:22 +0000)]

Add new timestamp formatting info to AccessLogValve
docs.

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

commit | commitdiff | tree

rjung [Sun, 19 Jun 2011 10:58:02 +0000 (10:58 +0000)]

BZ 49165 and more:
- Allow any time stamp formats supported
by SimpleDateFormat in AccessLogValve.
- Support logging begin and/or end of request.

Docs to follow.

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 10:53:00 +0000 (10:53 +0000)]

Start to pull up common code from constructors

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 10:07:22 +0000 (10:07 +0000)]

Pull up definition of standard messages

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 09:50:17 +0000 (09:50 +0000)]

More refactoring since last release

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

commit | commitdiff | tree

rjung [Sun, 19 Jun 2011 09:47:32 +0000 (09:47 +0000)]

Use static final instead of volatile in
AccessLogValve.

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 09:46:36 +0000 (09:46 +0000)]

Don't use println to write output since os differences will result in different numbers of bytes output

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

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