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 2009/06/23 17:52:09 UTC
svn commit: r787736 - in /tiles/framework/trunk/tiles-velocity/src:
main/java/org/apache/tiles/velocity/renderer/
main/java/org/apache/tiles/velocity/template/
test/java/org/apache/tiles/velocity/template/
Author: apetrelli
Date: Tue Jun 23 15:52:08 2009
New Revision: 787736
URL: http://svn.apache.org/viewvc?rev=787736&view=rev
Log:
TILES-432
Polished tiles-velocity.
Added:
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/package.html (with props)
Modified:
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddAttributeVModel.java
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionVModel.java
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertTemplateVModel.java
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeVModel.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java
Modified: tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java?rev=787736&r1=787735&r2=787736&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java Tue Jun 23 15:52:08 2009
@@ -87,7 +87,7 @@
* @since 2.2.0
*/
public void commit() {
- velocityView = new VelocityView(new TilesApplicationContextJeeConfig());
+ velocityView = new VelocityView(new TilesApplicationContextJeeConfig());
}
/** {@inheritDoc} */
Added: tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/package.html
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/package.html?rev=787736&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/package.html (added)
+++ tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/package.html Tue Jun 23 15:52:08 2009
@@ -0,0 +1,30 @@
+<!--
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
+<html>
+<head>
+ <title>Tiles/Velocity renderer classes</title>
+</head>
+<body>
+Velocity-typed attributes can be rendered by using classes in this package.
+</body>
+</html>
\ No newline at end of file
Propchange: tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/package.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/package.html
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddAttributeVModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddAttributeVModel.java?rev=787736&r1=787735&r2=787736&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddAttributeVModel.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddAttributeVModel.java Tue Jun 23 15:52:08 2009
@@ -62,10 +62,9 @@
public Renderable execute(HttpServletRequest request,
HttpServletResponse response, Context velocityContext,
Map<String, Object> params) {
- model.execute(ServletUtil.getComposeStack(request), params
- .get("value"), (String) params.get("expression"), null,
- (String) params.get("role"), (String) params
- .get("type"));
+ model.execute(ServletUtil.getComposeStack(request),
+ params.get("value"), (String) params.get("expression"), null,
+ (String) params.get("role"), (String) params.get("type"));
return VelocityUtil.EMPTY_RENDERABLE;
}
Modified: tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionVModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionVModel.java?rev=787736&r1=787735&r2=787736&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionVModel.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionVModel.java Tue Jun 23 15:52:08 2009
@@ -40,8 +40,10 @@
* Wraps {@link InsertDefinitionModel} to be used in Velocity. For the list of
* parameters, see
* {@link InsertDefinitionModel#start(org.apache.tiles.TilesContainer, Object...)}
- * , {@link InsertDefinitionModel#end(org.apache.tiles.TilesContainer, String, String, String, String, String, String, Object...)} and
- * {@link InsertDefinitionModel#execute(org.apache.tiles.TilesContainer, String, String, String, String, String, String, Object...)}.
+ * , {@link InsertDefinitionModel#end(org.apache.tiles.TilesContainer,
+ * String, String, String, String, String, String, Object...)} and
+ * {@link InsertDefinitionModel#execute(org.apache.tiles.TilesContainer,
+ * String, String, String, String, String, String, Object...)}.
*
* @version $Rev$ $Date$
* @since 2.2.0
Modified: tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertTemplateVModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertTemplateVModel.java?rev=787736&r1=787735&r2=787736&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertTemplateVModel.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertTemplateVModel.java Tue Jun 23 15:52:08 2009
@@ -40,8 +40,10 @@
* Wraps {@link InsertTemplateModel} to be used in Velocity. For the list of
* parameters, see
* {@link InsertTemplateModel#start(org.apache.tiles.TilesContainer, Object...)}
- * , {@link InsertTemplateModel#end(org.apache.tiles.TilesContainer, String, String, String, String, String, Object...)} and
- * {@link InsertTemplateModel#execute(org.apache.tiles.TilesContainer, String, String, String, String, String, Object...)}.
+ * , {@link InsertTemplateModel#end(org.apache.tiles.TilesContainer,
+ * String, String, String, String, String, Object...)} and
+ * {@link InsertTemplateModel#execute(org.apache.tiles.TilesContainer,
+ * String, String, String, String, String, Object...)}.
*
* @version $Rev$ $Date$
* @since 2.2.0
@@ -82,9 +84,10 @@
model.execute(ServletUtil.getCurrentContainer(request,
servletContext), (String) params.get("template"),
(String) params.get("templateType"), (String) params
- .get("templateExpression"), (String) params
- .get("role"), (String) params.get("preparer"),
- velocityContext, request, response, writer);
+ .get("templateExpression"), (String) params.get("role"),
+ (String) params
+ .get("preparer"), velocityContext, request, response,
+ writer);
return true;
}
};
@@ -102,9 +105,10 @@
model.end(ServletUtil.getCurrentContainer(request,
servletContext), (String) params.get("template"),
(String) params.get("templateType"), (String) params
- .get("templateExpression"), (String) params
- .get("role"), (String) params.get("preparer"),
- velocityContext, request, response, writer);
+ .get("templateExpression"), (String) params.get("role"),
+ (String) params
+ .get("preparer"), velocityContext, request, response,
+ writer);
return true;
}
};
Modified: tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeVModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeVModel.java?rev=787736&r1=787735&r2=787736&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeVModel.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeVModel.java Tue Jun 23 15:52:08 2009
@@ -74,12 +74,11 @@
public Renderable execute(HttpServletRequest request,
HttpServletResponse response, Context velocityContext,
Map<String, Object> params) {
- model.execute(ServletUtil.getCurrentContainer(request,
- servletContext), ServletUtil.getComposeStack(request),
- (String) params.get("name"), params.get("value"),
- (String) params.get("expression"), null,
- (String) params.get("role"), (String) params
- .get("type"), VelocityUtil.toSimpleBoolean(
+ model.execute(ServletUtil.getCurrentContainer(request, servletContext),
+ ServletUtil.getComposeStack(request), (String) params
+ .get("name"), params.get("value"), (String) params
+ .get("expression"), null, (String) params.get("role"),
+ (String) params.get("type"), VelocityUtil.toSimpleBoolean(
(Boolean) params.get("cascade"), false),
velocityContext, request, response);
@@ -91,10 +90,12 @@
Context velocityContext) {
Map<String, Object> params = VelocityUtil.getParameterStack(
velocityContext).pop();
- model.end(ServletUtil.getCurrentContainer(request, servletContext), ServletUtil.getComposeStack(request),
- (String) params.get("name"), params.get("value"),
- (String) params.get("expression"), null, (String) params.get("role"),
- (String) params.get("type"), VelocityUtil.toSimpleBoolean((Boolean) params.get("cascade"), false),
+ model.end(ServletUtil.getCurrentContainer(request, servletContext),
+ ServletUtil.getComposeStack(request), (String) params
+ .get("name"), params.get("value"), (String) params
+ .get("expression"), null, (String) params.get("role"),
+ (String) params.get("type"), VelocityUtil.toSimpleBoolean(
+ (Boolean) params.get("cascade"), false),
velocityContext, request, response);
return VelocityUtil.EMPTY_RENDERABLE;
}
Modified: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java?rev=787736&r1=787735&r2=787736&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java Tue Jun 23 15:52:08 2009
@@ -133,7 +133,8 @@
expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME))
.andReturn(composeStack);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(parameterMapStack);
- tModel.end(composeStack, "myValue", "myExpression", null, "myRole", "myType");
+ tModel.end(composeStack, "myValue", "myExpression",
+ null, "myRole", "myType");
replay(tModel, request, response, velocityContext);
assertEquals(VelocityUtil.EMPTY_RENDERABLE, model.end(request, response, velocityContext));
Modified: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java?rev=787736&r1=787735&r2=787736&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java Tue Jun 23 15:52:08 2009
@@ -153,8 +153,8 @@
expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack);
tModel.end(container, "myTemplate", "myTemplateType",
- "myTemplateExpression", "myRole", "myPreparer",
- velocityContext, request, response, writer);
+ "myTemplateExpression", "myRole",
+ "myPreparer", velocityContext, request, response, writer);
replay(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter);
initializeModel();
Modified: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java?rev=787736&r1=787735&r2=787736&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java Tue Jun 23 15:52:08 2009
@@ -91,7 +91,8 @@
expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME))
.andReturn(composeStack);
- tModel.execute(container, composeStack, "myName", "myValue", "myExpression", null, "myRole", "myType",
+ tModel.execute(container, composeStack, "myName", "myValue",
+ "myExpression", null, "myRole", "myType",
false, velocityContext, request, response);
replay(tModel, container, servletContext, request, response, velocityContext);
@@ -148,8 +149,8 @@
.andReturn(composeStack);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(parameterMapStack);
tModel.end(container, composeStack, "myName", "myValue",
- "myExpression", null, "myRole", "myType", false,
- velocityContext, request, response);
+ "myExpression", null, "myRole", "myType",
+ false, velocityContext, request, response);
replay(tModel, container, servletContext, request, response, velocityContext);
initializeModel();
Modified: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java?rev=787736&r1=787735&r2=787736&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java Tue Jun 23 15:52:08 2009
@@ -1,6 +1,24 @@
-/**
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
+
package org.apache.tiles.velocity.template;
import static org.junit.Assert.*;
@@ -15,6 +33,7 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.AttributeContext;
+import org.apache.tiles.Expression;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.velocity.context.Context;
@@ -24,7 +43,7 @@
import org.junit.Test;
/**
- * TODO
+ * Tests {@link VelocityStyleTilesTool}.
*
* @version $Rev$ $Date$
* @since 2.2.0
@@ -101,16 +120,19 @@
Attribute attribute = tool.createAttribute();
assertNull(attribute.getValue());
assertNull(attribute.getRenderer());
- assertNull(attribute.getExpression());
+ assertNull(attribute.getExpressionObject());
verify(velocityContext, request, response, servletContext);
}
/**
- * Test method for {@link org.apache.tiles.velocity.template.VelocityStyleTilesTool#cloneAttribute(org.apache.tiles.Attribute)}.
+ * Test method for {@link org.apache.tiles.velocity.template.VelocityStyleTilesTool
+ * #cloneAttribute(org.apache.tiles.Attribute)}.
*/
@Test
public void testCloneAttribute() {
- Attribute attribute = new Attribute("myValue", "myExpression", "myRole", "myRendererName");
+ Attribute attribute = new Attribute("myValue", Expression
+ .createExpression("myExpression", null), "myRole",
+ "myRendererName");
replay(velocityContext, request, response, servletContext);
initializeTool();
@@ -119,7 +141,8 @@
}
/**
- * Test method for {@link org.apache.tiles.velocity.template.VelocityStyleTilesTool#createTemplateAttribute(java.lang.String)}.
+ * Test method for {@link org.apache.tiles.velocity.template.VelocityStyleTilesTool
+ * #createTemplateAttribute(java.lang.String)}.
*/
@Test
public void testCreateTemplateAttribute() {
@@ -132,7 +155,8 @@
}
/**
- * Test method for {@link org.apache.tiles.velocity.template.VelocityStyleTilesTool#renderAttribute(org.apache.tiles.Attribute)}.
+ * Test method for {@link org.apache.tiles.velocity.template.VelocityStyleTilesTool
+ * #renderAttribute(org.apache.tiles.Attribute)}.
* @throws IOException If something goes wrong.
*/
@Test
@@ -154,7 +178,8 @@
}
/**
- * Test method for {@link org.apache.tiles.velocity.template.VelocityStyleTilesTool#renderDefinition(java.lang.String)}.
+ * Test method for {@link org.apache.tiles.velocity.template.VelocityStyleTilesTool
+ * #renderDefinition(java.lang.String)}.
* @throws IOException If something goes wrong.
*/
@Test
@@ -252,7 +277,8 @@
}
/**
- * Test method for {@link org.apache.tiles.velocity.template.VelocityStyleTilesTool#setCurrentContainer(java.lang.String)}.
+ * Test method for {@link org.apache.tiles.velocity.template.VelocityStyleTilesTool
+ * #setCurrentContainer(java.lang.String)}.
*/
@Test
public void testSetCurrentContainer() {