svn commit: r732694 - in /tiles/framework/trunk: tiles-core/src/main/java/org/apache/tiles/evaluator/el/ tiles-core/src/test/java/org/apache/tiles/evaluator/el/ tiles-test/src/main/java/org/apache/tiles/test/factory/

[ap...@apache.org]

Author: apetrelli
Date: Thu Jan  8 04:49:08 2009
New Revision: 732694

URL: http://svn.apache.org/viewvc?rev=732694&view=rev
Log:
TILES-347
Added BeanELResolver.

Modified:
    tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java
    tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/el/ELAttributeEvaluatorTest.java
    tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java

Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java?rev=732694&r1=732693&r2=732694&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java Thu Jan  8 04:49:08 2009
@@ -23,6 +23,7 @@
 import java.util.Map;
 
 import javax.el.ArrayELResolver;
+import javax.el.BeanELResolver;
 import javax.el.CompositeELResolver;
 import javax.el.ELResolver;
 import javax.el.ExpressionFactory;
@@ -117,6 +118,7 @@
                 add(new ListELResolver(false));
                 add(new MapELResolver(false));
                 add(new ResourceBundleELResolver());
+                add(new BeanELResolver(false));
             }
         };
     }

Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/el/ELAttributeEvaluatorTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/el/ELAttributeEvaluatorTest.java?rev=732694&r1=732693&r2=732694&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/el/ELAttributeEvaluatorTest.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/el/ELAttributeEvaluatorTest.java Thu Jan  8 04:49:08 2009
@@ -57,6 +57,7 @@
         requestScope.put("object1", "value");
         sessionScope.put("object2", new Integer(1));
         applicationScope.put("object3", new Float(2.0));
+        requestScope.put("paulaBean", new PaulaBean());
         request = EasyMock.createMock(TilesRequestContext.class);
         EasyMock.expect(request.getRequestScope()).andReturn(requestScope)
                 .anyTimes();
@@ -99,6 +100,9 @@
         attribute.setValue("${object3}");
         assertEquals("The value is not correct", new Float(2.0), evaluator
                 .evaluate(attribute, request));
+        attribute.setValue("${paulaBean.paula}");
+        assertEquals("The value is not correct", "Brillant", evaluator
+                .evaluate(attribute, request));
         attribute.setValue("String literal");
         assertEquals("The value is not correct", "String literal", evaluator
                 .evaluate(attribute, request));
@@ -130,8 +134,33 @@
         expression = "${object3}";
         assertEquals("The value is not correct", new Float(2.0), evaluator
                 .evaluate(expression, request));
+        expression = "${paulaBean.paula}";
+        assertEquals("The value is not correct", "Brillant", evaluator
+                .evaluate(expression, request));
         expression = "String literal";
         assertEquals("The value is not correct", expression, evaluator
                 .evaluate(expression, request));
     }
+
+    /**
+     * This is The Brillant Paula Bean (sic) just like it was posted to:
+     * http://thedailywtf.com/Articles/The_Brillant_Paula_Bean.aspx
+     * I hope that there is no copyright on it.
+     */
+    public static class PaulaBean {
+
+        /**
+         * Paula is brillant, really.
+         */
+        private String paula = "Brillant";
+
+        /**
+         * Returns brillant.
+         *
+         * @return "Brillant".
+         */
+        public String getPaula() {
+            return paula;
+        }
+    }
 }

Modified: tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java?rev=732694&r1=732693&r2=732694&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java (original)
+++ tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java Thu Jan  8 04:49:08 2009
@@ -27,6 +27,7 @@
 import java.util.Set;
 
 import javax.el.ArrayELResolver;
+import javax.el.BeanELResolver;
 import javax.el.CompositeELResolver;
 import javax.el.ELResolver;
 import javax.el.ListELResolver;
@@ -103,6 +104,7 @@
                 add(new ListELResolver(false));
                 add(new MapELResolver(false));
                 add(new ResourceBundleELResolver());
+                add(new BeanELResolver(false));
             }
         };
         evaluator.setResolver(elResolver);