Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/ImportAttributeModelTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/ImportAttributeModelTest.java?rev=884031&r1=884030&r2=884031&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/ImportAttributeModelTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/ImportAttributeModelTest.java Wed Nov 25 10:52:52 2009 @@ -48,7 +48,7 @@ /** * The size of the attributes collection. */ - private static final int ATTRIBUTES_SIZE = 3; + private static final int ATTRIBUTES_SIZE = 4; /** * The model to test. @@ -69,7 +69,7 @@ * boolean, Request)}. */ @Test - public void testGetImportedAttributesSingle() { + public void testExecuteSingle() { TilesContainer container = createMock(TilesContainer.class); AttributeContext attributeContext = createMock(AttributeContext.class); Attribute attribute = new Attribute(); @@ -79,14 +79,15 @@ requestScope.put(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container); expect(request.getApplicationContext()).andReturn(applicationContext); - expect(request.getRequestScope()).andReturn(requestScope); + expect(request.getContext("request")).andReturn(requestScope).anyTimes(); expect(container.getAttributeContext(request)).andReturn(attributeContext); expect(attributeContext.getAttribute("myName")).andReturn(attribute); expect(container.evaluate(attribute, request)).andReturn("myEvaluatedValue"); replay(container, attributeContext, request, applicationContext); - Map<String, Object> attributes = model.getImportedAttributes("myName", null, false, request); - assertEquals(1, attributes.size()); + model.execute("myName", "request", null, false, request); + Map<String, Object> attributes = requestScope; + assertEquals(2, attributes.size()); assertEquals("myEvaluatedValue", attributes.get("myName")); verify(container, attributeContext, request, applicationContext); } @@ -97,7 +98,7 @@ * boolean, Request)}. */ @Test - public void testGetImportedAttributesSingleToName() { + public void testExecuteSingleToName() { TilesContainer container = createMock(TilesContainer.class); Request request = createMock(Request.class); AttributeContext attributeContext = createMock(AttributeContext.class); @@ -107,15 +108,15 @@ requestScope.put(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container); expect(request.getApplicationContext()).andReturn(applicationContext); - expect(request.getRequestScope()).andReturn(requestScope); + expect(request.getContext("request")).andReturn(requestScope).anyTimes(); expect(container.getAttributeContext(request)).andReturn(attributeContext); expect(attributeContext.getAttribute("myName")).andReturn(attribute); expect(container.evaluate(attribute, request)).andReturn("myEvaluatedValue"); replay(container, attributeContext, request, applicationContext); - Map<String, Object> attributes = model.getImportedAttributes("myName", - "myToName", false, request); - assertEquals(1, attributes.size()); + model.execute("myName", "request", "myToName", false, request); + Map<String, Object> attributes = requestScope; + assertEquals(2, attributes.size()); assertEquals("myEvaluatedValue", attributes.get("myToName")); verify(container, attributeContext, request, applicationContext); } @@ -126,7 +127,7 @@ * boolean, Request)}. */ @Test - public void testGetImportedAttributesAll() { + public void testExecuteAll() { TilesContainer container = createMock(TilesContainer.class); Request request = createMock(Request.class); AttributeContext attributeContext = createMock(AttributeContext.class); @@ -144,7 +145,7 @@ requestScope.put(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container); expect(request.getApplicationContext()).andReturn(applicationContext); - expect(request.getRequestScope()).andReturn(requestScope); + expect(request.getContext("request")).andReturn(requestScope).anyTimes(); expect(container.getAttributeContext(request)).andReturn(attributeContext); expect(attributeContext.getCascadedAttributeNames()).andReturn(cascadedNames); expect(attributeContext.getLocalAttributeNames()).andReturn(localNames); @@ -156,7 +157,8 @@ expect(container.evaluate(attribute3, request)).andReturn("myEvaluatedValue3"); replay(container, attributeContext, request, applicationContext); - Map<String, Object> attributes = model.getImportedAttributes(null, null, false, request); + model.execute(null, "request", null, false, request); + Map<String, Object> attributes = requestScope; assertEquals(ATTRIBUTES_SIZE, attributes.size()); assertEquals("myEvaluatedValue1", attributes.get("myName1")); assertEquals("myEvaluatedValue2", attributes.get("myName2")); @@ -170,7 +172,7 @@ * boolean, Request)}. */ @Test(expected = NoSuchAttributeException.class) - public void testGetImportedAttributesSingleNullAttributeException() { + public void testExecuteSingleNullAttributeException() { TilesContainer container = createMock(TilesContainer.class); Request request = createMock(Request.class); AttributeContext attributeContext = createMock(AttributeContext.class); @@ -179,13 +181,13 @@ requestScope.put(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container); expect(request.getApplicationContext()).andReturn(applicationContext); - expect(request.getRequestScope()).andReturn(requestScope); + expect(request.getContext("request")).andReturn(requestScope).anyTimes(); expect(container.getAttributeContext(request)).andReturn(attributeContext); expect(attributeContext.getAttribute("myName")).andReturn(null); replay(container, attributeContext, request, applicationContext); try { - model.getImportedAttributes("myName", null, false, request); + model.execute("myName", "request", null, false, request); } finally { verify(container, attributeContext, request, applicationContext); } @@ -197,7 +199,7 @@ * boolean, Request)}. */ @Test(expected = NoSuchAttributeException.class) - public void testGetImportedAttributesSingleNullAttributeValueException() { + public void testExecuteSingleNullAttributeValueException() { TilesContainer container = createMock(TilesContainer.class); Request request = createMock(Request.class); AttributeContext attributeContext = createMock(AttributeContext.class); @@ -207,14 +209,14 @@ requestScope.put(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container); expect(request.getApplicationContext()).andReturn(applicationContext); - expect(request.getRequestScope()).andReturn(requestScope); + expect(request.getContext("request")).andReturn(requestScope).anyTimes(); expect(container.getAttributeContext(request)).andReturn(attributeContext); expect(attributeContext.getAttribute("myName")).andReturn(attribute); expect(container.evaluate(attribute, request)).andReturn(null); replay(container, attributeContext, request, applicationContext); try { - model.getImportedAttributes("myName", null, false, request); + model.execute("myName", "request", null, false, request); } finally { verify(container, attributeContext, request, applicationContext); } @@ -226,7 +228,7 @@ * boolean, Request)}. */ @Test(expected = RuntimeException.class) - public void testGetImportedAttributesSingleRuntimeException() { + public void testExecuteSingleRuntimeException() { TilesContainer container = createMock(TilesContainer.class); Request request = createMock(Request.class); AttributeContext attributeContext = createMock(AttributeContext.class); @@ -236,14 +238,14 @@ requestScope.put(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container); expect(request.getApplicationContext()).andReturn(applicationContext); - expect(request.getRequestScope()).andReturn(requestScope); + expect(request.getContext("request")).andReturn(requestScope).anyTimes(); expect(container.getAttributeContext(request)).andReturn(attributeContext); expect(attributeContext.getAttribute("myName")).andReturn(attribute); expect(container.evaluate(attribute, request)).andThrow(new RuntimeException()); replay(container, attributeContext, request, applicationContext); try { - model.getImportedAttributes("myName", null, false, request); + model.execute("myName", "request", null, false, request); } finally { verify(container, attributeContext, request, applicationContext); } @@ -255,7 +257,7 @@ * boolean, Request)}. */ @Test - public void testGetImportedAttributesSingleNullAttributeIgnore() { + public void testExecuteSingleNullAttributeIgnore() { TilesContainer container = createMock(TilesContainer.class); Request request = createMock(Request.class); AttributeContext attributeContext = createMock(AttributeContext.class); @@ -264,12 +266,12 @@ requestScope.put(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container); expect(request.getApplicationContext()).andReturn(applicationContext); - expect(request.getRequestScope()).andReturn(requestScope); + expect(request.getContext("request")).andReturn(requestScope).anyTimes(); expect(container.getAttributeContext(request)).andReturn(attributeContext); expect(attributeContext.getAttribute("myName")).andReturn(null); replay(container, attributeContext, request, applicationContext); - model.getImportedAttributes("myName", null, true, request); + model.execute("myName", "request", null, true, request); verify(container, attributeContext, request, applicationContext); } @@ -279,7 +281,7 @@ * boolean, Request)}. */ @Test - public void testGetImportedAttributesSingleNullAttributeValueIgnore() { + public void testExecuteSingleNullAttributeValueIgnore() { TilesContainer container = createMock(TilesContainer.class); Request request = createMock(Request.class); AttributeContext attributeContext = createMock(AttributeContext.class); @@ -289,13 +291,13 @@ requestScope.put(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container); expect(request.getApplicationContext()).andReturn(applicationContext); - expect(request.getRequestScope()).andReturn(requestScope); + expect(request.getContext("request")).andReturn(requestScope).anyTimes(); expect(container.getAttributeContext(request)).andReturn(attributeContext); expect(attributeContext.getAttribute("myName")).andReturn(attribute); expect(container.evaluate(attribute, request)).andReturn(null); replay(container, attributeContext, request, applicationContext); - model.getImportedAttributes("myName", null, true, request); + model.execute("myName", "request", null, true, request); verify(container, attributeContext, request, applicationContext); } @@ -305,7 +307,7 @@ * boolean, Request)}. */ @Test - public void testGetImportedAttributesSingleRuntimeIgnore() { + public void testExecuteSingleRuntimeIgnore() { TilesContainer container = createMock(TilesContainer.class); Request request = createMock(Request.class); AttributeContext attributeContext = createMock(AttributeContext.class); @@ -315,13 +317,13 @@ requestScope.put(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container); expect(request.getApplicationContext()).andReturn(applicationContext); - expect(request.getRequestScope()).andReturn(requestScope); + expect(request.getContext("request")).andReturn(requestScope).anyTimes(); expect(container.getAttributeContext(request)).andReturn(attributeContext); expect(attributeContext.getAttribute("myName")).andReturn(attribute); expect(container.evaluate(attribute, request)).andThrow(new RuntimeException()); replay(container, attributeContext, request, applicationContext); - model.getImportedAttributes("myName", null, true, request); + model.execute("myName", "request", null, true, request); verify(container, attributeContext, request, applicationContext); } }
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=884031&r1=884030&r2=884031&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 Wed Nov 25 10:52:52 2009 @@ -82,7 +82,7 @@ ApplicationContext applicationContext = createMock(ApplicationContext.class); expect(request.getApplicationContext()).andReturn(applicationContext); - expect(request.getRequestScope()).andReturn(requestScope).anyTimes(); + expect(request.getContext("request")).andReturn(requestScope).anyTimes(); container.prepare("myPreparer", request); expect(resolver.computeAttribute(container, attribute, "myName", "myRole", false, "myDefaultValue", "myDefaultValueRole", "myDefaultValueType", request)).andReturn(attribute); @@ -114,7 +114,7 @@ ApplicationContext applicationContext = createMock(ApplicationContext.class); expect(request.getApplicationContext()).andReturn(applicationContext); - expect(request.getRequestScope()).andReturn(requestScope).anyTimes(); + expect(request.getContext("request")).andReturn(requestScope).anyTimes(); container.endContext(request); container.render(attribute, request); @@ -140,7 +140,7 @@ ApplicationContext applicationContext = createMock(ApplicationContext.class); expect(request.getApplicationContext()).andReturn(applicationContext); - expect(request.getRequestScope()).andReturn(requestScope).anyTimes(); + expect(request.getContext("request")).andReturn(requestScope).anyTimes(); container.prepare("myPreparer", request); expect(resolver.computeAttribute(container, attribute, "myName", "myRole", false, "myDefaultValue", Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/InsertDefinitionModelTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/InsertDefinitionModelTest.java?rev=884031&r1=884030&r2=884031&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/InsertDefinitionModelTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/InsertDefinitionModelTest.java Wed Nov 25 10:52:52 2009 @@ -69,7 +69,7 @@ ApplicationContext applicationContext = createMock(ApplicationContext.class); expect(request.getApplicationContext()).andReturn(applicationContext); - expect(request.getRequestScope()).andReturn(requestScope).anyTimes(); + expect(request.getContext("request")).andReturn(requestScope).anyTimes(); expect(container.startContext(request)).andReturn(attributeContext); replay(container, attributeContext, request, applicationContext); @@ -92,7 +92,7 @@ ApplicationContext applicationContext = createMock(ApplicationContext.class); expect(request.getApplicationContext()).andReturn(applicationContext); - expect(request.getRequestScope()).andReturn(requestScope).anyTimes(); + expect(request.getContext("request")).andReturn(requestScope).anyTimes(); expect(container.getAttributeContext(request)).andReturn(attributeContext); container.endContext(request); attributeContext.setPreparer("myPreparer"); @@ -121,7 +121,7 @@ ApplicationContext applicationContext = createMock(ApplicationContext.class); expect(request.getApplicationContext()).andReturn(applicationContext); - expect(request.getRequestScope()).andReturn(requestScope).anyTimes(); + expect(request.getContext("request")).andReturn(requestScope).anyTimes(); expect(container.startContext(request)).andReturn(attributeContext); expect(container.getAttributeContext(request)).andReturn(attributeContext); container.endContext(request); Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/InsertTemplateModelTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/InsertTemplateModelTest.java?rev=884031&r1=884030&r2=884031&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/InsertTemplateModelTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/InsertTemplateModelTest.java Wed Nov 25 10:52:52 2009 @@ -69,7 +69,7 @@ ApplicationContext applicationContext = createMock(ApplicationContext.class); expect(request.getApplicationContext()).andReturn(applicationContext); - expect(request.getRequestScope()).andReturn(requestScope).anyTimes(); + expect(request.getContext("request")).andReturn(requestScope).anyTimes(); expect(container.startContext(request)).andReturn(attributeContext); replay(container, attributeContext, request, applicationContext); @@ -91,7 +91,7 @@ ApplicationContext applicationContext = createMock(ApplicationContext.class); expect(request.getApplicationContext()).andReturn(applicationContext); - expect(request.getRequestScope()).andReturn(requestScope).anyTimes(); + expect(request.getContext("request")).andReturn(requestScope).anyTimes(); expect(container.getAttributeContext(request)).andReturn(attributeContext); container.endContext(request); attributeContext.setPreparer("myPreparer"); @@ -118,7 +118,7 @@ ApplicationContext applicationContext = createMock(ApplicationContext.class); expect(request.getApplicationContext()).andReturn(applicationContext); - expect(request.getRequestScope()).andReturn(requestScope).anyTimes(); + expect(request.getContext("request")).andReturn(requestScope).anyTimes(); expect(container.startContext(request)).andReturn(attributeContext); expect(container.getAttributeContext(request)).andReturn(attributeContext); container.endContext(request); Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/PutAttributeModelTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/PutAttributeModelTest.java?rev=884031&r1=884030&r2=884031&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/PutAttributeModelTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/PutAttributeModelTest.java Wed Nov 25 10:52:52 2009 @@ -69,7 +69,7 @@ Map<String, Object> requestScope = new HashMap<String, Object>(); requestScope.put(ComposeStackUtil.COMPOSE_STACK_ATTRIBUTE_NAME, composeStack); - expect(request.getRequestScope()).andReturn(requestScope); + expect(request.getContext("request")).andReturn(requestScope); expect(composeStack.push(isA(Attribute.class))).andReturn(attribute); replay(request, composeStack); @@ -96,7 +96,7 @@ ApplicationContext applicationContext = createMock(ApplicationContext.class); expect(request.getApplicationContext()).andReturn(applicationContext); - expect(request.getRequestScope()).andReturn(requestScope).anyTimes(); + expect(request.getContext("request")).andReturn(requestScope).anyTimes(); expect(container.getAttributeContext(request)).andReturn(attributeContext); attributeContext.putAttribute("myName", attribute, false); @@ -130,7 +130,7 @@ ApplicationContext applicationContext = createMock(ApplicationContext.class); expect(request.getApplicationContext()).andReturn(applicationContext); - expect(request.getRequestScope()).andReturn(requestScope).anyTimes(); + expect(request.getContext("request")).andReturn(requestScope).anyTimes(); expect(container.getAttributeContext(request)).andReturn(attributeContext); attributeContext.putAttribute("myName", attribute, false); @@ -164,7 +164,7 @@ ApplicationContext applicationContext = createMock(ApplicationContext.class); expect(request.getApplicationContext()).andReturn(applicationContext); - expect(request.getRequestScope()).andReturn(requestScope).anyTimes(); + expect(request.getContext("request")).andReturn(requestScope).anyTimes(); expect(container.getAttributeContext(request)).andReturn(attributeContext); attributeContext.putAttribute(eq("myName"), (Attribute) notNull(), eq(false)); Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/PutListAttributeModelTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/PutListAttributeModelTest.java?rev=884031&r1=884030&r2=884031&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/PutListAttributeModelTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/PutListAttributeModelTest.java Wed Nov 25 10:52:52 2009 @@ -68,7 +68,7 @@ Request request = createMock(Request.class); requestScope.put(ComposeStackUtil.COMPOSE_STACK_ATTRIBUTE_NAME, composeStack); - expect(request.getRequestScope()).andReturn(requestScope); + expect(request.getContext("request")).andReturn(requestScope); replay(request); model.start("myRole", false, request); @@ -96,7 +96,7 @@ ApplicationContext applicationContext = createMock(ApplicationContext.class); expect(request.getApplicationContext()).andReturn(applicationContext); - expect(request.getRequestScope()).andReturn(requestScope).anyTimes(); + expect(request.getContext("request")).andReturn(requestScope).anyTimes(); expect(container.getAttributeContext(request)).andReturn(attributeContext); attributeContext.putAttribute("myName", listAttribute, false); Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/SetCurrentContainerModelTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/SetCurrentContainerModelTest.java?rev=884031&r1=884030&r2=884031&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/SetCurrentContainerModelTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/SetCurrentContainerModelTest.java Wed Nov 25 10:52:52 2009 @@ -36,7 +36,7 @@ Map<String, Object> requestScope = new HashMap<String, Object>(); expect(context.getApplicationScope()).andReturn(attribs).anyTimes(); - expect(request.getRequestScope()).andReturn(requestScope); + expect(request.getContext("request")).andReturn(requestScope); expect(request.getApplicationContext()).andReturn(context); replay(request, context, container); SetCurrentContainerModel model = new SetCurrentContainerModel(); Modified: tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/RequestSettingViewPreparer.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/RequestSettingViewPreparer.java?rev=884031&r1=884030&r2=884031&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/RequestSettingViewPreparer.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/RequestSettingViewPreparer.java Wed Nov 25 10:52:52 2009 @@ -37,7 +37,7 @@ /** {...@inheritdoc} */ public void execute(Request tilesContext, AttributeContext attributeContext) { - Map<String, Object> requestScope = tilesContext.getRequestScope(); + Map<String, Object> requestScope = tilesContext.getContext("request"); requestScope.put("body", "test.inner.definition"); requestScope.put("layout", "/layout.jsp"); requestScope.put("doNotShow", "DO NOT SHOW!!!"); Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeVModel.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeVModel.java?rev=884031&r1=884030&r2=884031&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeVModel.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeVModel.java Wed Nov 25 10:52:52 2009 @@ -83,17 +83,10 @@ .createVelocityRequest(ServletUtil .getApplicationContext(servletContext), request, response, velocityContext, writer); - Map<String, Object> attributes = model.getImportedAttributes( - (String) params.get("name"), - (String) params - .get("toName"), VelocityUtil.toSimpleBoolean( - (Boolean) params.get("ignore"), false), currentRequest); - String scope = (String) params.get("scope"); - for (Map.Entry<String, Object> entry : attributes.entrySet()) { - VelocityUtil.setAttribute(context, request, - servletContext, entry.getKey(), entry.getValue(), - scope); - } + model.execute((String) params.get("name"), (String) params + .get("scope"), (String) params.get("toName"), + VelocityUtil.toSimpleBoolean((Boolean) params + .get("ignore"), false), currentRequest); return true; } Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java?rev=884031&r1=884030&r2=884031&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java Wed Nov 25 10:52:52 2009 @@ -34,7 +34,7 @@ import org.apache.tiles.ArrayStack; import org.apache.tiles.request.ApplicationContext; -import org.apache.tiles.request.util.ApplicationContextUtil; +import org.apache.tiles.request.util.ApplicationAccess; import org.apache.tiles.template.AddAttributeModel; import org.apache.tiles.velocity.context.VelocityTilesRequestContext; import org.apache.tiles.velocity.context.VelocityUtil; @@ -78,7 +78,7 @@ servletContext = createMock(ServletContext.class); model = new AddAttributeVModel(tModel, servletContext); applicationContext = createMock(ApplicationContext.class); - expect(servletContext.getAttribute(ApplicationContextUtil + expect(servletContext.getAttribute(ApplicationAccess .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext) .anyTimes(); } Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeVModelTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeVModelTest.java?rev=884031&r1=884030&r2=884031&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeVModelTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeVModelTest.java Wed Nov 25 10:52:52 2009 @@ -33,7 +33,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.tiles.request.ApplicationContext; -import org.apache.tiles.request.util.ApplicationContextUtil; +import org.apache.tiles.request.util.ApplicationAccess; import org.apache.tiles.template.AddListAttributeModel; import org.apache.tiles.velocity.context.VelocityTilesRequestContext; import org.apache.tiles.velocity.context.VelocityUtil; @@ -72,7 +72,7 @@ servletContext = createMock(ServletContext.class); model = new AddListAttributeVModel(tModel, servletContext); applicationContext = createMock(ApplicationContext.class); - expect(servletContext.getAttribute(ApplicationContextUtil + expect(servletContext.getAttribute(ApplicationAccess .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext) .anyTimes(); } Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionVModelTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionVModelTest.java?rev=884031&r1=884030&r2=884031&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionVModelTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionVModelTest.java Wed Nov 25 10:52:52 2009 @@ -34,7 +34,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.tiles.request.ApplicationContext; -import org.apache.tiles.request.util.ApplicationContextUtil; +import org.apache.tiles.request.util.ApplicationAccess; import org.apache.tiles.template.DefinitionModel; import org.apache.tiles.velocity.context.VelocityTilesRequestContext; import org.apache.tiles.velocity.context.VelocityUtil; @@ -72,7 +72,7 @@ tModel = createMock(DefinitionModel.class); servletContext = createMock(ServletContext.class); applicationContext = createMock(ApplicationContext.class); - expect(servletContext.getAttribute(ApplicationContextUtil + expect(servletContext.getAttribute(ApplicationAccess .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext) .anyTimes(); } 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=884031&r1=884030&r2=884031&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 Wed Nov 25 10:52:52 2009 @@ -38,7 +38,7 @@ import org.apache.tiles.ArrayStack; import org.apache.tiles.Attribute; import org.apache.tiles.request.ApplicationContext; -import org.apache.tiles.request.util.ApplicationContextUtil; +import org.apache.tiles.request.util.ApplicationAccess; import org.apache.tiles.template.GetAsStringModel; import org.apache.tiles.velocity.context.VelocityTilesRequestContext; import org.apache.velocity.context.Context; @@ -88,7 +88,7 @@ servletContext = createMock(ServletContext.class); attribute = new Attribute("myAttributeValue"); applicationContext = createMock(ApplicationContext.class); - expect(servletContext.getAttribute(ApplicationContextUtil + expect(servletContext.getAttribute(ApplicationAccess .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext) .anyTimes(); } Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeVModelTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeVModelTest.java?rev=884031&r1=884030&r2=884031&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeVModelTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeVModelTest.java Wed Nov 25 10:52:52 2009 @@ -36,7 +36,7 @@ import javax.servlet.http.HttpSession; import org.apache.tiles.request.ApplicationContext; -import org.apache.tiles.request.util.ApplicationContextUtil; +import org.apache.tiles.request.util.ApplicationAccess; import org.apache.tiles.template.ImportAttributeModel; import org.apache.tiles.velocity.context.VelocityTilesRequestContext; import org.apache.velocity.context.Context; @@ -75,7 +75,7 @@ tModel = createMock(ImportAttributeModel.class); servletContext = createMock(ServletContext.class); applicationContext = createMock(ApplicationContext.class); - expect(servletContext.getAttribute(ApplicationContextUtil + expect(servletContext.getAttribute(ApplicationAccess .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext) .anyTimes(); } 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=884031&r1=884030&r2=884031&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 Wed Nov 25 10:52:52 2009 @@ -38,7 +38,7 @@ import org.apache.tiles.ArrayStack; import org.apache.tiles.Attribute; import org.apache.tiles.request.ApplicationContext; -import org.apache.tiles.request.util.ApplicationContextUtil; +import org.apache.tiles.request.util.ApplicationAccess; import org.apache.tiles.template.InsertAttributeModel; import org.apache.tiles.velocity.context.VelocityTilesRequestContext; import org.apache.velocity.context.Context; @@ -88,7 +88,7 @@ servletContext = createMock(ServletContext.class); attribute = new Attribute("myAttributeValue"); applicationContext = createMock(ApplicationContext.class); - expect(servletContext.getAttribute(ApplicationContextUtil + expect(servletContext.getAttribute(ApplicationAccess .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext) .anyTimes(); } Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionVModelTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionVModelTest.java?rev=884031&r1=884030&r2=884031&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionVModelTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionVModelTest.java Wed Nov 25 10:52:52 2009 @@ -37,7 +37,7 @@ import org.apache.tiles.ArrayStack; import org.apache.tiles.request.ApplicationContext; -import org.apache.tiles.request.util.ApplicationContextUtil; +import org.apache.tiles.request.util.ApplicationAccess; import org.apache.tiles.template.InsertDefinitionModel; import org.apache.tiles.velocity.context.VelocityTilesRequestContext; import org.apache.velocity.context.Context; @@ -81,7 +81,7 @@ tModel = createMock(InsertDefinitionModel.class); servletContext = createMock(ServletContext.class); applicationContext = createMock(ApplicationContext.class); - expect(servletContext.getAttribute(ApplicationContextUtil + expect(servletContext.getAttribute(ApplicationAccess .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext) .anyTimes(); } Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java?rev=884031&r1=884030&r2=884031&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java Wed Nov 25 10:52:52 2009 @@ -37,7 +37,7 @@ import org.apache.tiles.ArrayStack; import org.apache.tiles.request.ApplicationContext; -import org.apache.tiles.request.util.ApplicationContextUtil; +import org.apache.tiles.request.util.ApplicationAccess; import org.apache.tiles.template.InsertTemplateModel; import org.apache.tiles.velocity.context.VelocityTilesRequestContext; import org.apache.velocity.context.Context; @@ -81,7 +81,7 @@ tModel = createMock(InsertTemplateModel.class); servletContext = createMock(ServletContext.class); applicationContext = createMock(ApplicationContext.class); - expect(servletContext.getAttribute(ApplicationContextUtil + expect(servletContext.getAttribute(ApplicationAccess .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext) .anyTimes(); } Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java?rev=884031&r1=884030&r2=884031&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java Wed Nov 25 10:52:52 2009 @@ -34,7 +34,7 @@ import org.apache.tiles.ArrayStack; import org.apache.tiles.request.ApplicationContext; -import org.apache.tiles.request.util.ApplicationContextUtil; +import org.apache.tiles.request.util.ApplicationAccess; import org.apache.tiles.template.PutAttributeModel; import org.apache.tiles.velocity.context.VelocityTilesRequestContext; import org.apache.tiles.velocity.context.VelocityUtil; @@ -77,7 +77,7 @@ tModel = createMock(PutAttributeModel.class); servletContext = createMock(ServletContext.class); applicationContext = createMock(ApplicationContext.class); - expect(servletContext.getAttribute(ApplicationContextUtil + expect(servletContext.getAttribute(ApplicationAccess .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext) .anyTimes(); } Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeVModelTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeVModelTest.java?rev=884031&r1=884030&r2=884031&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeVModelTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeVModelTest.java Wed Nov 25 10:52:52 2009 @@ -34,7 +34,7 @@ import org.apache.tiles.ArrayStack; import org.apache.tiles.request.ApplicationContext; -import org.apache.tiles.request.util.ApplicationContextUtil; +import org.apache.tiles.request.util.ApplicationAccess; import org.apache.tiles.template.PutListAttributeModel; import org.apache.tiles.velocity.context.VelocityTilesRequestContext; import org.apache.tiles.velocity.context.VelocityUtil; @@ -77,7 +77,7 @@ tModel = createMock(PutListAttributeModel.class); servletContext = createMock(ServletContext.class); applicationContext = createMock(ApplicationContext.class); - expect(servletContext.getAttribute(ApplicationContextUtil + expect(servletContext.getAttribute(ApplicationAccess .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext) .anyTimes(); } 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=884031&r1=884030&r2=884031&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 Wed Nov 25 10:52:52 2009 @@ -40,7 +40,7 @@ import org.apache.tiles.TilesContainer; import org.apache.tiles.access.TilesAccess; import org.apache.tiles.request.ApplicationContext; -import org.apache.tiles.request.util.ApplicationContextUtil; +import org.apache.tiles.request.util.ApplicationAccess; import org.apache.tiles.velocity.context.VelocityTilesRequestContext; import org.apache.velocity.context.Context; import org.apache.velocity.context.InternalContextAdapter; @@ -105,7 +105,7 @@ ApplicationContext applicationContext = createMock(ApplicationContext.class); Attribute attribute = new Attribute("myValue"); - expect(servletContext.getAttribute(ApplicationContextUtil + expect(servletContext.getAttribute(ApplicationAccess .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext) .anyTimes(); expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)) @@ -177,7 +177,7 @@ StringWriter writer = new StringWriter(); Attribute attribute = new Attribute("myValue"); - expect(servletContext.getAttribute(ApplicationContextUtil + expect(servletContext.getAttribute(ApplicationAccess .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext) .anyTimes(); expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)) @@ -203,7 +203,7 @@ ApplicationContext applicationContext = createMock(ApplicationContext.class); StringWriter writer = new StringWriter(); - expect(servletContext.getAttribute(ApplicationContextUtil + expect(servletContext.getAttribute(ApplicationAccess .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext) .anyTimes(); expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)) @@ -228,7 +228,7 @@ ApplicationContext applicationContext = createMock(ApplicationContext.class); StringWriter writer = new StringWriter(); - expect(servletContext.getAttribute(ApplicationContextUtil + expect(servletContext.getAttribute(ApplicationAccess .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext) .anyTimes(); expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)) @@ -251,7 +251,7 @@ AttributeContext attributeContext = createMock(AttributeContext.class); ApplicationContext applicationContext = createMock(ApplicationContext.class); - expect(servletContext.getAttribute(ApplicationContextUtil + expect(servletContext.getAttribute(ApplicationAccess .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext) .anyTimes(); expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)) @@ -274,7 +274,7 @@ AttributeContext attributeContext = createMock(AttributeContext.class); ApplicationContext applicationContext = createMock(ApplicationContext.class); - expect(servletContext.getAttribute(ApplicationContextUtil + expect(servletContext.getAttribute(ApplicationAccess .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext) .anyTimes(); expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)) @@ -296,7 +296,7 @@ AttributeContext attributeContext = createMock(AttributeContext.class); ApplicationContext applicationContext = createMock(ApplicationContext.class); - expect(servletContext.getAttribute(ApplicationContextUtil + expect(servletContext.getAttribute(ApplicationAccess .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext) .anyTimes(); expect(request.getAttribute(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME)) @@ -321,7 +321,7 @@ Map<String, Object> applicationScope = new HashMap<String, Object>(); applicationScope.put("myKey", container); - expect(servletContext.getAttribute(ApplicationContextUtil + expect(servletContext.getAttribute(ApplicationAccess .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext) .anyTimes(); expect(applicationContext.getApplicationScope()).andReturn(applicationScope);
