tomcat7.0
15 years agoAdd some checks that nulls are handled correctly.
markt [Mon, 31 May 2010 18:20:39 +0000 (18:20 +0000)]
Add some checks that nulls are handled correctly.

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49345
markt [Mon, 31 May 2010 17:30:25 +0000 (17:30 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49345
Second parameter for new ValueReference should be property. There is no guarantee that the property will be the second child node.

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

15 years agoTest case for https://issues.apache.org/bugzilla/show_bug.cgi?id=49345
markt [Mon, 31 May 2010 17:29:17 +0000 (17:29 +0000)]
Test case for https://issues.apache.org/bugzilla/show_bug.cgi?id=49345
Fix to follow

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49360
markt [Mon, 31 May 2010 16:57:45 +0000 (16:57 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49360
Managers will be restarted on Context reload

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

15 years agoIt works (I fixed it for 6.0.20) but it still needs docs.
markt [Mon, 31 May 2010 16:18:31 +0000 (16:18 +0000)]
It works (I fixed it for 6.0.20) but it still needs docs.

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49340
markt [Fri, 28 May 2010 20:08:02 +0000 (20:08 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49340
Simplify the mapper listener registration/de-registration process

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

15 years agoFix APR AJP logic.
jfclere [Thu, 27 May 2010 12:05:50 +0000 (12:05 +0000)]
Fix APR AJP logic.

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

15 years agoExtend to test deferred expressions. Need to use request scope attributes since page...
markt [Thu, 27 May 2010 00:43:54 +0000 (00:43 +0000)]
Extend to test deferred expressions. Need to use request scope attributes since page scope ones won't be visible to the tag file when evaluating the deferred expressions.

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

15 years agoFix for BZ49343.
kfujino [Wed, 26 May 2010 11:58:55 +0000 (11:58 +0000)]
Fix for BZ49343.
When ChannelException is thrown, remove listener from channel.

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

15 years agoGSOC 2010
markt [Tue, 25 May 2010 23:48:21 +0000 (23:48 +0000)]
GSOC 2010
Expose additional cluster attributes
Patch provided by chamith buddhika

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

15 years agoGSOC 2010
markt [Tue, 25 May 2010 23:38:40 +0000 (23:38 +0000)]
GSOC 2010
Expose additional cluster attributes
Patch provided by chamith buddhika

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

15 years agoGSOC 2010
markt [Tue, 25 May 2010 23:37:03 +0000 (23:37 +0000)]
GSOC 2010
Add the container although it isn't much use yet.
Patch provided by chamith buddhika

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

15 years agogit-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@948248 13f79535-47bb-0310...
markt [Tue, 25 May 2010 23:14:06 +0000 (23:14 +0000)]
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@948248 13f79535-47bb-0310-9956-ffa450edef68

15 years agoMake test more exact. Want to spot any change in the number of MBeans.
markt [Tue, 25 May 2010 22:44:21 +0000 (22:44 +0000)]
Make test more exact. Want to spot any change in the number of MBeans.

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

15 years agoRestore the naming resource MBeans
markt [Tue, 25 May 2010 22:43:45 +0000 (22:43 +0000)]
Restore the naming resource MBeans

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

15 years agoClean-up
markt [Tue, 25 May 2010 21:25:45 +0000 (21:25 +0000)]
Clean-up

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

15 years agoAdd missing classes.
jfclere [Tue, 25 May 2010 16:08:36 +0000 (16:08 +0000)]
Add missing classes.

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

15 years agoRemove unused imports
markt [Tue, 25 May 2010 15:18:02 +0000 (15:18 +0000)]
Remove unused imports

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49196
markt [Tue, 25 May 2010 14:20:58 +0000 (14:20 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49196
Avoid NPE on PageContext.getErrorData()

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

15 years agoAdd a test case for https://issues.apache.org/bugzilla/show_bug.cgi?id=49196
markt [Tue, 25 May 2010 14:20:16 +0000 (14:20 +0000)]
Add a test case for https://issues.apache.org/bugzilla/show_bug.cgi?id=49196
Patch to follow shortly

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

15 years agoTabs to spaces
markt [Tue, 25 May 2010 14:16:08 +0000 (14:16 +0000)]
Tabs to spaces

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49095
markt [Tue, 25 May 2010 13:53:14 +0000 (13:53 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49095
AprEndpoint does not wakeup accepts with deferred accept or BSD filters
Based on a patch provided by Ruediger Pluem

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

15 years agoRemove duplicate code
markt [Tue, 25 May 2010 12:50:19 +0000 (12:50 +0000)]
Remove duplicate code

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

15 years agoIt would a lot of work to have it switchable in APR.
jfclere [Tue, 25 May 2010 09:13:15 +0000 (09:13 +0000)]
It would a lot of work to have it switchable in APR.

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

15 years agoMissed 2 files - older version of the protocol, will update them when I get to the...
costin [Tue, 25 May 2010 07:37:23 +0000 (07:37 +0000)]
Missed 2 files - older version of the protocol, will update them when I get to the new proto.

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

15 years agoMatching test fixes. Seems to pass ( maven can be used, but will build/test against...
costin [Tue, 25 May 2010 07:36:04 +0000 (07:36 +0000)]
Matching test fixes. Seems to pass ( maven can be used, but will build/test against tomcat6 ).

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

15 years agoVarious changes to better support coyote, remove integration package, prepare to...
costin [Tue, 25 May 2010 06:54:47 +0000 (06:54 +0000)]
Various changes to better support coyote, remove integration package, prepare to replace jsse with apr, etc.

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

15 years agoMore coyote support.
costin [Tue, 25 May 2010 06:44:02 +0000 (06:44 +0000)]
More coyote support.

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

15 years agoMoved the JSSE code to separate package. Added a bunch of workarounds to support...
costin [Tue, 25 May 2010 06:42:26 +0000 (06:42 +0000)]
Moved the JSSE code to separate package. Added a bunch of workarounds to support harmony/android, there seems to be a problem with the ciphers.
Probably the code will go away after I add APR support - too many problems, in particular SPDY can't be implemented as it relies on SSL protocol negotiation.
For now it mostly works on android.

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

15 years agoBroken, not used. Source in o.a.t.util.buf was removed as well.
costin [Tue, 25 May 2010 06:21:36 +0000 (06:21 +0000)]
Broken, not used. Source in o.a.t.util.buf was removed as well.

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

15 years agoRemove the 'integration' - ObjectManager and wrapping of DI frameworks. Lite is just...
costin [Tue, 25 May 2010 06:12:38 +0000 (06:12 +0000)]
Remove the 'integration' - ObjectManager and wrapping of DI frameworks. Lite is just a library/connector - doesn't need it, instead will integrate
it with existing tomcat JNI model. I may add it back for an example of using tomcat-lite standalone, but for now it's better to avoid confusion.

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

15 years agoRemoving the mini-'servlet' code from lite. The goal is to implement connector and...
costin [Tue, 25 May 2010 06:09:40 +0000 (06:09 +0000)]
Removing the mini-'servlet' code from lite. The goal is to implement connector and http client, this creates confusion.

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

15 years agoCorrect a typo
kkolinko [Mon, 24 May 2010 22:19:23 +0000 (22:19 +0000)]
Correct a typo

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

15 years agoFix some TCK failures with the BIO AJP connector when using a security manager
markt [Mon, 24 May 2010 17:03:37 +0000 (17:03 +0000)]
Fix some TCK failures with the BIO AJP connector when using a security manager

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=48976
markt [Mon, 24 May 2010 14:28:20 +0000 (14:28 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48976
Document JAVA_ENDORSED_DIRS

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

15 years agoAccording to Konstantin's review comments:
rjung [Mon, 24 May 2010 12:08:24 +0000 (12:08 +0000)]
According to Konstantin's review comments:
- eliminate line breaks in descriptions
- change capitalization of attribute from "uRLs" to
  "URLs".

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

15 years agoRestore -dev suffix post tag
markt [Sun, 23 May 2010 21:04:08 +0000 (21:04 +0000)]
Restore -dev suffix post tag

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

15 years agoPrep for RC3
markt [Sun, 23 May 2010 21:01:36 +0000 (21:01 +0000)]
Prep for RC3

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

15 years agoDon't add HostConfig as a listener twice. It breaks the Manager app and probably...
markt [Sun, 23 May 2010 11:32:12 +0000 (11:32 +0000)]
Don't add HostConfig as a listener twice. It breaks the Manager app and probably other stuff too.

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

15 years agoAlign host-manager role names with manager role names.
markt [Sun, 23 May 2010 10:46:40 +0000 (10:46 +0000)]
Align host-manager role names with manager role names.
Add a 403 page to inform users of changed role name.

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

15 years agoAdd a 403 page. If the user tries to use the old manager role, they'll get a 403.
markt [Sun, 23 May 2010 10:41:25 +0000 (10:41 +0000)]
Add a 403 page. If the user tries to use the old manager role, they'll get a 403.

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

15 years agoTabs to 8 spaces. No functional change.
kkolinko [Thu, 20 May 2010 18:28:39 +0000 (18:28 +0000)]
Tabs to 8 spaces. No functional change.

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

15 years agoImprovement suggested by Sebastian Bazley.
jfclere [Thu, 20 May 2010 17:12:10 +0000 (17:12 +0000)]
Improvement suggested by Sebastian Bazley.

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

15 years agoTabs to 8 spaces. No functional change.
kkolinko [Thu, 20 May 2010 17:02:06 +0000 (17:02 +0000)]
Tabs to 8 spaces. No functional change.

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

15 years agoThe SSL gets cleaned too.
jfclere [Thu, 20 May 2010 16:52:16 +0000 (16:52 +0000)]
The SSL gets cleaned too.

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

15 years agoAdditional fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48840
kkolinko [Thu, 20 May 2010 16:19:49 +0000 (16:19 +0000)]
Additional fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48840
Port the fix from catalina.sh to tool-wrapper.sh as well.

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

15 years agoOops... Minor errors.
jfclere [Thu, 20 May 2010 15:50:51 +0000 (15:50 +0000)]
Oops... Minor errors.

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

15 years agoArrange APR logic.
jfclere [Thu, 20 May 2010 15:42:17 +0000 (15:42 +0000)]
Arrange APR logic.

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

15 years agoNeeded to test APR.
jfclere [Thu, 20 May 2010 15:41:10 +0000 (15:41 +0000)]
Needed to test APR.

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

15 years agoPrevent core due to wrong synchronisation.
jfclere [Thu, 20 May 2010 15:25:13 +0000 (15:25 +0000)]
Prevent core due to wrong synchronisation.

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

15 years agoAdd the certificate and key for the APR tests.
jfclere [Thu, 20 May 2010 13:14:20 +0000 (13:14 +0000)]
Add the certificate and key for the APR tests.

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

15 years agoMinor clean-up. Result is always converted to String so just do it once.
markt [Thu, 20 May 2010 12:07:38 +0000 (12:07 +0000)]
Minor clean-up. Result is always converted to String so just do it once.

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

15 years agoRemove unused code identified by Eclipse
markt [Thu, 20 May 2010 11:06:33 +0000 (11:06 +0000)]
Remove unused code identified by Eclipse

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

15 years agoFix lost session path parameter on redirect
markt [Thu, 20 May 2010 09:49:24 +0000 (09:49 +0000)]
Fix lost session path parameter on redirect

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

15 years agoREpurpose the duplicate pathPath test to test the redirect process
markt [Thu, 20 May 2010 09:48:43 +0000 (09:48 +0000)]
REpurpose the duplicate pathPath test to test the redirect process

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

15 years agoGSOC 2010: ResourceLink
markt [Wed, 19 May 2010 16:38:41 +0000 (16:38 +0000)]
GSOC 2010: ResourceLink
Patch provided by Chamith Buddhika

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

15 years agoGSOC 2010: Further improvements to o.a.c.connector
markt [Wed, 19 May 2010 16:18:29 +0000 (16:18 +0000)]
GSOC 2010: Further improvements to o.a.c.connector
Patch provided by Chamith Buddhika

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

15 years agoAllow to test with APR.
jfclere [Wed, 19 May 2010 16:06:51 +0000 (16:06 +0000)]
Allow to test with APR.

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

15 years agoAdd method TomcatBaseTest#getTemporaryDirectory()
kkolinko [Wed, 19 May 2010 15:55:33 +0000 (15:55 +0000)]
Add method TomcatBaseTest#getTemporaryDirectory()
Use mkdirs() to create tempDir directory in TomcatBaseTest#setUp()
Fix issue with TestRegistration test failing when ${tomcat.output} ant property had non-default value.

The failure was due to the contextDir.mkdir() call in TestRegistration#testMBeanDeregistration() failing to create a subdirectory because its parent directory did not exist.

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

15 years agoComplete correction of name
markt [Wed, 19 May 2010 15:46:30 +0000 (15:46 +0000)]
Complete correction of name

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

15 years agoEnable debug logging to investigate Gump failures
markt [Wed, 19 May 2010 15:45:55 +0000 (15:45 +0000)]
Enable debug logging to investigate Gump failures

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

15 years agoAdditional change required for debug logging
markt [Wed, 19 May 2010 15:45:20 +0000 (15:45 +0000)]
Additional change required for debug logging

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

15 years agoAdd some debug logging for investigating the Gump failures. I may remove it once...
markt [Wed, 19 May 2010 15:44:57 +0000 (15:44 +0000)]
Add some debug logging for investigating the Gump failures. I may remove it once those have been resolved.

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

15 years agoCorrent name
markt [Wed, 19 May 2010 15:17:50 +0000 (15:17 +0000)]
Corrent name

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

15 years agoTypo in a comment
kkolinko [Wed, 19 May 2010 15:17:23 +0000 (15:17 +0000)]
Typo in a comment

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

15 years agoDo not try to find compiled class files of test classes by looking directly into...
kkolinko [Wed, 19 May 2010 15:14:03 +0000 (15:14 +0000)]
Do not try to find compiled class files of test classes by looking directly into "known" places, but ask the classloader where it loads them from.
This fixes test failure when ${tomcat.output} ant property has non-default value.

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

15 years agoTypo
markt [Wed, 19 May 2010 14:52:42 +0000 (14:52 +0000)]
Typo

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

15 years agoMove encoding outside the loop
markt [Wed, 19 May 2010 13:03:57 +0000 (13:03 +0000)]
Move encoding outside the loop

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

15 years agorevert r946149
kkolinko [Wed, 19 May 2010 12:50:34 +0000 (12:50 +0000)]
revert r946149
Those "blank lines" must be there, because they separate sections of the manifest.

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

15 years agoRemove blank lines
markt [Wed, 19 May 2010 12:21:11 +0000 (12:21 +0000)]
Remove blank lines

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

15 years agoSync Windows installer config files with 'normal' versions
markt [Wed, 19 May 2010 12:19:51 +0000 (12:19 +0000)]
Sync Windows installer config files with 'normal' versions

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

15 years agoOtherwise it will fail with java 1.6.0_18 +.
jfclere [Wed, 19 May 2010 12:10:32 +0000 (12:10 +0000)]
Otherwise it will fail with java 1.6.0_18 +.

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

15 years agoClean-up
markt [Wed, 19 May 2010 10:33:17 +0000 (10:33 +0000)]
Clean-up

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

15 years agoMake Log and StringManager instances private to the class.
markt [Wed, 19 May 2010 10:24:53 +0000 (10:24 +0000)]
Make Log and StringManager instances private to the class.
This fixes:
- messages for one class being logged via the logger of another
- messages not being found since the class is in a different packager to the super class

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

15 years agoFix Eclipse warnings, line-length
markt [Wed, 19 May 2010 10:12:00 +0000 (10:12 +0000)]
Fix Eclipse warnings, line-length

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

15 years agoA simple testcase that prints version info
kkolinko [Wed, 19 May 2010 03:57:04 +0000 (03:57 +0000)]
A simple testcase that prints version info

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

15 years agore-add all-in-one testcase,
kkolinko [Wed, 19 May 2010 03:44:51 +0000 (03:44 +0000)]
re-add all-in-one testcase,
in case if it matters for the failure that was observed by Gump

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

15 years agoAdd missing keyword
markt [Tue, 18 May 2010 21:20:50 +0000 (21:20 +0000)]
Add missing keyword

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

15 years agoMake list of user roles immutable
markt [Tue, 18 May 2010 19:42:06 +0000 (19:42 +0000)]
Make list of user roles immutable
Modify a copy in getRoles()

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

15 years agoOnly redirect stdout
markt [Tue, 18 May 2010 19:22:50 +0000 (19:22 +0000)]
Only redirect stdout

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

15 years agoFix an Eclipse warning
markt [Tue, 18 May 2010 18:51:47 +0000 (18:51 +0000)]
Fix an Eclipse warning

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

15 years agoDocument recompileOnFail
markt [Tue, 18 May 2010 18:33:24 +0000 (18:33 +0000)]
Document recompileOnFail

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

15 years agoClear results of SCI scan on reload
markt [Tue, 18 May 2010 16:04:45 +0000 (16:04 +0000)]
Clear results of SCI scan on reload

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

15 years agoOnly register the MapperListener once per component and remove it as soon as it is...
markt [Tue, 18 May 2010 15:58:58 +0000 (15:58 +0000)]
Only register the MapperListener once per component and remove it as soon as it is no longer required.

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

15 years agoRe-factor test to get a clearer idea of why Gump is failing
markt [Tue, 18 May 2010 13:35:35 +0000 (13:35 +0000)]
Re-factor test to get a clearer idea of why Gump is failing

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

15 years agoDo not abort testing after the first failure,
kkolinko [Tue, 18 May 2010 01:07:10 +0000 (01:07 +0000)]
Do not abort testing after the first failure,
but report about existence of failures after all the tests were run.

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

15 years agoFix tests for a pure Ant run
markt [Mon, 17 May 2010 20:20:42 +0000 (20:20 +0000)]
Fix tests for a pure Ant run

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

15 years agoFix Eclipse warnings.
markt [Mon, 17 May 2010 17:45:53 +0000 (17:45 +0000)]
Fix Eclipse warnings.
Reduce line length.

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

15 years agoSimplify test
markt [Mon, 17 May 2010 17:41:30 +0000 (17:41 +0000)]
Simplify test

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

15 years agoFix Eclipse warning in webapps
markt [Mon, 17 May 2010 17:38:35 +0000 (17:38 +0000)]
Fix Eclipse warning in webapps

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

15 years agoReturn version to 7.0.0-dev
markt [Mon, 17 May 2010 17:27:38 +0000 (17:27 +0000)]
Return version to 7.0.0-dev

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

15 years agoPrepare for 7.0.0-RC2
markt [Mon, 17 May 2010 17:25:35 +0000 (17:25 +0000)]
Prepare for 7.0.0-RC2

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

15 years agoDon't recommend a version that hasn't been released
markt [Mon, 17 May 2010 17:24:18 +0000 (17:24 +0000)]
Don't recommend a version that hasn't been released

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

15 years agoFix a bug in ByteChunk.indexOf(String, ...)
kkolinko [Mon, 17 May 2010 16:28:44 +0000 (16:28 +0000)]
Fix a bug in ByteChunk.indexOf(String, ...)

The problem is that the method could not find a string which length is 1,
as the only successful exit from the method was from inside the loop that
checks the second and subsequent characters.

I added the testcase for this in r945230.
In the test the bc.indexOf("o", 0, 1, 5) call returned -1, instead of 7.

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

15 years agoTests for ByteChunk indexOf/find* methods.
kkolinko [Mon, 17 May 2010 16:24:43 +0000 (16:24 +0000)]
Tests for ByteChunk indexOf/find* methods.

It caught a bug in implementation of ByteChunk.indexOf(String, ...) when searching for a single-character string. I will commit a fix soon.

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

15 years agoFix some Eclipse warnings
markt [Mon, 17 May 2010 13:56:16 +0000 (13:56 +0000)]
Fix some Eclipse warnings

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

15 years agoRemove the dependency on MBean notifications for the mapper
markt [Mon, 17 May 2010 13:55:29 +0000 (13:55 +0000)]
Remove the dependency on MBean notifications for the mapper
Unit tests pass.
Fixes an issue with the TCK and welcome files.

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

15 years agocleanup code added in r945074
kkolinko [Mon, 17 May 2010 13:32:08 +0000 (13:32 +0000)]
cleanup code added in r945074

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

15 years agoMore clean-up:
markt [Mon, 17 May 2010 11:33:01 +0000 (11:33 +0000)]
More clean-up:
- findCharXXX to findByteXXX
- whitespace
- make code consistent where possible

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

15 years agoWrap debug message is usual tyest
markt [Mon, 17 May 2010 10:47:50 +0000 (10:47 +0000)]
Wrap debug message is usual tyest

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