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/11/16 13:08:06 UTC
svn commit: r880722 - in /tiles/sandbox/trunk/tiles3:
tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/
tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/
tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ tiles-t...
Author: apetrelli
Date: Mon Nov 16 12:08:06 2009
New Revision: 880722
URL: http://svn.apache.org/viewvc?rev=880722&view=rev
Log:
TILESSB-14
Converted GetAsStringModel and InsertAttributeModel.
Modified:
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/GetAsStringFMModel.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertAttributeFMModel.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/GetAsStringFMModelTest.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertAttributeFMModelTest.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java
tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java
tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/InsertAttributeModelTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringVModel.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertAttributeVModel.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringVModelTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeVModelTest.java
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/GetAsStringFMModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/GetAsStringFMModel.java?rev=880722&r1=880721&r2=880722&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/GetAsStringFMModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/GetAsStringFMModel.java Mon Nov 16 12:08:06 2009
@@ -41,10 +41,10 @@
* Wraps {@link GetAsStringModel} to be used in FreeMarker. For the list of
* parameters, see
* {@link GetAsStringModel
- * #start(java.util.Stack, TilesContainer, boolean, String, String, Object, String, String, String,
- * Attribute, Request)}
+ * #start(TilesContainer, boolean, String, String, Object, String, String, String, Attribute,
+ * Request)}
* and
- * {@link GetAsStringModel#end(java.util.Stack, TilesContainer, java.io.Writer, boolean, Request)}
+ * {@link GetAsStringModel#end(TilesContainer, java.io.Writer, boolean, Request)}
* .
*
* @version $Rev$ $Date$
@@ -77,21 +77,21 @@
.createServletFreemarkerRequest(container
.getApplicationContext(), env);
model.start(
- FreeMarkerUtil.getComposeStack(env),
container,
FreeMarkerUtil.getAsBoolean(parms.get("ignore"), false),
FreeMarkerUtil.getAsString(parms.get("preparer")),
FreeMarkerUtil.getAsString(parms.get("role")),
FreeMarkerUtil.getAsObject(parms.get("defaultValue")),
FreeMarkerUtil.getAsString(parms
- .get("defaultValueRole")), FreeMarkerUtil
- .getAsString(parms.get("defaultValueType")),
- FreeMarkerUtil.getAsString(parms.get("name")),
+ .get("defaultValueRole")),
+ FreeMarkerUtil
+ .getAsString(parms.get("defaultValueType")), FreeMarkerUtil.getAsString(parms.get("name")),
(Attribute) FreeMarkerUtil.getAsObject(parms
- .get("value")), request);
+ .get("value")),
+ request);
FreeMarkerUtil.evaluateBody(body);
- model.end(FreeMarkerUtil.getComposeStack(env), container, env.getOut(),
- FreeMarkerUtil.getAsBoolean(parms.get("ignore"), false), request);
+ model.end(container, env.getOut(), FreeMarkerUtil.getAsBoolean(parms.get("ignore"), false),
+ request);
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertAttributeFMModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertAttributeFMModel.java?rev=880722&r1=880721&r2=880722&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertAttributeFMModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/InsertAttributeFMModel.java Mon Nov 16 12:08:06 2009
@@ -40,9 +40,9 @@
/**
* Wraps {@link InsertAttributeModel} to be used in FreeMarker. For the list of
* parameters, see
- * {@link InsertAttributeModel #start(java.util.Stack, TilesContainer, boolean, String, String, Object, String, String, String, Attribute, Request)}
+ * {@link InsertAttributeModel #start(TilesContainer, boolean, String, String, Object, String, String, String, Attribute, Request)}
* and
- * {@link InsertAttributeModel #end(java.util.Stack, TilesContainer, boolean, Request)}
+ * {@link InsertAttributeModel #end(TilesContainer, boolean, Request)}
* .
*
* @version $Rev$ $Date$
@@ -75,19 +75,17 @@
Request request = FreeMarkerTilesRequestContext
.createServletFreemarkerRequest(container
.getApplicationContext(), env);
- model.start(FreeMarkerUtil.getComposeStack(env), container,
- FreeMarkerUtil.getAsBoolean(parms.get("ignore"), false),
+ model.start(container, FreeMarkerUtil.getAsBoolean(parms.get("ignore"), false),
FreeMarkerUtil.getAsString(parms.get("preparer")),
- FreeMarkerUtil.getAsString(parms.get("role")), FreeMarkerUtil
+ FreeMarkerUtil.getAsString(parms.get("role")),
+ FreeMarkerUtil
.getAsObject(parms.get("defaultValue")), FreeMarkerUtil
- .getAsString(parms.get("defaultValueRole")),
- FreeMarkerUtil.getAsString(parms.get("defaultValueType")),
+ .getAsString(parms.get("defaultValueRole")), FreeMarkerUtil.getAsString(parms.get("defaultValueType")),
FreeMarkerUtil.getAsString(parms.get("name")),
(Attribute) FreeMarkerUtil.getAsObject(parms.get("value")),
request);
FreeMarkerUtil.evaluateBody(body);
- model.end(FreeMarkerUtil.getComposeStack(env), container,
- FreeMarkerUtil.getAsBoolean(parms.get("ignore"), false),
+ model.end(container, FreeMarkerUtil.getAsBoolean(parms.get("ignore"), false),
request);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/GetAsStringFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/GetAsStringFMModelTest.java?rev=880722&r1=880721&r2=880722&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/GetAsStringFMModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/GetAsStringFMModelTest.java Mon Nov 16 12:08:06 2009
@@ -34,12 +34,10 @@
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
-import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
-import org.apache.tiles.freemarker.context.FreeMarkerUtil;
import org.apache.tiles.freemarker.io.NullWriter;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.servlet.context.ServletUtil;
@@ -96,10 +94,10 @@
private ObjectWrapper objectWrapper;
/**
- * @throws java.lang.Exception If something goes wrong.
+ * Sets up the model.
*/
@Before
- public void setUp() throws Exception {
+ public void setUp() {
template = createMock(Template.class);
model = createMock(TemplateHashModel.class);
expect(template.getMacros()).andReturn(new HashMap<Object, Object>());
@@ -123,8 +121,6 @@
expect(container.getApplicationContext()).andReturn(applicationContext);
HttpServletRequest request = createMock(HttpServletRequest.class);
- ArrayStack<Object> composeStack = new ArrayStack<Object>();
- expect(request.getAttribute(FreeMarkerUtil.COMPOSE_STACK_ATTRIBUTE_NAME)).andReturn(composeStack).times(2);
expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
replay(request);
@@ -151,13 +147,11 @@
params.put("name", objectWrapper.wrap("myName"));
params.put("value", objectWrapper.wrap(attribute));
- tModel.start(eq(composeStack), eq(container), eq(false),
- eq("myPreparer"), eq("myRole"), eq("myDefaultValue"),
- eq("myDefaultValueRole"), eq("myDefaultValueType"),
- eq("myName"), eq(attribute),
- isA(FreeMarkerTilesRequestContext.class));
- tModel.end(eq(composeStack), eq(container), eq(writer), eq(false),
- isA(FreeMarkerTilesRequestContext.class));
+ tModel.start(eq(container), eq(false), eq("myPreparer"),
+ eq("myRole"), eq("myDefaultValue"), eq("myDefaultValueRole"),
+ eq("myDefaultValueType"), eq("myName"),
+ eq(attribute), isA(FreeMarkerTilesRequestContext.class));
+ tModel.end(eq(container), eq(writer), eq(false), isA(FreeMarkerTilesRequestContext.class));
body.render(isA(NullWriter.class));
replay(tModel, body, container, attribute, applicationContext);
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertAttributeFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertAttributeFMModelTest.java?rev=880722&r1=880721&r2=880722&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertAttributeFMModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertAttributeFMModelTest.java Mon Nov 16 12:08:06 2009
@@ -34,12 +34,10 @@
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
-import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContext;
-import org.apache.tiles.freemarker.context.FreeMarkerUtil;
import org.apache.tiles.freemarker.io.NullWriter;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.servlet.context.ServletUtil;
@@ -96,10 +94,10 @@
private ObjectWrapper objectWrapper;
/**
- * @throws java.lang.Exception If something goes wrong.
+ * Sets up the model.
*/
@Before
- public void setUp() throws Exception {
+ public void setUp() {
template = createMock(Template.class);
model = createMock(TemplateHashModel.class);
expect(template.getMacros()).andReturn(new HashMap<Object, Object>());
@@ -123,8 +121,6 @@
expect(container.getApplicationContext()).andReturn(applicationContext);
HttpServletRequest request = createMock(HttpServletRequest.class);
- ArrayStack<Object> composeStack = new ArrayStack<Object>();
- expect(request.getAttribute(FreeMarkerUtil.COMPOSE_STACK_ATTRIBUTE_NAME)).andReturn(composeStack).times(2);
expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
replay(request);
@@ -151,12 +147,11 @@
params.put("name", objectWrapper.wrap("myName"));
params.put("value", objectWrapper.wrap(attribute));
- tModel.start(eq(composeStack), eq(container), eq(false),
- eq("myPreparer"), eq("myRole"), eq("myDefaultValue"),
- eq("myDefaultValueRole"), eq("myDefaultValueType"),
- eq("myName"), eq(attribute),
- isA(FreeMarkerTilesRequestContext.class));
- tModel.end(eq(composeStack), eq(container), eq(false), isA(FreeMarkerTilesRequestContext.class));
+ tModel.start(eq(container), eq(false), eq("myPreparer"),
+ eq("myRole"), eq("myDefaultValue"), eq("myDefaultValueRole"),
+ eq("myDefaultValueType"), eq("myName"),
+ eq(attribute), isA(FreeMarkerTilesRequestContext.class));
+ tModel.end(eq(container), eq(false), isA(FreeMarkerTilesRequestContext.class));
body.render(isA(NullWriter.class));
replay(tModel, body, container, attribute, applicationContext);
Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java?rev=880722&r1=880721&r2=880722&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java Mon Nov 16 12:08:06 2009
@@ -312,13 +312,12 @@
Request request = JspTilesRequestContext.createServletJspRequest(
currentContainer.getApplicationContext(),
(PageContext) jspContext);
- model.start(JspUtil.getComposeStack(jspContext), currentContainer, ignore, preparer, role,
- defaultValue, defaultValueRole, defaultValueType, name,
- (Attribute) value, request);
+ model.start(currentContainer, ignore, preparer, role, defaultValue,
+ defaultValueRole, defaultValueType, name, (Attribute) value,
+ request);
JspWriter writer = jspContext.getOut();
JspUtil.evaluateFragment(getJspBody());
- model.end(JspUtil.getComposeStack(jspContext), JspUtil
- .getContainer(jspContext), writer, ignore,
- request);
+ model.end(JspUtil
+ .getContainer(jspContext), writer, ignore, request);
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java?rev=880722&r1=880721&r2=880722&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java Mon Nov 16 12:08:06 2009
@@ -321,11 +321,11 @@
Request request = JspTilesRequestContext.createServletJspRequest(
currentContainer.getApplicationContext(),
(PageContext) jspContext);
- model.start(JspUtil.getComposeStack(jspContext), currentContainer,
- ignore, preparer, role, defaultValue, defaultValueRole,
- defaultValueType, name, (Attribute) value, request);
+ model.start(currentContainer, ignore,
+ preparer, role, defaultValue, defaultValueRole, defaultValueType,
+ name, (Attribute) value, request);
JspUtil.evaluateFragment(getJspBody());
- model.end(JspUtil.getComposeStack(jspContext), currentContainer,
- ignore, request);
+ model.end(currentContainer, ignore,
+ request);
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java?rev=880722&r1=880721&r2=880722&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java Mon Nov 16 12:08:06 2009
@@ -70,8 +70,6 @@
/**
* Starts the operation.
- *
- * @param composeStack The compose stack,
* @param container The Tiles container to use.
* @param ignore If <code>true</code>, if an exception happens during
* rendering, of if the attribute is null, the problem will be ignored.
@@ -87,12 +85,15 @@
* @param name The name of the attribute.
* @param value The attribute to use immediately, if not null.
* @param request TODO
+ * @param composeStack The compose stack,
+ *
* @since 2.2.0
*/
- public void start(ArrayStack<Object> composeStack, TilesContainer container,
- boolean ignore, String preparer, String role, Object defaultValue,
- String defaultValueRole, String defaultValueType, String name,
- Attribute value, Request request) {
+ public void start(TilesContainer container, boolean ignore,
+ String preparer, String role, Object defaultValue, String defaultValueRole,
+ String defaultValueType, String name, Attribute value,
+ Request request) {
+ ArrayStack<Object> composeStack = ComposeStackUtil.getComposeStack(request);
Attribute attribute = resolveAttribute(container, ignore, preparer,
role, defaultValue, defaultValueRole, defaultValueType, name,
value, request);
@@ -101,18 +102,19 @@
/**
* Ends the operation.
- *
- * @param composeStack The compose stack,
* @param container The Tiles container to use.
* @param writer The writer into which the attribute will be written.
* @param ignore If <code>true</code>, if an exception happens during
* rendering, of if the attribute is null, the problem will be ignored.
* @param request TODO
+ * @param composeStack The compose stack,
+ *
* @throws IOException If an I/O error happens during rendering.
*/
- public void end(ArrayStack<Object> composeStack, TilesContainer container,
- Writer writer, boolean ignore, Request request)
+ public void end(TilesContainer container, Writer writer,
+ boolean ignore, Request request)
throws IOException {
+ ArrayStack<Object> composeStack = ComposeStackUtil.getComposeStack(request);
Attribute attribute = (Attribute) composeStack.pop();
renderAttribute(attribute, container, writer, ignore, request);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java?rev=880722&r1=880721&r2=880722&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java Mon Nov 16 12:08:06 2009
@@ -82,8 +82,6 @@
/**
* Starts the operation.
- *
- * @param composeStack The compose stack,
* @param container The Tiles container to use.
* @param ignore If <code>true</code>, if an exception happens during
* rendering, of if the attribute is null, the problem will be ignored.
@@ -99,12 +97,15 @@
* @param name The name of the attribute.
* @param value The attribute to use immediately, if not null.
* @param request TODO
+ * @param composeStack The compose stack,
+ *
* @since 2.2.0
*/
- public void start(ArrayStack<Object> composeStack, TilesContainer container,
- boolean ignore, String preparer, String role, Object defaultValue,
- String defaultValueRole, String defaultValueType, String name,
- Attribute value, Request request) {
+ public void start(TilesContainer container, boolean ignore,
+ String preparer, String role, Object defaultValue, String defaultValueRole,
+ String defaultValueType, String name, Attribute value,
+ Request request) {
+ ArrayStack<Object> composeStack = ComposeStackUtil.getComposeStack(request);
Attribute attribute = resolveAttribute(container, ignore, preparer,
role, defaultValue, defaultValueRole, defaultValueType, name,
value, request);
@@ -113,16 +114,17 @@
/**
* Ends the operation.
- *
- * @param composeStack The compose stack,
* @param container The Tiles container to use.
* @param ignore If <code>true</code>, if an exception happens during
* rendering, of if the attribute is null, the problem will be ignored.
* @param request TODO
+ * @param composeStack The compose stack,
+ *
* @throws IOException If an I/O error happens during rendering.
*/
- public void end(ArrayStack<Object> composeStack, TilesContainer container,
- boolean ignore, Request request) throws IOException {
+ public void end(TilesContainer container, boolean ignore,
+ Request request) throws IOException {
+ ArrayStack<Object> composeStack = ComposeStackUtil.getComposeStack(request);
Attribute attribute = (Attribute) composeStack.pop();
renderAttribute(container, ignore, attribute, request);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java?rev=880722&r1=880721&r2=880722&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java Mon Nov 16 12:08:06 2009
@@ -27,6 +27,8 @@
import java.io.IOException;
import java.io.Writer;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
@@ -64,9 +66,9 @@
/**
* Test method for {@link org.apache.tiles.template.GetAsStringModel
- * #start(java.util.Stack, org.apache.tiles.TilesContainer, boolean, java.lang.String,
- * java.lang.String, java.lang.Object, java.lang.String, java.lang.String, java.lang.String,
- * org.apache.tiles.Attribute, Request)}.
+ * #start(org.apache.tiles.TilesContainer, boolean, java.lang.String, java.lang.String,
+ * java.lang.Object, java.lang.String, java.lang.String, java.lang.String, org.apache.tiles.Attribute,
+ * Request)}.
*/
@Test
public void testStart() {
@@ -75,15 +77,18 @@
Request request = createMock(Request.class);
Attribute attribute = new Attribute();
AttributeContext attributeContext = createMock(AttributeContext.class);
+ Map<String, Object> requestScope = new HashMap<String, Object>();
+ requestScope.put(ComposeStackUtil.COMPOSE_STACK_ATTRIBUTE_NAME, composeStack);
+ expect(request.getRequestScope()).andReturn(requestScope);
container.prepare("myPreparer", request);
expect(resolver.computeAttribute(container, attribute, "myName", "myRole", false, "myDefaultValue",
"myDefaultValueRole", "myDefaultValueType", request)).andReturn(attribute);
expect(container.startContext(request)).andReturn(attributeContext);
replay(resolver, container, attributeContext, request);
- model.start(composeStack, container, false, "myPreparer", "myRole", "myDefaultValue",
- "myDefaultValueRole", "myDefaultValueType", "myName", attribute, request);
+ model.start(container, false, "myPreparer", "myRole", "myDefaultValue", "myDefaultValueRole",
+ "myDefaultValueType", "myName", attribute, request);
assertEquals(1, composeStack.size());
assertEquals(attribute, composeStack.peek());
verify(resolver, container, attributeContext, request);
@@ -91,8 +96,8 @@
/**
* Test method for {@link org.apache.tiles.template.GetAsStringModel
- * #end(java.util.Stack, org.apache.tiles.TilesContainer, java.io.Writer,
- * boolean, Request)}.
+ * #end(org.apache.tiles.TilesContainer, java.io.Writer, boolean,
+ * Request)}.
* @throws IOException If something goes wrong.
*/
@Test
@@ -103,12 +108,15 @@
TilesContainer container = createMock(TilesContainer.class);
Request request = createMock(Request.class);
Writer writer = createMock(Writer.class);
+ Map<String, Object> requestScope = new HashMap<String, Object>();
+ requestScope.put(ComposeStackUtil.COMPOSE_STACK_ATTRIBUTE_NAME, composeStack);
+ expect(request.getRequestScope()).andReturn(requestScope);
writer.write("myValue");
container.endContext(request);
replay(resolver, container, writer, request);
- model.end(composeStack, container, writer, false, request);
+ model.end(container, writer, false, request);
verify(resolver, container, writer, request);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/InsertAttributeModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/InsertAttributeModelTest.java?rev=880722&r1=880721&r2=880722&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/InsertAttributeModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/InsertAttributeModelTest.java Mon Nov 16 12:08:06 2009
@@ -25,6 +25,8 @@
import static org.junit.Assert.*;
import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
@@ -62,8 +64,8 @@
/**
* Test method for {@link org.apache.tiles.template.InsertAttributeModel
- * #start(ArrayStack, TilesContainer, boolean, String, String, Object, String,
- * String, String, Attribute, Request)}.
+ * #start(TilesContainer, boolean, String, String, Object, String, String,
+ * String, Attribute, Request)}.
*/
@Test
public void testStart() {
@@ -72,15 +74,18 @@
Request request = createMock(Request.class);
Attribute attribute = new Attribute();
AttributeContext attributeContext = createMock(AttributeContext.class);
+ Map<String, Object> requestScope = new HashMap<String, Object>();
+ requestScope.put(ComposeStackUtil.COMPOSE_STACK_ATTRIBUTE_NAME, composeStack);
+ expect(request.getRequestScope()).andReturn(requestScope);
container.prepare("myPreparer", request);
expect(resolver.computeAttribute(container, attribute, "myName", "myRole", false, "myDefaultValue",
"myDefaultValueRole", "myDefaultValueType", request)).andReturn(attribute);
expect(container.startContext(request)).andReturn(attributeContext);
replay(resolver, container, attributeContext, request);
- model.start(composeStack, container, false, "myPreparer", "myRole", "myDefaultValue",
- "myDefaultValueRole", "myDefaultValueType", "myName", attribute, request);
+ model.start(container, false, "myPreparer", "myRole", "myDefaultValue", "myDefaultValueRole",
+ "myDefaultValueType", "myName", attribute, request);
assertEquals(1, composeStack.size());
assertEquals(attribute, composeStack.peek());
verify(resolver, container, attributeContext, request);
@@ -88,7 +93,7 @@
/**
* Test method for {@link org.apache.tiles.template.InsertAttributeModel
- * #end(ArrayStack, TilesContainer, boolean, Request)}.
+ * #end(TilesContainer, boolean, Request)}.
* @throws IOException If something goes wrong.
*/
@Test
@@ -98,12 +103,15 @@
composeStack.push(attribute);
TilesContainer container = createMock(TilesContainer.class);
Request request = createMock(Request.class);
+ Map<String, Object> requestScope = new HashMap<String, Object>();
+ requestScope.put(ComposeStackUtil.COMPOSE_STACK_ATTRIBUTE_NAME, composeStack);
+ expect(request.getRequestScope()).andReturn(requestScope);
container.endContext(request);
container.render(attribute, request);
replay(resolver, container, request);
- model.end(composeStack, container, false, request);
+ model.end(container, false, request);
verify(resolver, container, request);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringVModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringVModel.java?rev=880722&r1=880721&r2=880722&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringVModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringVModel.java Mon Nov 16 12:08:06 2009
@@ -43,9 +43,9 @@
/**
* Wraps {@link GetAsStringModel} to be used in Velocity. For the list of
* parameters, see
- * {@link GetAsStringModel#start(java.util.Stack, TilesContainer, boolean,
- * String, String, Object, String, String, String, Attribute, Request)}
- * , {@link GetAsStringModel#end(java.util.Stack, TilesContainer, Writer, boolean, Request)} and
+ * {@link GetAsStringModel#start(TilesContainer, boolean, String,
+ * String, Object, String, String, String, Attribute, Request)}
+ * , {@link GetAsStringModel#end(TilesContainer, Writer, boolean, Request)} and
* {@link GetAsStringModel#execute(TilesContainer, Writer, boolean, String,
* String, Object, String, String, String, Attribute, Request)}.
*
@@ -115,13 +115,13 @@
Request currentRequest = VelocityTilesRequestContext
.createVelocityRequest(container.getApplicationContext(),
request, response, velocityContext, null);
- model.start(ServletUtil.getComposeStack(request), container, VelocityUtil
- .toSimpleBoolean((Boolean) params.get("ignore"), false),
- (String) params.get("preparer"), (String) params.get("role"),
- params.get("defaultValue"), (String) params
+ model.start(container, VelocityUtil
+ .toSimpleBoolean((Boolean) params.get("ignore"), false), (String) params.get("preparer"),
+ (String) params.get("role"), params.get("defaultValue"),
+ (String) params
.get("defaultValueRole"), (String) params
- .get("defaultValueType"), (String) params.get("name"),
- (Attribute) params.get("value"), currentRequest);
+ .get("defaultValueType"), (String) params.get("name"), (Attribute) params.get("value"),
+ currentRequest);
}
/** {@inheritDoc} */
@@ -138,9 +138,9 @@
Request currentRequest = VelocityTilesRequestContext
.createVelocityRequest(container.getApplicationContext(),
request, response, velocityContext, writer);
- model.end(ServletUtil.getComposeStack(request), container, writer,
- VelocityUtil.toSimpleBoolean((Boolean) params
- .get("ignore"), false), currentRequest);
+ model.end(container, writer, VelocityUtil.toSimpleBoolean((Boolean) params
+ .get("ignore"), false),
+ currentRequest);
return true;
}
};
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertAttributeVModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertAttributeVModel.java?rev=880722&r1=880721&r2=880722&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertAttributeVModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertAttributeVModel.java Mon Nov 16 12:08:06 2009
@@ -43,9 +43,9 @@
/**
* Wraps {@link InsertAttributeModel} to be used in Velocity. For the list of
* parameters, see
- * {@link InsertAttributeModel#start(java.util.Stack, org.apache.tiles.TilesContainer, boolean,
- * String, String, Object, String, String, String, Attribute, Request)}
- * , {@link InsertAttributeModel#end(java.util.Stack, org.apache.tiles.TilesContainer, boolean, Request)} and
+ * {@link InsertAttributeModel#start(org.apache.tiles.TilesContainer, boolean, String,
+ * String, Object, String, String, String, Attribute, Request)}
+ * , {@link InsertAttributeModel#end(org.apache.tiles.TilesContainer, boolean, Request)} and
* {@link InsertAttributeModel#execute(org.apache.tiles.TilesContainer, boolean, String, String,
* Object, String, String, String, Attribute, Request)}.
*
@@ -91,9 +91,9 @@
Request currentRequest = VelocityTilesRequestContext
.createVelocityRequest(container.getApplicationContext(),
request, response, velocityContext, writer);
- model.end(ServletUtil.getComposeStack(request), container,
- VelocityUtil.toSimpleBoolean((Boolean) params
- .get("ignore"), false), currentRequest);
+ model.end(container, VelocityUtil.toSimpleBoolean((Boolean) params
+ .get("ignore"), false),
+ currentRequest);
return true;
}
};
@@ -108,12 +108,12 @@
Request currentRequest = VelocityTilesRequestContext
.createVelocityRequest(container.getApplicationContext(),
request, response, velocityContext, null);
- model.start(ServletUtil.getComposeStack(request), container,
- VelocityUtil.toSimpleBoolean((Boolean) params.get("ignore"), false),
- (String) params.get("preparer"), (String) params.get("role"),
- params.get("defaultValue"), (String) params.get("defaultValueRole"),
- (String) params.get("defaultValueType"), (String) params.get("name"),
- (Attribute) params.get("value"), currentRequest);
+ model.start(container, VelocityUtil.toSimpleBoolean((Boolean) params.get("ignore"), false),
+ (String) params.get("preparer"),
+ (String) params.get("role"), params.get("defaultValue"),
+ (String) params.get("defaultValueRole"), (String) params.get("defaultValueType"),
+ (String) params.get("name"), (Attribute) params.get("value"),
+ currentRequest);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringVModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringVModelTest.java?rev=880722&r1=880721&r2=880722&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringVModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringVModelTest.java Mon Nov 16 12:08:06 2009
@@ -131,18 +131,14 @@
Context velocityContext = createMock(Context.class);
TilesContainer container = createMock(TilesContainer.class);
Map<String, Object> params = createParams();
- ArrayStack<Object> composeStack = new ArrayStack<Object>();
ArrayStack<Map<String, Object>> paramStack = new ArrayStack<Map<String, Object>>();
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME))
- .andReturn(composeStack);
expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack);
- tModel.start(eq(composeStack), eq(container), eq(false), eq("myPreparer"), eq("myRole"), eq("myDefaultValue"),
- eq("myDefaultValueRole"), eq("myDefaultValueType"), eq("myName"), eq(attribute),
- isA(VelocityTilesRequestContext.class));
+ tModel.start(eq(container), eq(false), eq("myPreparer"), eq("myRole"), eq("myDefaultValue"), eq("myDefaultValueRole"),
+ eq("myDefaultValueType"), eq("myName"), eq(attribute), isA(VelocityTilesRequestContext.class));
replay(tModel, servletContext, container, request, response, velocityContext, applicationContext);
initializeModel();
@@ -166,7 +162,6 @@
TilesContainer container = createMock(TilesContainer.class);
InternalContextAdapter internalContextAdapter = createMock(InternalContextAdapter.class);
Writer writer = new StringWriter();
- ArrayStack<Object> composeStack = new ArrayStack<Object>();
Map<String, Object> params = createParams();
ArrayStack<Map<String, Object>> paramStack = new ArrayStack<Map<String, Object>>();
paramStack.push(params);
@@ -174,10 +169,8 @@
expect(container.getApplicationContext()).andReturn(applicationContext);
expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
- expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME))
- .andReturn(composeStack);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack);
- tModel.end(eq(composeStack), eq(container), eq(writer), eq(false), isA(VelocityTilesRequestContext.class));
+ tModel.end(eq(container), eq(writer), eq(false), isA(VelocityTilesRequestContext.class));
replay(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext);
initializeModel();
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeVModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeVModelTest.java?rev=880722&r1=880721&r2=880722&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeVModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeVModelTest.java Mon Nov 16 12:08:06 2009
@@ -131,18 +131,14 @@
Context velocityContext = createMock(Context.class);
TilesContainer container = createMock(TilesContainer.class);
Map<String, Object> params = createParams();
- ArrayStack<Object> composeStack = new ArrayStack<Object>();
ArrayStack<Map<String, Object>> paramStack = new ArrayStack<Map<String, Object>>();
ApplicationContext applicationContext = createMock(ApplicationContext.class);
expect(container.getApplicationContext()).andReturn(applicationContext);
- expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME))
- .andReturn(composeStack);
expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack);
- tModel.start(eq(composeStack), eq(container), eq(false), eq("myPreparer"), eq("myRole"), eq("myDefaultValue"),
- eq("myDefaultValueRole"), eq("myDefaultValueType"), eq("myName"), eq(attribute),
- isA(VelocityTilesRequestContext.class));
+ tModel.start(eq(container), eq(false), eq("myPreparer"), eq("myRole"), eq("myDefaultValue"), eq("myDefaultValueRole"),
+ eq("myDefaultValueType"), eq("myName"), eq(attribute), isA(VelocityTilesRequestContext.class));
replay(tModel, servletContext, container, request, response, velocityContext, applicationContext);
initializeModel();
@@ -166,7 +162,6 @@
TilesContainer container = createMock(TilesContainer.class);
InternalContextAdapter internalContextAdapter = createMock(InternalContextAdapter.class);
Writer writer = new StringWriter();
- ArrayStack<Object> composeStack = new ArrayStack<Object>();
Map<String, Object> params = createParams();
ArrayStack<Map<String, Object>> paramStack = new ArrayStack<Map<String, Object>>();
paramStack.push(params);
@@ -174,10 +169,8 @@
expect(container.getApplicationContext()).andReturn(applicationContext);
expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
- expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME))
- .andReturn(composeStack);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack);
- tModel.end(eq(composeStack), eq(container), eq(false), isA(VelocityTilesRequestContext.class));
+ tModel.end(eq(container), eq(false), isA(VelocityTilesRequestContext.class));
replay(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext);
initializeModel();