You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by mc...@apache.org on 2014/09/22 12:51:52 UTC
svn commit: r1626727 - in /tiles/framework/trunk: ./ tiles-template/
tiles-template/src/main/java/org/apache/tiles/template/
tiles-template/src/test/java/org/apache/tiles/template/
tiles-test-pom/tiles-test/ tiles-test-pom/tiles-test/src/main/webapp/ t...
Author: mck
Date: Mon Sep 22 10:51:52 2014
New Revision: 1626727
URL: http://svn.apache.org/r1626727
Log:
forward port changes from TILES_3_0_X branch
`svn merge -r1594481:1626663 ^/tiles/framework/branches/TILES_3_0_X .`
Added:
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/layout_expr.jsp
- copied unchanged from r1626663, tiles/framework/branches/TILES_3_0_X/tiles-test-pom/tiles-test/src/main/webapp/layout_expr.jsp
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinitionexpr.jsp
- copied unchanged from r1626663, tiles/framework/branches/TILES_3_0_X/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinitionexpr.jsp
tiles/framework/trunk/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionExprTest.html
- copied unchanged from r1626663, tiles/framework/branches/TILES_3_0_X/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionExprTest.html
Modified:
tiles/framework/trunk/ (props changed)
tiles/framework/trunk/pom.xml
tiles/framework/trunk/tiles-template/pom.xml
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java
tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java
tiles/framework/trunk/tiles-test-pom/tiles-test/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/index.jsp
tiles/framework/trunk/tiles-test-pom/tiles-test/src/test/selenium/TestSuite.html
Propchange: tiles/framework/trunk/
------------------------------------------------------------------------------
Merged /tiles/framework/branches/TILES_3_0_X:r1594482-1626663
Modified: tiles/framework/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/pom.xml?rev=1626727&r1=1626726&r2=1626727&view=diff
==============================================================================
--- tiles/framework/trunk/pom.xml (original)
+++ tiles/framework/trunk/pom.xml Mon Sep 22 10:51:52 2014
@@ -318,7 +318,7 @@
<tiles.osgi.private />
<tiles.manifestfile>target/osgi/MANIFEST.MF</tiles.manifestfile>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tiles.request.version>1.0.4</tiles.request.version>
+ <tiles.request.version>1.0.6</tiles.request.version>
<tiles.autotag.version>1.1.0</tiles.autotag.version>
</properties>
Modified: tiles/framework/trunk/tiles-template/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-template/pom.xml?rev=1626727&r1=1626726&r2=1626727&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-template/pom.xml (original)
+++ tiles/framework/trunk/tiles-template/pom.xml Mon Sep 22 10:51:52 2014
@@ -45,6 +45,7 @@
</goals>
<configuration>
<name>tiles</name>
+ <requestClass>org.apache.tiles.request.Request</requestClass>
</configuration>
</execution>
</executions>
Modified: tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java?rev=1626727&r1=1626726&r2=1626727&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java (original)
+++ tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java Mon Sep 22 10:51:52 2014
@@ -174,7 +174,10 @@ public class GetAsStringModel {
if (attribute == null && ignore) {
return;
}
- writer.write(attribute.getValue().toString());
+ Object value = container.evaluate(attribute, request);
+ if(value != null) {
+ writer.write(value.toString());
+ }
} catch (IOException e) {
if (!ignore) {
throw e;
Modified: tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java?rev=1626727&r1=1626726&r2=1626727&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java (original)
+++ tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java Mon Sep 22 10:51:52 2014
@@ -77,7 +77,7 @@ public class GetAsStringModelTest {
@Test
public void testExecute() throws IOException {
TilesContainer container = createMock(TilesContainer.class);
- Attribute attribute = new Attribute("myValue");
+ Attribute attribute = createMock(Attribute.class);
AttributeContext attributeContext = createMock(AttributeContext.class);
Request request = createMock(Request.class);
Writer writer = createMock(Writer.class);
@@ -96,6 +96,7 @@ public class GetAsStringModelTest {
expect(resolver.computeAttribute(container, attribute, "myName", "myRole", false, "myDefaultValue",
"myDefaultValueRole", "myDefaultValueType", request)).andReturn(attribute);
expect(container.startContext(request)).andReturn(attributeContext);
+ expect(container.evaluate(attribute, request)).andReturn("myValue");
writer.write("myValue");
container.endContext(request);
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test/
------------------------------------------------------------------------------
Merged /tiles/framework/branches/TILES_3_0_X/tiles-test-pom/tiles-test:r1594482-1626663
Modified: tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml?rev=1626727&r1=1626726&r2=1626727&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml (original)
+++ tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml Mon Sep 22 10:51:52 2014
@@ -47,6 +47,12 @@
<put-attribute name="body" value="/body.jsp"/>
</definition>
+ <definition name="test.definition.expr" template="/layout.jsp">
+ <put-attribute name="title" expression="This is the title."/>
+ <put-attribute name="header" value="/header.jsp"/>
+ <put-attribute name="body" value="/body.jsp"/>
+ </definition>
+
<definition name="test.definition.ignore" template="/layout_ignore.jsp">
<put-attribute name="title" value="This is the title."/>
<put-attribute name="body" value="/body.jsp"/>
@@ -66,6 +72,7 @@
<definition name="test.definition.exception" template="/layout.jsp">
<put-attribute name="title" value="This is the title."/>
+ <put-attribute name="title" value="This is the title."/>
<put-attribute name="header" value="/exception.jsp"/>
<put-attribute name="body" value="/body.jsp"/>
</definition>
Modified: tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/index.jsp?rev=1626727&r1=1626726&r2=1626727&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/index.jsp (original)
+++ tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/index.jsp Mon Sep 22 10:51:52 2014
@@ -36,6 +36,7 @@
<h3>Standard Render/Attribute Tests</h3>
<a href="testinsertdefinition.jsp">Test Insert Configured Definition</a><br/>
+ <a href="testinsertdefinitionexpr.jsp">Test Insert Configured Definition With Expression</a><br/>
<a href="testinsertdefinition_ignore.jsp">Test Insert Configured Definition with Ignore</a><br/>
<a href="testinsertdefinition_flush.jsp">Test Insert Configured Definition with Flush</a><br/>
<a href="testinsertdefinition_preparer.jsp">Test Insert Configured Definition with Preparer</a><br/>
Modified: tiles/framework/trunk/tiles-test-pom/tiles-test/src/test/selenium/TestSuite.html
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test/src/test/selenium/TestSuite.html?rev=1626727&r1=1626726&r2=1626727&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test-pom/tiles-test/src/test/selenium/TestSuite.html (original)
+++ tiles/framework/trunk/tiles-test-pom/tiles-test/src/test/selenium/TestSuite.html Mon Sep 22 10:51:52 2014
@@ -34,6 +34,9 @@
<td><a href="ConfiguredDefinitionTest.html">Configured Definition Test</a></td>
</tr>
<tr>
+ <td><a href="ConfiguredDefinitionExprTest.html">Configured Definition With Expression Test</a></td>
+ </tr>
+ <tr>
<td><a href="ConfiguredDefinitionIgnoreTest.html">Configured Definition with Ignore Test</a></td>
</tr>
<tr>