You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2010/01/29 17:52:01 UTC
svn commit: r904555 - in /tiles/sandbox/trunk/tiles3: ./
src/site/apt/tutorial/integration/ tiles-test-pom/tiles-test/
tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/
tiles-velocity/src/main/java/org/apache/tiles/velocity/template/
tiles-velocity/sr...
Author: apetrelli
Date: Fri Jan 29 16:52:01 2010
New Revision: 904555
URL: http://svn.apache.org/viewvc?rev=904555&view=rev
Log:
TILES-491
Merged from trunk to sandboxed Tiles 3.
Modified VelocityStyleTilesTool to make the API simpler.
Modified:
tiles/sandbox/trunk/tiles3/ (props changed)
tiles/sandbox/trunk/tiles3/src/site/apt/tutorial/integration/velocity.apt
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/ (props changed)
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml (props changed)
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java
Propchange: tiles/sandbox/trunk/tiles3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 29 16:52:01 2010
@@ -1 +1 @@
-/tiles/framework/trunk:829356,836356,880940,880948,887758,900938-902966
+/tiles/framework/trunk:829356,836356,880940,880948,887758,900938-902966,904552
Modified: tiles/sandbox/trunk/tiles3/src/site/apt/tutorial/integration/velocity.apt
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/src/site/apt/tutorial/integration/velocity.apt?rev=904555&r1=904554&r2=904555&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/src/site/apt/tutorial/integration/velocity.apt (original)
+++ tiles/sandbox/trunk/tiles3/src/site/apt/tutorial/integration/velocity.apt Fri Jan 29 16:52:01 2010
@@ -124,7 +124,7 @@
$attribute.setRenderer("velocity")
$attributeContext.putAttribute("body", $attribute})
-$tilesAlt.renderAttribute($templateAttribute)
+$tilesAlt.render($templateAttribute)
$tilesAlt.endAttributeContext()
----------------------------------
Propchange: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 29 16:52:01 2010
@@ -1,3 +1,3 @@
-/tiles/framework/trunk/tiles-test-pom/tiles-test:829356,836356,880940,880948,887758,900938-902966
+/tiles/framework/trunk/tiles-test-pom/tiles-test:829356,836356,880940,880948,887758,900938-902966,904552
/tiles/sandbox/trunk/tiles-test:740289
/tiles/sandbox/trunk/tiles-test-sandbox:740290-745038,747727-751891
Propchange: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 29 16:52:01 2010
@@ -1 +1 @@
-/tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml:829356,836356,880940,880948,887758,900938-902966
+/tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml:829356,836356,880940,880948,887758,900938-902966,904552
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java?rev=904555&r1=904554&r2=904555&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java Fri Jan 29 16:52:01 2010
@@ -51,7 +51,7 @@
* @return The Attribute.
* @since 2.2.0
*/
- public Attribute getAttribute(String key) {
+ public Attribute get(String key) {
Request velocityRequest = createVelocityRequest(getServletContext(),
null);
TilesContainer container = TilesAccess.getCurrentContainer(velocityRequest);
@@ -78,7 +78,7 @@
* @return The copied attribute.
* @since 2.2.0
*/
- public Attribute cloneAttribute(Attribute attribute) {
+ public Attribute clone(Attribute attribute) {
return new Attribute(attribute);
}
@@ -100,7 +100,7 @@
* @return The renderable object, ready to be rendered.
* @since 2.2.0
*/
- public Renderable renderAttribute(final Attribute attribute) {
+ public Renderable render(final Attribute attribute) {
return new AbstractDefaultToStringRenderable(getVelocityContext(),
null, getResponse(), getRequest()) {
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java?rev=904555&r1=904554&r2=904555&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java Fri Jan 29 16:52:01 2010
@@ -102,7 +102,7 @@
}
/**
- * Test method for {@link org.apache.tiles.velocity.template.VelocityStyleTilesTool#getAttribute(java.lang.String)}.
+ * Test method for {@link org.apache.tiles.velocity.template.VelocityStyleTilesTool#get(java.lang.String)}.
*/
@Test
public void testGetAttribute() {
@@ -128,7 +128,7 @@
replay(velocityContext, request, response, servletContext, container, attributeContext, applicationContext, resolver);
initializeTool();
- assertEquals(attribute, tool.getAttribute("myAttribute"));
+ assertEquals(attribute, tool.get("myAttribute"));
verify(velocityContext, request, response, servletContext, container, attributeContext, applicationContext, resolver);
}
@@ -148,7 +148,7 @@
/**
* Test method for {@link org.apache.tiles.velocity.template.VelocityStyleTilesTool
- * #cloneAttribute(org.apache.tiles.Attribute)}.
+ * #clone(org.apache.tiles.Attribute)}.
*/
@Test
public void testCloneAttribute() {
@@ -158,7 +158,7 @@
replay(velocityContext, request, response, servletContext);
initializeTool();
- assertEquals(attribute, tool.cloneAttribute(attribute));
+ assertEquals(attribute, tool.clone(attribute));
verify(velocityContext, request, response, servletContext);
}
@@ -178,7 +178,7 @@
/**
* Test method for {@link org.apache.tiles.velocity.template.VelocityStyleTilesTool
- * #renderAttribute(org.apache.tiles.Attribute)}.
+ * #render(org.apache.tiles.Attribute)}.
* @throws IOException If something goes wrong.
*/
@Test
@@ -205,7 +205,7 @@
replay(velocityContext, request, response, servletContext, container,
internalContextAdapter, applicationContext, resolver);
initializeTool();
- Renderable renderable = tool.renderAttribute(attribute);
+ Renderable renderable = tool.render(attribute);
renderable.render(internalContextAdapter, writer);
verify(velocityContext, request, response, servletContext, container,
internalContextAdapter, applicationContext, resolver);