Re: svn commit: r1504148 - in /tomcat/trunk: java/org/apache/jasper/compiler/ java/org/apache/jasper/el/ java/org/apache/jasper/runtime/ test/javax/el/ test/org/apache/el/ test/org/apache/el/parser/ t

2013-08-28 Thread Mark Thomas
On 28/08/2013 13:00, Remy Maucherat wrote:
> On Wed, 2013-07-17 at 14:14 +, ma...@apache.org wrote:
>> Author: markt
>> Date: Wed Jul 17 14:14:28 2013
>> New Revision: 1504148
>>
>> URL: http://svn.apache.org/r1504148
>> Log:
>> Add the two new resolver types (stream and static) to Jasper in the correct 
>> order and modify JasperELResolver so the correct resolvers are skipped.
> 
>> -public static ELResolver getDefaultResolver() {
>> +public static ELResolver getDefaultResolver(ExpressionFactory factory) {
>>  if (Constants.IS_SECURITY_ENABLED) {
>>  CompositeELResolver defaultResolver = new CompositeELResolver();
>> -// TODO ExpressionFactory.getStreamELResolver()
>> -// TODO javax.el.StaticFieldResolver
>> +defaultResolver.add(factory.getStreamELResolver());
>> +defaultResolver.add(new StaticFieldELResolver());
>>  defaultResolver.add(new MapELResolver());
>>  defaultResolver.add(new ResourceBundleELResolver());
>>  defaultResolver.add(new ListELResolver());
> 
> I see one issue: in most cases (= no security manager), the static
> "cache" resolver instance is used, and it doesn't have the two new
> resolvers. The new stream EL resolver for the collections seems to be
> more difficult to use with the caching strategy as well, but it looks
> possible.
> 
> Ideas ?

I think I have fixed the immediate issue. Do you see any further
problems with the new code?

Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: svn commit: r1504148 - in /tomcat/trunk: java/org/apache/jasper/compiler/ java/org/apache/jasper/el/ java/org/apache/jasper/runtime/ test/javax/el/ test/org/apache/el/ test/org/apache/el/parser/ t

2013-08-28 Thread Remy Maucherat
On Wed, 2013-07-17 at 14:14 +, ma...@apache.org wrote:
> Author: markt
> Date: Wed Jul 17 14:14:28 2013
> New Revision: 1504148
> 
> URL: http://svn.apache.org/r1504148
> Log:
> Add the two new resolver types (stream and static) to Jasper in the correct 
> order and modify JasperELResolver so the correct resolvers are skipped.

> -public static ELResolver getDefaultResolver() {
> +public static ELResolver getDefaultResolver(ExpressionFactory factory) {
>  if (Constants.IS_SECURITY_ENABLED) {
>  CompositeELResolver defaultResolver = new CompositeELResolver();
> -// TODO ExpressionFactory.getStreamELResolver()
> -// TODO javax.el.StaticFieldResolver
> +defaultResolver.add(factory.getStreamELResolver());
> +defaultResolver.add(new StaticFieldELResolver());
>  defaultResolver.add(new MapELResolver());
>  defaultResolver.add(new ResourceBundleELResolver());
>  defaultResolver.add(new ListELResolver());

I see one issue: in most cases (= no security manager), the static
"cache" resolver instance is used, and it doesn't have the two new
resolvers. The new stream EL resolver for the collections seems to be
more difficult to use with the caching strategy as well, but it looks
possible.

Ideas ?

Rémy



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



RE: svn commit: r1504148 - in /tomcat/trunk: java/org/apache/jasper/compiler/ java/org/apache/jasper/el/ java/org/apache/jasper/runtime/ test/javax/el/ test/org/apache/el/ test/org/apache/el/parser/ t

2013-07-17 Thread Caldarale, Charles R
> From: Nick Williams [mailto:nicho...@nicholaswilliams.net] 
> Subject: Re: svn commit: r1504148

> I read "so the correct resolvers are skipped" as "so the resolvers 
> that should be skipped are skipped."

That interpretation makes much more sense.  I think the use of the word 
"correct" twice in the sentence to refer to completely different sets of 
resolvers creates the confusion.

 - Chuck


THIS COMMUNICATION MAY CONTAIN CONFIDENTIAL AND/OR OTHERWISE PROPRIETARY 
MATERIAL and is thus for use only by the intended recipient. If you received 
this in error, please contact the sender and delete the e-mail and its 
attachments from all computers.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: svn commit: r1504148 - in /tomcat/trunk: java/org/apache/jasper/compiler/ java/org/apache/jasper/el/ java/org/apache/jasper/runtime/ test/javax/el/ test/org/apache/el/ test/org/apache/el/parser/ t

2013-07-17 Thread Mark Thomas
On 17/07/2013 15:21, Caldarale, Charles R wrote:
>> From: ma...@apache.org [mailto:ma...@apache.org] Subject: svn
>> commit: r1504148
> 
>> URL: http://svn.apache.org/r1504148 Log: Add the two new resolver
>> types (stream and static) to Jasper in the correct order and modify
>> JasperELResolver so the correct resolvers are skipped.
> 
> Did you really want to say "so the correct resolvers are skipped"?
> Seems odd to be skipping the proper ones, or perhaps I just don't
> understand how this should work.

Yes. I was trying to say "Make sure we skip the resolvers that are meant
to be skipped." since the new resolvers were inserted the indexes of the
entries on the array have changed.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: svn commit: r1504148 - in /tomcat/trunk: java/org/apache/jasper/compiler/ java/org/apache/jasper/el/ java/org/apache/jasper/runtime/ test/javax/el/ test/org/apache/el/ test/org/apache/el/parser/ t

2013-07-17 Thread Nick Williams

On Jul 17, 2013, at 9:21 AM, Caldarale, Charles R wrote:

>> From: ma...@apache.org [mailto:ma...@apache.org] 
>> Subject: svn commit: r1504148
> 
>> URL: http://svn.apache.org/r1504148
>> Log:
>> Add the two new resolver types (stream and static) to Jasper in the correct 
>> order and modify JasperELResolver so the correct resolvers are skipped.
> 
> Did you really want to say "so the correct resolvers are skipped"?  Seems odd 
> to be skipping the proper ones, or perhaps I just don't understand how this 
> should work.
> 
> - Chuck

I read "so the correct resolvers are skipped" as "so the resolvers that should 
be skipped are skipped."

Nick
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



RE: svn commit: r1504148 - in /tomcat/trunk: java/org/apache/jasper/compiler/ java/org/apache/jasper/el/ java/org/apache/jasper/runtime/ test/javax/el/ test/org/apache/el/ test/org/apache/el/parser/ t

2013-07-17 Thread Caldarale, Charles R
> From: ma...@apache.org [mailto:ma...@apache.org] 
> Subject: svn commit: r1504148

> URL: http://svn.apache.org/r1504148
> Log:
> Add the two new resolver types (stream and static) to Jasper in the correct 
> order and modify JasperELResolver so the correct resolvers are skipped.

Did you really want to say "so the correct resolvers are skipped"?  Seems odd 
to be skipping the proper ones, or perhaps I just don't understand how this 
should work.

 - Chuck


THIS COMMUNICATION MAY CONTAIN CONFIDENTIAL AND/OR OTHERWISE PROPRIETARY 
MATERIAL and is thus for use only by the intended recipient. If you received 
this in error, please contact the sender and delete the e-mail and its 
attachments from all computers.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org