Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutListAttributeVModel.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutListAttributeVModel.java?rev=892369&r1=892368&r2=892369&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutListAttributeVModel.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutListAttributeVModel.java Fri Dec 18 20:21:36 2009 @@ -29,8 +29,8 @@ import org.apache.tiles.request.Request; import org.apache.tiles.request.servlet.ServletUtil; +import org.apache.tiles.request.velocity.VelocityRequest; import org.apache.tiles.template.PutListAttributeModel; -import org.apache.tiles.velocity.context.VelocityTilesRequestContext; import org.apache.tiles.velocity.context.VelocityUtil; import org.apache.velocity.context.Context; import org.apache.velocity.runtime.Renderable; @@ -74,7 +74,7 @@ Context velocityContext) { Map<String, Object> params = VelocityUtil.getParameterStack( velocityContext).pop(); - Request currentRequest = VelocityTilesRequestContext + Request currentRequest = VelocityRequest .createVelocityRequest(ServletUtil .getApplicationContext(servletContext), request, response, velocityContext, null); @@ -89,7 +89,7 @@ public void start(HttpServletRequest request, HttpServletResponse response, Context velocityContext, Map<String, Object> params) { VelocityUtil.getParameterStack(velocityContext).push(params); - Request currentRequest = VelocityTilesRequestContext + Request currentRequest = VelocityRequest .createVelocityRequest(ServletUtil .getApplicationContext(servletContext), request, response, velocityContext, null);
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java?rev=892369&r1=892368&r2=892369&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java Fri Dec 18 20:21:36 2009 @@ -32,7 +32,7 @@ import org.apache.tiles.access.TilesAccess; import org.apache.tiles.request.Request; import org.apache.tiles.request.servlet.ServletUtil; -import org.apache.tiles.velocity.context.VelocityTilesRequestContext; +import org.apache.tiles.request.velocity.VelocityRequest; import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.runtime.Renderable; @@ -233,7 +233,7 @@ protected Request createVelocityRequest( ServletContext servletContext, Writer writer) { - return VelocityTilesRequestContext.createVelocityRequest(ServletUtil + return VelocityRequest.createVelocityRequest(ServletUtil .getApplicationContext(servletContext), getRequest(), getResponse(), getVelocityContext(), writer); } 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=892369&r1=892368&r2=892369&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 Fri Dec 18 20:21:36 2009 @@ -35,8 +35,8 @@ import org.apache.tiles.ArrayStack; import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.util.ApplicationAccess; +import org.apache.tiles.request.velocity.VelocityRequest; import org.apache.tiles.template.AddAttributeModel; -import org.apache.tiles.velocity.context.VelocityTilesRequestContext; import org.apache.tiles.velocity.context.VelocityUtil; import org.apache.velocity.context.Context; import org.junit.Before; @@ -96,7 +96,7 @@ Map<String, Object> params = createParams(); tModel.execute(eq("myValue"), eq("myExpression"), (String) isNull(), - eq("myRole"), eq("myType"), isA(VelocityTilesRequestContext.class)); + eq("myRole"), eq("myType"), isA(VelocityRequest.class)); replay(tModel, request, response, velocityContext, servletContext, applicationContext); assertEquals(VelocityUtil.EMPTY_RENDERABLE, model.execute(request, response, velocityContext, params)); @@ -117,7 +117,7 @@ ArrayStack<Map<String, Object>> parameterMapStack = new ArrayStack<Map<String, Object>>(); expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(parameterMapStack); - tModel.start(isA(VelocityTilesRequestContext.class)); + tModel.start(isA(VelocityRequest.class)); replay(tModel, request, response, velocityContext, servletContext, applicationContext); model.start(request, response, velocityContext, params); @@ -142,7 +142,7 @@ expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(parameterMapStack); tModel.end(eq("myValue"), eq("myExpression"), (String) isNull(), - eq("myRole"), eq("myType"), isA(VelocityTilesRequestContext.class)); + eq("myRole"), eq("myType"), isA(VelocityRequest.class)); replay(tModel, request, response, velocityContext, applicationContext); assertEquals(VelocityUtil.EMPTY_RENDERABLE, model.end(request, response, velocityContext)); 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=892369&r1=892368&r2=892369&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 Fri Dec 18 20:21:36 2009 @@ -34,8 +34,8 @@ import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.util.ApplicationAccess; +import org.apache.tiles.request.velocity.VelocityRequest; import org.apache.tiles.template.AddListAttributeModel; -import org.apache.tiles.velocity.context.VelocityTilesRequestContext; import org.apache.tiles.velocity.context.VelocityUtil; import org.apache.velocity.context.Context; import org.junit.Before; @@ -89,7 +89,7 @@ Context velocityContext = createMock(Context.class); Map<String, Object> params = createParams(); - tModel.start(eq("myRole"), isA(VelocityTilesRequestContext.class)); + tModel.start(eq("myRole"), isA(VelocityRequest.class)); replay(tModel, request, response, velocityContext, servletContext, applicationContext); model.start(request, response, velocityContext, params); @@ -107,7 +107,7 @@ HttpServletResponse response = createMock(HttpServletResponse.class); Context velocityContext = createMock(Context.class); - tModel.end(isA(VelocityTilesRequestContext.class)); + tModel.end(isA(VelocityRequest.class)); replay(tModel, request, response, velocityContext, servletContext, applicationContext); assertEquals(VelocityUtil.EMPTY_RENDERABLE, model.end(request, response, velocityContext)); 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=892369&r1=892368&r2=892369&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 Fri Dec 18 20:21:36 2009 @@ -35,8 +35,8 @@ import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.util.ApplicationAccess; +import org.apache.tiles.request.velocity.VelocityRequest; import org.apache.tiles.template.DefinitionModel; -import org.apache.tiles.velocity.context.VelocityTilesRequestContext; import org.apache.tiles.velocity.context.VelocityUtil; import org.apache.velocity.context.Context; import org.junit.Before; @@ -90,7 +90,7 @@ Map<String, Object> params = createParams(); tModel.execute(eq("myName"), eq("myTemplate"), eq("myRole"), - eq("myExtends"), eq("myPreparer"), isA(VelocityTilesRequestContext.class)); + eq("myExtends"), eq("myPreparer"), isA(VelocityRequest.class)); replay(tModel, servletContext, request, response, velocityContext, applicationContext); initializeModel(); @@ -112,7 +112,7 @@ tModel.start(eq("myName"), eq("myTemplate"), eq("myRole"), eq("myExtends"), eq("myPreparer"), - isA(VelocityTilesRequestContext.class)); + isA(VelocityRequest.class)); replay(tModel, servletContext, request, response, velocityContext); initializeModel(); @@ -132,7 +132,7 @@ HttpServletResponse response = createMock(HttpServletResponse.class); Context velocityContext = createMock(Context.class); - tModel.end(isA(VelocityTilesRequestContext.class)); + tModel.end(isA(VelocityRequest.class)); replay(tModel, servletContext, request, response, velocityContext, applicationContext); initializeModel(); 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=892369&r1=892368&r2=892369&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 Fri Dec 18 20:21:36 2009 @@ -39,8 +39,8 @@ import org.apache.tiles.Attribute; import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.util.ApplicationAccess; +import org.apache.tiles.request.velocity.VelocityRequest; import org.apache.tiles.template.GetAsStringModel; -import org.apache.tiles.velocity.context.VelocityTilesRequestContext; import org.apache.velocity.context.Context; import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.runtime.Renderable; @@ -110,7 +110,7 @@ Map<String, Object> params = createParams(); tModel.execute(eq(false), eq("myPreparer"), eq("myRole"), eq("myDefaultValue"), eq("myDefaultValueRole"), eq("myDefaultValueType"), - eq("myName"), eq(attribute), isA(VelocityTilesRequestContext.class)); + eq("myName"), eq(attribute), isA(VelocityRequest.class)); replay(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext); initializeModel(); @@ -134,7 +134,7 @@ expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack); tModel.start(eq(false), eq("myPreparer"), eq("myRole"), eq("myDefaultValue"), eq("myDefaultValueRole"), eq("myDefaultValueType"), - eq("myName"), eq(attribute), isA(VelocityTilesRequestContext.class)); + eq("myName"), eq(attribute), isA(VelocityRequest.class)); replay(tModel, servletContext, request, response, velocityContext, applicationContext); initializeModel(); @@ -162,7 +162,7 @@ paramStack.push(params); expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack); - tModel.end(eq(false), isA(VelocityTilesRequestContext.class)); + tModel.end(eq(false), isA(VelocityRequest.class)); replay(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext); initializeModel(); 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=892369&r1=892368&r2=892369&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 Fri Dec 18 20:21:36 2009 @@ -41,8 +41,8 @@ import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.util.ApplicationAccess; +import org.apache.tiles.request.velocity.VelocityRequest; import org.apache.tiles.template.ImportAttributeModel; -import org.apache.tiles.velocity.context.VelocityTilesRequestContext; import org.apache.velocity.context.Context; import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.runtime.Renderable; @@ -99,7 +99,7 @@ Writer writer = new StringWriter(); Map<String, Object> params = createParams(); - tModel.execute(eq("myName"), (String) isNull(), eq("myToName"), eq(false), isA(VelocityTilesRequestContext.class)); + tModel.execute(eq("myName"), (String) isNull(), eq("myToName"), eq(false), isA(VelocityRequest.class)); replay(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext); initializeModel(); @@ -124,7 +124,7 @@ Map<String, Object> params = createParams(); params.put("scope", "request"); - tModel.execute(eq("myName"), eq("request"), eq("myToName"), eq(false), isA(VelocityTilesRequestContext.class)); + tModel.execute(eq("myName"), eq("request"), eq("myToName"), eq(false), isA(VelocityRequest.class)); replay(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext); initializeModel(); @@ -149,7 +149,7 @@ Map<String, Object> params = createParams(); params.put("scope", "session"); - tModel.execute(eq("myName"), eq("session"), eq("myToName"), eq(false), isA(VelocityTilesRequestContext.class)); + tModel.execute(eq("myName"), eq("session"), eq("myToName"), eq(false), isA(VelocityRequest.class)); replay(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext); initializeModel(); @@ -174,7 +174,7 @@ Map<String, Object> params = createParams(); params.put("scope", "application"); - tModel.execute(eq("myName"), eq("application"), eq("myToName"), eq(false), isA(VelocityTilesRequestContext.class)); + tModel.execute(eq("myName"), eq("application"), eq("myToName"), eq(false), isA(VelocityRequest.class)); replay(tModel, servletContext, request, response, velocityContext, 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=892369&r1=892368&r2=892369&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 Fri Dec 18 20:21:36 2009 @@ -39,8 +39,8 @@ import org.apache.tiles.Attribute; import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.util.ApplicationAccess; +import org.apache.tiles.request.velocity.VelocityRequest; import org.apache.tiles.template.InsertAttributeModel; -import org.apache.tiles.velocity.context.VelocityTilesRequestContext; import org.apache.velocity.context.Context; import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.runtime.Renderable; @@ -110,7 +110,7 @@ Map<String, Object> params = createParams(); tModel.execute(eq(false), eq("myPreparer"), eq("myRole"), eq("myDefaultValue"), eq("myDefaultValueRole"), - eq("myDefaultValueType"), eq("myName"), eq(attribute), isA(VelocityTilesRequestContext.class)); + eq("myDefaultValueType"), eq("myName"), eq(attribute), isA(VelocityRequest.class)); replay(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext); initializeModel(); @@ -134,7 +134,7 @@ expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack); tModel.start(eq(false), eq("myPreparer"), eq("myRole"), eq("myDefaultValue"), eq("myDefaultValueRole"), eq("myDefaultValueType"), - eq("myName"), eq(attribute), isA(VelocityTilesRequestContext.class)); + eq("myName"), eq(attribute), isA(VelocityRequest.class)); replay(tModel, servletContext, request, response, velocityContext, applicationContext); initializeModel(); @@ -162,7 +162,7 @@ paramStack.push(params); expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack); - tModel.end(eq(false), isA(VelocityTilesRequestContext.class)); + tModel.end(eq(false), isA(VelocityRequest.class)); replay(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext); initializeModel(); 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=892369&r1=892368&r2=892369&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 Fri Dec 18 20:21:36 2009 @@ -38,8 +38,8 @@ import org.apache.tiles.ArrayStack; import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.util.ApplicationAccess; +import org.apache.tiles.request.velocity.VelocityRequest; import org.apache.tiles.template.InsertDefinitionModel; -import org.apache.tiles.velocity.context.VelocityTilesRequestContext; import org.apache.velocity.context.Context; import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.runtime.Renderable; @@ -103,7 +103,7 @@ tModel.execute(eq("myDefinitionName"), eq("myTemplate"), eq("myTemplateType"), eq("myTemplateExpression"), eq("myRole"), eq("myPreparer"), - isA(VelocityTilesRequestContext.class)); + isA(VelocityRequest.class)); replay(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext); initializeModel(); @@ -126,7 +126,7 @@ ArrayStack<Map<String, Object>> paramStack = new ArrayStack<Map<String, Object>>(); expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack); - tModel.start(isA(VelocityTilesRequestContext.class)); + tModel.start(isA(VelocityRequest.class)); replay(tModel, servletContext, request, response, velocityContext, applicationContext); initializeModel(); @@ -156,7 +156,7 @@ expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack); tModel.end(eq("myDefinitionName"), eq("myTemplate"), eq("myTemplateType"), eq("myTemplateExpression"), eq("myRole"), eq("myPreparer"), - isA(VelocityTilesRequestContext.class)); + isA(VelocityRequest.class)); replay(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext); initializeModel(); 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=892369&r1=892368&r2=892369&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 Fri Dec 18 20:21:36 2009 @@ -38,8 +38,8 @@ import org.apache.tiles.ArrayStack; import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.util.ApplicationAccess; +import org.apache.tiles.request.velocity.VelocityRequest; import org.apache.tiles.template.InsertTemplateModel; -import org.apache.tiles.velocity.context.VelocityTilesRequestContext; import org.apache.velocity.context.Context; import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.runtime.Renderable; @@ -103,7 +103,7 @@ ApplicationContext applicationContext = createMock(ApplicationContext.class); tModel.execute(eq("myTemplate"), eq("myTemplateType"), eq("myTemplateExpression"), - eq("myRole"), eq("myPreparer"), isA(VelocityTilesRequestContext.class)); + eq("myRole"), eq("myPreparer"), isA(VelocityRequest.class)); replay(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext); initializeModel(); @@ -126,7 +126,7 @@ ArrayStack<Map<String, Object>> paramStack = new ArrayStack<Map<String, Object>>(); expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack); - tModel.start(isA(VelocityTilesRequestContext.class)); + tModel.start(isA(VelocityRequest.class)); replay(tModel, servletContext, request, response, velocityContext, applicationContext); initializeModel(); @@ -156,7 +156,7 @@ expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack); tModel.end(eq("myTemplate"), eq("myTemplateType"), eq("myTemplateExpression"), eq("myRole"), eq("myPreparer"), - isA(VelocityTilesRequestContext.class)); + isA(VelocityRequest.class)); replay(tModel, servletContext, request, response, velocityContext, internalContextAdapter, applicationContext); initializeModel(); 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=892369&r1=892368&r2=892369&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 Fri Dec 18 20:21:36 2009 @@ -35,8 +35,8 @@ import org.apache.tiles.ArrayStack; import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.util.ApplicationAccess; +import org.apache.tiles.request.velocity.VelocityRequest; import org.apache.tiles.template.PutAttributeModel; -import org.apache.tiles.velocity.context.VelocityTilesRequestContext; import org.apache.tiles.velocity.context.VelocityUtil; import org.apache.velocity.context.Context; import org.junit.Before; @@ -95,7 +95,7 @@ Map<String, Object> params = createParams(); tModel.execute(eq("myName"), eq("myValue"), eq("myExpression"), (String) isNull(), - eq("myRole"), eq("myType"), eq(false), isA(VelocityTilesRequestContext.class)); + eq("myRole"), eq("myType"), eq(false), isA(VelocityRequest.class)); replay(tModel, servletContext, request, response, velocityContext, applicationContext); initializeModel(); @@ -117,7 +117,7 @@ ArrayStack<Map<String, Object>> parameterMapStack = new ArrayStack<Map<String, Object>>(); expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(parameterMapStack); - tModel.start(isA(VelocityTilesRequestContext.class)); + tModel.start(isA(VelocityRequest.class)); replay(tModel, servletContext, request, response, velocityContext, applicationContext); initializeModel(); @@ -143,7 +143,7 @@ expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(parameterMapStack); tModel.end(eq("myName"), eq("myValue"), eq("myExpression"), (String) isNull(), - eq("myRole"), eq("myType"), eq(false), isA(VelocityTilesRequestContext.class)); + eq("myRole"), eq("myType"), eq(false), isA(VelocityRequest.class)); replay(tModel, servletContext, request, response, velocityContext, applicationContext); initializeModel(); 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=892369&r1=892368&r2=892369&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 Fri Dec 18 20:21:36 2009 @@ -35,8 +35,8 @@ import org.apache.tiles.ArrayStack; import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.util.ApplicationAccess; +import org.apache.tiles.request.velocity.VelocityRequest; import org.apache.tiles.template.PutListAttributeModel; -import org.apache.tiles.velocity.context.VelocityTilesRequestContext; import org.apache.tiles.velocity.context.VelocityUtil; import org.apache.velocity.context.Context; import org.junit.Before; @@ -96,7 +96,7 @@ ArrayStack<Map<String, Object>> parameterMapStack = new ArrayStack<Map<String, Object>>(); expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(parameterMapStack); - tModel.start(eq("myRole"), eq(false), isA(VelocityTilesRequestContext.class)); + tModel.start(eq("myRole"), eq(false), isA(VelocityRequest.class)); replay(tModel, servletContext, request, response, velocityContext, applicationContext); initializeModel(); @@ -121,7 +121,7 @@ parameterMapStack.push(params); expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(parameterMapStack); - tModel.end(eq("myName"), eq(false), isA(VelocityTilesRequestContext.class)); + tModel.end(eq("myName"), eq(false), isA(VelocityRequest.class)); replay(tModel, servletContext, request, response, velocityContext, applicationContext); initializeModel(); Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java?rev=892369&r1=892368&r2=892369&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java Fri Dec 18 20:21:36 2009 @@ -32,8 +32,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.tiles.TilesContainer; -import org.apache.tiles.access.TilesAccess; import org.apache.velocity.context.Context; import org.apache.velocity.runtime.Renderable; import org.junit.Before; 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=892369&r1=892368&r2=892369&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java Fri Dec 18 20:21:36 2009 @@ -47,7 +47,7 @@ import org.apache.tiles.request.ApplicationContext; import org.apache.tiles.request.scope.ContextResolver; import org.apache.tiles.request.util.ApplicationAccess; -import org.apache.tiles.velocity.context.VelocityTilesRequestContext; +import org.apache.tiles.request.velocity.VelocityRequest; import org.apache.velocity.context.Context; import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.runtime.Renderable; @@ -117,12 +117,12 @@ applicationScope.put(ApplicationAccess.CONTEXT_RESOLVER_ATTRIBUTE, resolver); expect(applicationContext.getApplicationScope()).andReturn(applicationScope).anyTimes(); - expect(resolver.getContext(isA(VelocityTilesRequestContext.class), + expect(resolver.getContext(isA(VelocityRequest.class), eq("request"))).andReturn(requestScope).anyTimes(); expect(servletContext.getAttribute(ApplicationAccess .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext) .anyTimes(); - expect(container.getAttributeContext(isA(VelocityTilesRequestContext.class))) + expect(container.getAttributeContext(isA(VelocityRequest.class))) .andReturn(attributeContext); expect(attributeContext.getAttribute("myAttribute")).andReturn(attribute); @@ -195,12 +195,12 @@ applicationScope.put(ApplicationAccess.CONTEXT_RESOLVER_ATTRIBUTE, resolver); expect(applicationContext.getApplicationScope()).andReturn(applicationScope).anyTimes(); - expect(resolver.getContext(isA(VelocityTilesRequestContext.class), + expect(resolver.getContext(isA(VelocityRequest.class), eq("request"))).andReturn(requestScope).anyTimes(); expect(servletContext.getAttribute(ApplicationAccess .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext) .anyTimes(); - container.render(eq(attribute), isA(VelocityTilesRequestContext.class)); + container.render(eq(attribute), isA(VelocityRequest.class)); replay(velocityContext, request, response, servletContext, container, internalContextAdapter, applicationContext, resolver); @@ -229,12 +229,12 @@ applicationScope.put(ApplicationAccess.CONTEXT_RESOLVER_ATTRIBUTE, resolver); expect(applicationContext.getApplicationScope()).andReturn(applicationScope).anyTimes(); - expect(resolver.getContext(isA(VelocityTilesRequestContext.class), + expect(resolver.getContext(isA(VelocityRequest.class), eq("request"))).andReturn(requestScope).anyTimes(); expect(servletContext.getAttribute(ApplicationAccess .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext) .anyTimes(); - container.render(eq("myDefinition"), isA(VelocityTilesRequestContext.class)); + container.render(eq("myDefinition"), isA(VelocityRequest.class)); replay(velocityContext, request, response, servletContext, container, internalContextAdapter, applicationContext, resolver); @@ -262,12 +262,12 @@ applicationScope.put(ApplicationAccess.CONTEXT_RESOLVER_ATTRIBUTE, resolver); expect(applicationContext.getApplicationScope()).andReturn(applicationScope).anyTimes(); - expect(resolver.getContext(isA(VelocityTilesRequestContext.class), + expect(resolver.getContext(isA(VelocityRequest.class), eq("request"))).andReturn(requestScope).anyTimes(); expect(servletContext.getAttribute(ApplicationAccess .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext) .anyTimes(); - container.renderContext(isA(VelocityTilesRequestContext.class)); + container.renderContext(isA(VelocityRequest.class)); replay(velocityContext, request, response, servletContext, container, internalContextAdapter, applicationContext, resolver); @@ -293,12 +293,12 @@ applicationScope.put(ApplicationAccess.CONTEXT_RESOLVER_ATTRIBUTE, resolver); expect(applicationContext.getApplicationScope()).andReturn(applicationScope).anyTimes(); - expect(resolver.getContext(isA(VelocityTilesRequestContext.class), + expect(resolver.getContext(isA(VelocityRequest.class), eq("request"))).andReturn(requestScope).anyTimes(); expect(servletContext.getAttribute(ApplicationAccess .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext) .anyTimes(); - expect(container.startContext(isA(VelocityTilesRequestContext.class))) + expect(container.startContext(isA(VelocityRequest.class))) .andReturn(attributeContext); replay(velocityContext, request, response, servletContext, container, @@ -324,12 +324,12 @@ applicationScope.put(ApplicationAccess.CONTEXT_RESOLVER_ATTRIBUTE, resolver); expect(applicationContext.getApplicationScope()).andReturn(applicationScope).anyTimes(); - expect(resolver.getContext(isA(VelocityTilesRequestContext.class), + expect(resolver.getContext(isA(VelocityRequest.class), eq("request"))).andReturn(requestScope).anyTimes(); expect(servletContext.getAttribute(ApplicationAccess .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext) .anyTimes(); - container.endContext(isA(VelocityTilesRequestContext.class)); + container.endContext(isA(VelocityRequest.class)); replay(velocityContext, request, response, servletContext, container, attributeContext, applicationContext, resolver); @@ -354,12 +354,12 @@ applicationScope.put(ApplicationAccess.CONTEXT_RESOLVER_ATTRIBUTE, resolver); expect(applicationContext.getApplicationScope()).andReturn(applicationScope).anyTimes(); - expect(resolver.getContext(isA(VelocityTilesRequestContext.class), + expect(resolver.getContext(isA(VelocityRequest.class), eq("request"))).andReturn(requestScope).anyTimes(); expect(servletContext.getAttribute(ApplicationAccess .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext) .anyTimes(); - expect(container.getAttributeContext(isA(VelocityTilesRequestContext.class))) + expect(container.getAttributeContext(isA(VelocityRequest.class))) .andReturn(attributeContext); replay(velocityContext, request, response, servletContext, container, @@ -385,7 +385,7 @@ applicationScope.put(ApplicationAccess.CONTEXT_RESOLVER_ATTRIBUTE, resolver); expect(applicationContext.getApplicationScope()).andReturn(applicationScope).anyTimes(); - expect(resolver.getContext(isA(VelocityTilesRequestContext.class), + expect(resolver.getContext(isA(VelocityRequest.class), eq("request"))).andReturn(requestScope).anyTimes(); expect(servletContext.getAttribute(ApplicationAccess .APPLICATION_CONTEXT_ATTRIBUTE)).andReturn(applicationContext)
