svn commit: r961947 - in /tomcat/trunk/test: org/apache/el/TestELInJsp.java org/apache/el/TesterFunctions.java webapp-3.0/WEB-INF/bugs.tld webapp-3.0/

Author: markt
Date: Thu May 27 00:43:54 2010
New Revision: 948644

URL: http://svn.apache.org/viewvc?rev=948644&view=rev
Log:
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.

Modified:
    tomcat/trunk/test/org/apache/el/TestELInJsp.java
    tomcat/trunk/test/webapp-3.0/WEB-INF/tags/echo-deferred.tag
    tomcat/trunk/test/webapp-3.0/el-method.jsp

Modified: tomcat/trunk/test/org/apache/el/TestELInJsp.java
URL:
http://svn.apache.org/viewvc/tomcat/t...644&view=diff

Author: markt
Date: Wed Jul 14 22:11:30 2010
New Revision: 964219

URL: http://svn.apache.org/viewvc?rev=964219&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48998
Add the ExpiresFilter, a port of mod_expires
Patch provided by Cyrille Le Clerc

Added:
    tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java  
(with props)
    tomcat/trunk/test/org/apache/catalina/filters/TestExpiresFilter.java  
(with props)
Modified:
    tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties
    tomcat/trunk/webapps/docs/changelog.xml
    tomcat/trunk/webapps/docs/config/filter.xml

Added: tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/t...219&view=auto

Modified: tomcat/trunk/webapps/docs/config/filter.xml
URL:
http://svn.apache.org/viewvc/tomcat/t...219&view=diff

Author: markt
Date: Sun Jul  4 15:44:45 2010
New Revision: 960348

URL: http://svn.apache.org/viewvc?rev=960348&view=rev
Log:
Revert r958362, r960083, r958406, r960069. r958362 broke the TCK tests and
the other commits were sufficiently tightly coupled to it that it was
easier to revert all of them than try to unpick them.

Removed:
    tomcat/trunk/test/org/apache/catalina/core/TestAsyncListener.java
Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/t...348&view=diff

Author: pero
Date: Sun Jun 27 11:02:10 2010
New Revision: 958362

URL: http://svn.apache.org/viewvc?rev=958362&view=rev
Log:
Start JioEndpoint timeout thread, to handle timeout a AsyncListener.

Added:
    tomcat/trunk/test/org/apache/catalina/core/TestAsyncListener.java  
(with props)
Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/t...362&view=diff

I am highly interessed why does my fix is wrong :-)

Is my fix really wrong, you can revert my checkin. Today I present the  
new Tomcat 7 release at Java User Forum Stuttgart (Germany).

Many thanks,

Peter

Am 01.07.2010 um 08:20 schrieb jean-frederic clere:

 On 06/30/2010 09:15 PM, Peter Roßbach wrote:
> Hi Jean Frederic!
>
> Why does my change break the TCK? Is the current 12/09 servlet
spec  
> not
> correct? How must the async timeout functionalty work?
>
> Can you comment my other findings, please?

 I will have a look today to the stuff.

 Cheers

 Jean-Frederic

Author: markt
Date: Fri Jul 23 14:30:26 2010
New Revision: 967107

URL: http://svn.apache.org/viewvc?rev=967107&view=rev
Log:
Handle the edge cases where resources packaged in JARs have names that
start with a single quote character or a double quote character.

Added:
    tomcat/trunk/test/org/apache/naming/resources/TestWarDirContext.java  
(with props)
    tomcat/trunk/test/webapp-3.0-fragments/'singlequote2.jsp   (with
props)
    tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/classes/
    tomcat/trunk/test/webapp-3.0-fragments/warDirContext.jsp   (with
props)
Modified:
    tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java
    tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/lib/resources.jar
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/t...107&view=diff

Author: markt
Date: Sat Jul 10 21:13:23 2010
New Revision: 962917

URL: http://svn.apache.org/viewvc?rev=962917&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49478
Add support for user specified character sets to the
AddDefaultCharsetFilter. Based on a patch by Felix Schumacher.

Added:
   
tomcat/trunk/test/org/apache/catalina/filters/TestAddCharSetFilter.java  
(with props)
Modified:
   
tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
    tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties
    tomcat/trunk/webapps/docs/changelog.xml
    tomcat/trunk/webapps/docs/config/filter.xml

Modified:
tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/t...917&view=diff

Author: markt
Date: Sun May 23 11:32:12 2010
New Revision: 947397

URL: http://svn.apache.org/viewvc?rev=947397&view=rev
Log:
Don't add HostConfig as a listener twice. It breaks the Manager app and
probably other stuff too.

Modified:
    tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
    tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
URL:
http://svn.apache.org/viewvc/tomcat/t...397&view=diff

Author: pero
Date: Sat Jul  3 23:02:46 2010
New Revision: 960284

URL: http://svn.apache.org/viewvc?rev=960284&view=rev
Log:
Fix NPE and add small test case to check VirtualWebappLoader.

Added:
   
tomcat/trunk/test/org/apache/catalina/loader/TestVirtualWebappLoader.java  
(with props)
Modified:
    tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java

Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/t...284&view=diff

Author: markt
Date: Wed Jul 21 16:37:58 2010
New Revision: 966304

URL: http://svn.apache.org/viewvc?rev=966304&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49617
Correct the ExpiresFilter documentation after changes to the submitted
patch

Modified:
    tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
    tomcat/trunk/test/org/apache/catalina/filters/TestExpiresFilter.java
    tomcat/trunk/webapps/docs/changelog.xml
    tomcat/trunk/webapps/docs/config/filter.xml

Modified: tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/t...304&view=diff

Author: pero
Date: Sat Jul  3 22:48:16 2010
New Revision: 960283

URL: http://svn.apache.org/viewvc?rev=960283&view=rev
Log:
Fix Bug 49528 - HttpServletRequest.isAsyncStarted() returns false when a
Runnable is started
Add isDebugEnabled statements.

Todo: Why we doesn't start directly a container thread with
asyncContext.start()?
Currently we start user runnable as an internal forward.

Added:
    tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java  
(with props)
Modified:
    tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/t...283&view=diff

Author: markt
Date: Sun Jul 11 16:37:32 2010
New Revision: 963106

URL: http://svn.apache.org/viewvc?rev=963106&view=rev
Log:
Make the fix for bug 49555 more robust

Modified:
    tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
    tomcat/trunk/test/org/apache/el/TestELInJsp.java
    tomcat/trunk/test/org/apache/el/TesterFunctions.java
    tomcat/trunk/test/webapp-3.0/WEB-INF/bugs.tld

Modified:
tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
URL:
http://svn.apache.org/viewvc/tomcat/t...106&view=diff

Author: markt
Date: Mon Jul  5 21:44:29 2010
New Revision: 960711

URL: http://svn.apache.org/viewvc?rev=960711&view=rev
Log:
Test case for https://issues.apache.org/bugzilla/show_bug.cgi?id=49217

Added:
    tomcat/trunk/test/org/apache/el/parser/TesterBeanA.java   (with props)
Modified:
    tomcat/trunk/test/org/apache/el/parser/TestELParser.java

Modified: tomcat/trunk/test/org/apache/el/parser/TestELParser.java
URL:
http://svn.apache.org/viewvc/tomcat/t...711&view=diff

Author: markt
Date: Sun Jul  4 15:38:40 2010
New Revision: 960347

URL: http://svn.apache.org/viewvc?rev=960347&view=rev
Log:
Revert r960283, r960316, r960318. r960283 broke the spec and the other
commits were sufficiently tightly coupled to it that it was easier to
revert all of them than try to unpick them.

Removed:
    tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
Modified:
    tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/t...347&view=diff

Author: markt
Date: Thu Jul  1 09:35:23 2010
New Revision: 959568

URL: http://svn.apache.org/viewvc?rev=959568&view=rev
Log:
Improve handling for method invocation in EL, in particular the method
used to identify the method to invoke. This reverts r953440 and implements
a more comprehensive solution.
The method identification code attempts to mimic how the Java compiler
works. In a few cases it finds methods where the Java complier reports an
ambiguous method. The EL spec is sufficiently vague on method selection
that I don't think this will be an issue.

Added:
    tomcat/trunk/test/org/apache/el/TesterBeanAA.java   (with props)
    tomcat/trunk/test/org/apache/el/TesterBeanAAA.java   (with props)
    tomcat/trunk/test/org/apache/el/TesterBeanBBB.java   (with props)
    tomcat/trunk/test/org/apache/el/TesterBeanC.java   (with props)
Modified:
    tomcat/trunk/java/org/apache/el/ExpressionFactoryImpl.java
    tomcat/trunk/java/org/apache/el/Messages.properties
    tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java
    tomcat/trunk/java/org/apache/el/parser/AstValue.java
    tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java
    tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java
    tomcat/trunk/test/org/apache/el/TesterBeanA.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/el/ExpressionFactoryImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/t...568&view=diff

Author: markt
Date: Fri Jul  2 21:10:35 2010
New Revision: 960103

URL: http://svn.apache.org/viewvc?rev=960103&view=rev
Log:
Fix FindBugs niggle

Modified:
    tomcat/trunk/test/org/apache/tomcat/util/http/TestBug49158.java

Modified: tomcat/trunk/test/org/apache/tomcat/util/http/TestBug49158.java
URL:
http://svn.apache.org/viewvc/tomcat/t...103&view=diff

Author: markt
Date: Mon May 31 17:29:17 2010
New Revision: 949808

URL: http://svn.apache.org/viewvc?rev=949808&view=rev
Log:
Test case for https://issues.apache.org/bugzilla/show_bug.cgi?id=49345
Fix to follow

Modified:
    tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java

Modified: tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/t...808&view=diff

Author: markt
Date: Mon May 31 18:20:39 2010
New Revision: 949825

URL: http://svn.apache.org/viewvc?rev=949825&view=rev
Log:
Add some checks that nulls are handled correctly.

Modified:
    tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java

Modified: tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/t...825&view=diff

Author: markt
Date: Wed Jun 30 08:46:50 2010
New Revision: 959233

URL: http://svn.apache.org/viewvc?rev=959233&view=rev
Log:
Re-factor to make upcoming changes easier to understand

Added:
    tomcat/trunk/test/org/apache/el/TesterBeanBB.java
      - copied, changed from r959061,
tomcat/trunk/test/org/apache/el/TesterBeanC.java
Removed:
    tomcat/trunk/test/org/apache/el/TesterBeanC.java
Modified:
    tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java

Modified: tomcat/trunk/test/org/apache/el/TestMethodExpressionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/t...233&view=diff