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/07 20:17:16 UTC
svn commit: r833737 [3/4] - in /tiles/sandbox/trunk:
tiles-request/tiles-request-api/
tiles-request/tiles-request-api/src/main/java/org/
tiles-request/tiles-request-api/src/main/java/org/apache/
tiles-request/tiles-request-api/src/main/java/org/apache/...
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/startup/DefaultTilesInitializerTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/startup/DefaultTilesInitializerTest.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/startup/DefaultTilesInitializerTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/startup/DefaultTilesInitializerTest.java Sat Nov 7 19:17:09 2009
@@ -24,8 +24,8 @@
import static org.junit.Assert.*;
import static org.easymock.EasyMock.*;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.factory.BasicTilesContainerFactory;
+import org.apache.tiles.request.ApplicationContext;
import org.junit.Test;
/**
@@ -36,11 +36,11 @@
public class DefaultTilesInitializerTest {
/**
- * Test method for {@link DefaultTilesInitializer#createContainerFactory(TilesApplicationContext)}.
+ * Test method for {@link DefaultTilesInitializer#createContainerFactory(ApplicationContext)}.
*/
@Test
public void testCreateContainerFactory() {
- TilesApplicationContext context = createMock(TilesApplicationContext.class);
+ ApplicationContext context = createMock(ApplicationContext.class);
replay(context);
DefaultTilesInitializer initializer = new DefaultTilesInitializer();
Modified: tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.java Sat Nov 7 19:17:09 2009
@@ -24,15 +24,15 @@
import javax.el.ExpressionFactory;
import javax.el.ValueExpression;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.awareness.TilesApplicationContextAware;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.evaluator.AbstractAttributeEvaluator;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
/**
* Evaluates string expression with typical EL syntax.<br>
* You can use normal EL syntax, knowing that the root objects are
- * {@link TilesRequestContext}, {@link TilesApplicationContext} and beans
+ * {@link Request}, {@link ApplicationContext} and beans
* contained in request, session and application scope.
*
* @version $Rev$ $Date$
@@ -55,7 +55,7 @@
*
* @since 2.2.1
*/
- protected TilesApplicationContext applicationContext;
+ protected ApplicationContext applicationContext;
/**
* The EL expression factory.
@@ -80,7 +80,7 @@
}
/** {@inheritDoc} */
- public void setApplicationContext(TilesApplicationContext applicationContext) {
+ public void setApplicationContext(ApplicationContext applicationContext) {
this.applicationContext = applicationContext;
}
@@ -105,10 +105,10 @@
}
/** {@inheritDoc} */
- public Object evaluate(String expression, TilesRequestContext request) {
+ public Object evaluate(String expression, Request request) {
ELContextImpl context = new ELContextImpl(resolver);
- context.putContext(TilesRequestContext.class, request);
- context.putContext(TilesApplicationContext.class,
+ context.putContext(Request.class, request);
+ context.putContext(ApplicationContext.class,
applicationContext);
ValueExpression valueExpression = expressionFactory
.createValueExpression(context, expression, Object.class);
Modified: tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java Sat Nov 7 19:17:09 2009
@@ -25,8 +25,8 @@
import javax.servlet.ServletContext;
import javax.servlet.jsp.JspFactory;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.awareness.TilesApplicationContextAware;
+import org.apache.tiles.request.ApplicationContext;
/**
* Uses the JSP 2.1 {@link ExpressionFactory} to be used in Tiles.
@@ -45,7 +45,7 @@
protected ServletContext servletContext;
/** {@inheritDoc} */
- public void setApplicationContext(TilesApplicationContext applicationContext) {
+ public void setApplicationContext(ApplicationContext applicationContext) {
Object context = applicationContext.getContext();
if (context instanceof ServletContext) {
this.servletContext = (ServletContext) context;
Modified: tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java Sat Nov 7 19:17:09 2009
@@ -29,8 +29,8 @@
import javax.el.ELContext;
import javax.el.ELResolver;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
/**
* Resolves beans in request, session and application scope.
@@ -57,13 +57,13 @@
Object base) {
List<FeatureDescriptor> list = new ArrayList<FeatureDescriptor>();
- TilesRequestContext request = (TilesRequestContext) context
- .getContext(TilesRequestContext.class);
+ Request request = (Request) context
+ .getContext(Request.class);
collectBeanInfo(request.getRequestScope(), list);
collectBeanInfo(request.getSessionScope(), list);
- TilesApplicationContext applicationContext = (TilesApplicationContext) context
- .getContext(TilesApplicationContext.class);
+ ApplicationContext applicationContext = (ApplicationContext) context
+ .getContext(ApplicationContext.class);
collectBeanInfo(applicationContext.getApplicationScope(), list);
return list.iterator();
}
@@ -154,8 +154,8 @@
protected Object findObjectByProperty(ELContext context, Object property) {
Object retValue = null;
- TilesRequestContext request = (TilesRequestContext) context
- .getContext(TilesRequestContext.class);
+ Request request = (Request) context
+ .getContext(Request.class);
String prop = property.toString();
@@ -163,8 +163,8 @@
if (retValue == null) {
retValue = getObject(request.getSessionScope(), prop);
if (retValue == null) {
- TilesApplicationContext applicationContext = (TilesApplicationContext) context
- .getContext(TilesApplicationContext.class);
+ ApplicationContext applicationContext = (ApplicationContext) context
+ .getContext(ApplicationContext.class);
retValue = getObject(applicationContext.getApplicationScope(),
prop);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/TilesContextELResolver.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/TilesContextELResolver.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/TilesContextELResolver.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/TilesContextELResolver.java Sat Nov 7 19:17:09 2009
@@ -26,13 +26,13 @@
import javax.el.BeanELResolver;
import javax.el.ELContext;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
import org.apache.tiles.util.CombinedBeanInfo;
/**
- * Resolves properties of {@link TilesRequestContext} and
- * {@link TilesApplicationContext}.
+ * Resolves properties of {@link Request} and
+ * {@link ApplicationContext}.
*
* @version $Rev$ $Date$
* @since 2.2.1
@@ -40,10 +40,10 @@
public class TilesContextELResolver extends BeanELResolver {
/**
- * The beaninfos about {@link TilesRequestContext} and {@link TilesApplicationContext}.
+ * The beaninfos about {@link Request} and {@link ApplicationContext}.
*/
private CombinedBeanInfo requestBeanInfo = new CombinedBeanInfo(
- TilesRequestContext.class, TilesApplicationContext.class);
+ Request.class, ApplicationContext.class);
/** {@inheritDoc} */
@Override
@@ -77,13 +77,13 @@
}
Class<?> retValue = null;
- if (requestBeanInfo.getProperties(TilesRequestContext.class).contains(property)) {
- TilesRequestContext request = (TilesRequestContext) context
- .getContext(TilesRequestContext.class);
+ if (requestBeanInfo.getProperties(Request.class).contains(property)) {
+ Request request = (Request) context
+ .getContext(Request.class);
retValue = super.getType(context, request, property);
- } else if (requestBeanInfo.getProperties(TilesApplicationContext.class).contains(property)) {
- TilesApplicationContext applicationContext = (TilesApplicationContext) context
- .getContext(TilesApplicationContext.class);
+ } else if (requestBeanInfo.getProperties(ApplicationContext.class).contains(property)) {
+ ApplicationContext applicationContext = (ApplicationContext) context
+ .getContext(ApplicationContext.class);
retValue = super.getType(context, applicationContext, property);
}
@@ -104,14 +104,14 @@
Object retValue = null;
- if (requestBeanInfo.getProperties(TilesRequestContext.class).contains(property)) {
- TilesRequestContext request = (TilesRequestContext) context
- .getContext(TilesRequestContext.class);
+ if (requestBeanInfo.getProperties(Request.class).contains(property)) {
+ Request request = (Request) context
+ .getContext(Request.class);
retValue = super.getValue(context, request, property);
- } else if (requestBeanInfo.getProperties(TilesApplicationContext.class)
+ } else if (requestBeanInfo.getProperties(ApplicationContext.class)
.contains(property)) {
- TilesApplicationContext applicationContext = (TilesApplicationContext) context
- .getContext(TilesApplicationContext.class);
+ ApplicationContext applicationContext = (ApplicationContext) context
+ .getContext(ApplicationContext.class);
retValue = super.getValue(context, applicationContext, property);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java Sat Nov 7 19:17:09 2009
@@ -36,8 +36,8 @@
import org.apache.el.ExpressionFactoryImpl;
import org.apache.tiles.Attribute;
import org.apache.tiles.Expression;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
import org.easymock.EasyMock;
/**
@@ -55,7 +55,7 @@
/**
* The request object to use.
*/
- private TilesRequestContext request;
+ private Request request;
/** {@inheritDoc} */
@Override
@@ -69,13 +69,13 @@
sessionScope.put("object2", new Integer(1));
applicationScope.put("object3", new Float(2.0));
requestScope.put("paulaBean", new PaulaBean());
- request = EasyMock.createMock(TilesRequestContext.class);
+ request = EasyMock.createMock(Request.class);
EasyMock.expect(request.getRequestScope()).andReturn(requestScope)
.anyTimes();
EasyMock.expect(request.getSessionScope()).andReturn(sessionScope)
.anyTimes();
- TilesApplicationContext applicationContext = EasyMock
- .createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = EasyMock
+ .createMock(ApplicationContext.class);
EasyMock.expect(applicationContext.getApplicationScope()).andReturn(
applicationScope).anyTimes();
EasyMock.replay(request, applicationContext);
@@ -98,7 +98,7 @@
/**
* Tests
- * {@link ELAttributeEvaluator#evaluate(Attribute, TilesRequestContext)}.
+ * {@link ELAttributeEvaluator#evaluate(Attribute, Request)}.
*/
public void testEvaluate() {
Attribute attribute = new Attribute();
@@ -136,7 +136,7 @@
/**
* Tests
- * {@link ELAttributeEvaluator#evaluate(String, TilesRequestContext)}.
+ * {@link ELAttributeEvaluator#evaluate(String, Request)}.
*/
public void testEvaluateString() {
String expression = "${requestScope.object1}";
Modified: tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java Sat Nov 7 19:17:09 2009
@@ -29,10 +29,10 @@
import javax.el.ELContext;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.el.ELContextImpl;
import org.apache.tiles.el.TilesContextBeanELResolver;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
import org.easymock.EasyMock;
import junit.framework.TestCase;
@@ -78,21 +78,21 @@
requestScope.put("object1", "value");
sessionScope.put("object2", new Integer(1));
applicationScope.put("object3", new Float(2.0));
- TilesRequestContext request = EasyMock
- .createMock(TilesRequestContext.class);
+ Request request = EasyMock
+ .createMock(Request.class);
EasyMock.expect(request.getRequestScope()).andReturn(requestScope)
.anyTimes();
EasyMock.expect(request.getSessionScope()).andReturn(sessionScope)
.anyTimes();
- TilesApplicationContext applicationContext = EasyMock
- .createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = EasyMock
+ .createMock(ApplicationContext.class);
EasyMock.expect(applicationContext.getApplicationScope()).andReturn(
applicationScope).anyTimes();
EasyMock.replay(request, applicationContext);
ELContext context = new ELContextImpl(resolver);
- context.putContext(TilesRequestContext.class, request);
- context.putContext(TilesApplicationContext.class, applicationContext);
+ context.putContext(Request.class, request);
+ context.putContext(ApplicationContext.class, applicationContext);
List<FeatureDescriptor> expected = new ArrayList<FeatureDescriptor>();
resolver.collectBeanInfo(requestScope, expected);
@@ -137,21 +137,21 @@
requestScope.put("object1", "value");
sessionScope.put("object2", new Integer(1));
applicationScope.put("object3", new Float(2.0));
- TilesRequestContext request = EasyMock
- .createMock(TilesRequestContext.class);
+ Request request = EasyMock
+ .createMock(Request.class);
EasyMock.expect(request.getRequestScope()).andReturn(requestScope)
.anyTimes();
EasyMock.expect(request.getSessionScope()).andReturn(sessionScope)
.anyTimes();
- TilesApplicationContext applicationContext = EasyMock
- .createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = EasyMock
+ .createMock(ApplicationContext.class);
EasyMock.expect(applicationContext.getApplicationScope()).andReturn(
applicationScope).anyTimes();
EasyMock.replay(request, applicationContext);
ELContext context = new ELContextImpl(resolver);
- context.putContext(TilesRequestContext.class, request);
- context.putContext(TilesApplicationContext.class, applicationContext);
+ context.putContext(Request.class, request);
+ context.putContext(ApplicationContext.class, applicationContext);
assertEquals("The type is not correct", String.class, resolver.getType(
context, null, "object1"));
@@ -172,21 +172,21 @@
requestScope.put("object1", "value");
sessionScope.put("object2", new Integer(1));
applicationScope.put("object3", new Float(2.0));
- TilesRequestContext request = EasyMock
- .createMock(TilesRequestContext.class);
+ Request request = EasyMock
+ .createMock(Request.class);
EasyMock.expect(request.getRequestScope()).andReturn(requestScope)
.anyTimes();
EasyMock.expect(request.getSessionScope()).andReturn(sessionScope)
.anyTimes();
- TilesApplicationContext applicationContext = EasyMock
- .createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = EasyMock
+ .createMock(ApplicationContext.class);
EasyMock.expect(applicationContext.getApplicationScope()).andReturn(
applicationScope).anyTimes();
EasyMock.replay(request, applicationContext);
ELContext context = new ELContextImpl(resolver);
- context.putContext(TilesRequestContext.class, request);
- context.putContext(TilesApplicationContext.class, applicationContext);
+ context.putContext(Request.class, request);
+ context.putContext(ApplicationContext.class, applicationContext);
assertEquals("The value is not correct", "value", resolver.getValue(
context, null, "object1"));
@@ -217,21 +217,21 @@
requestScope.put("object1", "value");
sessionScope.put("object2", new Integer(1));
applicationScope.put("object3", new Float(2.0));
- TilesRequestContext request = EasyMock
- .createMock(TilesRequestContext.class);
+ Request request = EasyMock
+ .createMock(Request.class);
EasyMock.expect(request.getRequestScope()).andReturn(requestScope)
.anyTimes();
EasyMock.expect(request.getSessionScope()).andReturn(sessionScope)
.anyTimes();
- TilesApplicationContext applicationContext = EasyMock
- .createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = EasyMock
+ .createMock(ApplicationContext.class);
EasyMock.expect(applicationContext.getApplicationScope()).andReturn(
applicationScope).anyTimes();
EasyMock.replay(request, applicationContext);
ELContext context = new ELContextImpl(resolver);
- context.putContext(TilesRequestContext.class, request);
- context.putContext(TilesApplicationContext.class, applicationContext);
+ context.putContext(Request.class, request);
+ context.putContext(ApplicationContext.class, applicationContext);
assertEquals("The value is not correct", "value", resolver
.findObjectByProperty(context, "object1"));
Modified: tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java Sat Nov 7 19:17:09 2009
@@ -31,11 +31,11 @@
import junit.framework.TestCase;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.el.ELContextImpl;
import org.apache.tiles.el.TilesContextELResolver;
import org.apache.tiles.reflect.ClassUtil;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
import org.easymock.EasyMock;
/**
@@ -74,8 +74,8 @@
*/
public void testGetFeatureDescriptorsELContextObject() {
Map<String, PropertyDescriptor> expected = new LinkedHashMap<String, PropertyDescriptor>();
- ClassUtil.collectBeanInfo(TilesRequestContext.class, expected);
- ClassUtil.collectBeanInfo(TilesApplicationContext.class, expected);
+ ClassUtil.collectBeanInfo(Request.class, expected);
+ ClassUtil.collectBeanInfo(ApplicationContext.class, expected);
Iterator<FeatureDescriptor> featureIt = resolver.getFeatureDescriptors(
null, null);
Iterator<? extends FeatureDescriptor> expectedIt = expected.values().iterator();
@@ -92,14 +92,14 @@
* {@link TilesContextELResolver#getType(javax.el.ELContext, java.lang.Object, java.lang.Object)}.
*/
public void testGetType() {
- TilesRequestContext request = EasyMock
- .createMock(TilesRequestContext.class);
- TilesApplicationContext applicationContext = EasyMock
- .createMock(TilesApplicationContext.class);
+ Request request = EasyMock
+ .createMock(Request.class);
+ ApplicationContext applicationContext = EasyMock
+ .createMock(ApplicationContext.class);
ELContext context = new ELContextImpl(resolver);
EasyMock.replay(request, applicationContext);
- context.putContext(TilesRequestContext.class, request);
- context.putContext(TilesApplicationContext.class, applicationContext);
+ context.putContext(Request.class, request);
+ context.putContext(ApplicationContext.class, applicationContext);
assertEquals("The requestScope object is not a map.", Map.class,
resolver.getType(context, null, "requestScope"));
assertEquals("The sessionScope object is not a map.", Map.class,
@@ -119,18 +119,18 @@
sessionScope.put("sessionObjectKey", "sessionObjectValue");
Map<String, Object> applicationScope = new HashMap<String, Object>();
applicationScope.put("applicationObjectKey", "applicationObjectValue");
- TilesRequestContext request = EasyMock
- .createMock(TilesRequestContext.class);
+ Request request = EasyMock
+ .createMock(Request.class);
EasyMock.expect(request.getRequestScope()).andReturn(requestScope);
EasyMock.expect(request.getSessionScope()).andReturn(sessionScope);
- TilesApplicationContext applicationContext = EasyMock
- .createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = EasyMock
+ .createMock(ApplicationContext.class);
EasyMock.expect(applicationContext.getApplicationScope()).andReturn(
applicationScope);
ELContext context = new ELContextImpl(resolver);
EasyMock.replay(request, applicationContext);
- context.putContext(TilesRequestContext.class, request);
- context.putContext(TilesApplicationContext.class, applicationContext);
+ context.putContext(Request.class, request);
+ context.putContext(ApplicationContext.class, applicationContext);
assertEquals("The requestScope map does not correspond", requestScope,
resolver.getValue(context, null, "requestScope"));
assertEquals("The sessionScope map does not correspond", sessionScope,
Modified: tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java Sat Nov 7 19:17:09 2009
@@ -39,11 +39,9 @@
import ognl.OgnlRuntime;
import ognl.PropertyAccessor;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.compat.definition.digester.CompatibilityDigesterDefinitionsReader;
import org.apache.tiles.context.ChainedTilesRequestContextFactory;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextFactory;
import org.apache.tiles.context.TilesRequestContextHolder;
import org.apache.tiles.definition.DefinitionsFactoryException;
@@ -82,6 +80,8 @@
import org.apache.tiles.renderer.TypeDetectingAttributeRenderer;
import org.apache.tiles.renderer.impl.BasicRendererFactory;
import org.apache.tiles.renderer.impl.ChainedDelegateAttributeRenderer;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
import org.apache.tiles.util.URLUtil;
import org.apache.tiles.velocity.context.VelocityTilesRequestContextFactory;
import org.apache.tiles.velocity.renderer.VelocityAttributeRenderer;
@@ -118,7 +118,7 @@
/** {@inheritDoc} */
@Override
protected BasicTilesContainer instantiateContainer(
- TilesApplicationContext applicationContext) {
+ ApplicationContext applicationContext) {
return new CachingTilesContainer();
}
@@ -140,7 +140,7 @@
@Override
protected void registerAttributeRenderers(
BasicRendererFactory rendererFactory,
- TilesApplicationContext applicationContext,
+ ApplicationContext applicationContext,
TilesRequestContextFactory contextFactory,
TilesContainer container,
AttributeEvaluatorFactory attributeEvaluatorFactory) {
@@ -174,7 +174,7 @@
@Override
protected AttributeRenderer createDefaultAttributeRenderer(
BasicRendererFactory rendererFactory,
- TilesApplicationContext applicationContext,
+ ApplicationContext applicationContext,
TilesRequestContextFactory contextFactory,
TilesContainer container,
AttributeEvaluatorFactory attributeEvaluatorFactory) {
@@ -198,7 +198,7 @@
/** {@inheritDoc} */
@Override
protected AttributeEvaluatorFactory createAttributeEvaluatorFactory(
- TilesApplicationContext applicationContext,
+ ApplicationContext applicationContext,
TilesRequestContextFactory contextFactory, LocaleResolver resolver) {
BasicAttributeEvaluatorFactory attributeEvaluatorFactory = new BasicAttributeEvaluatorFactory(
createELEvaluator(applicationContext));
@@ -224,7 +224,7 @@
/** {@inheritDoc} */
@Override
- protected List<URL> getSourceURLs(TilesApplicationContext applicationContext,
+ protected List<URL> getSourceURLs(ApplicationContext applicationContext,
TilesRequestContextFactory contextFactory) {
try {
Set<URL> urlSet = applicationContext
@@ -240,7 +240,7 @@
/** {@inheritDoc} */
@Override
- protected DefinitionsReader createDefinitionsReader(TilesApplicationContext applicationContext,
+ protected DefinitionsReader createDefinitionsReader(ApplicationContext applicationContext,
TilesRequestContextFactory contextFactory) {
return new CompatibilityDigesterDefinitionsReader();
}
@@ -252,7 +252,7 @@
* @return The EL evaluator.
*/
private ELAttributeEvaluator createELEvaluator(
- TilesApplicationContext applicationContext) {
+ ApplicationContext applicationContext) {
ELAttributeEvaluator evaluator = new ELAttributeEvaluator();
evaluator.setApplicationContext(applicationContext);
JspExpressionFactoryFactory efFactory = new JspExpressionFactoryFactory();
@@ -300,25 +300,25 @@
PropertyAccessor objectPropertyAccessor = OgnlRuntime.getPropertyAccessor(Object.class);
PropertyAccessor mapPropertyAccessor = OgnlRuntime.getPropertyAccessor(Map.class);
PropertyAccessor applicationContextPropertyAccessor =
- new NestedObjectDelegatePropertyAccessor<TilesRequestContext>(
+ new NestedObjectDelegatePropertyAccessor<Request>(
new TilesApplicationContextNestedObjectExtractor(),
objectPropertyAccessor);
PropertyAccessor requestScopePropertyAccessor =
- new NestedObjectDelegatePropertyAccessor<TilesRequestContext>(
+ new NestedObjectDelegatePropertyAccessor<Request>(
new RequestScopeNestedObjectExtractor(), mapPropertyAccessor);
PropertyAccessor sessionScopePropertyAccessor =
- new NestedObjectDelegatePropertyAccessor<TilesRequestContext>(
+ new NestedObjectDelegatePropertyAccessor<Request>(
new SessionScopeNestedObjectExtractor(), mapPropertyAccessor);
PropertyAccessor applicationScopePropertyAccessor =
- new NestedObjectDelegatePropertyAccessor<TilesRequestContext>(
+ new NestedObjectDelegatePropertyAccessor<Request>(
new ApplicationScopeNestedObjectExtractor(), mapPropertyAccessor);
- PropertyAccessorDelegateFactory<TilesRequestContext> factory =
+ PropertyAccessorDelegateFactory<Request> factory =
new TilesContextPropertyAccessorDelegateFactory(
objectPropertyAccessor, applicationContextPropertyAccessor,
requestScopePropertyAccessor, sessionScopePropertyAccessor,
applicationScopePropertyAccessor);
- PropertyAccessor tilesRequestAccessor = new DelegatePropertyAccessor<TilesRequestContext>(factory);
- OgnlRuntime.setPropertyAccessor(TilesRequestContext.class, tilesRequestAccessor);
+ PropertyAccessor tilesRequestAccessor = new DelegatePropertyAccessor<Request>(factory);
+ OgnlRuntime.setPropertyAccessor(Request.class, tilesRequestAccessor);
return new OGNLAttributeEvaluator();
} catch (OgnlException e) {
throw new TilesContainerFactoryException(
Modified: tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesInitializer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesInitializer.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesInitializer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesInitializer.java Sat Nov 7 19:17:09 2009
@@ -23,8 +23,8 @@
import javax.servlet.ServletContext;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.factory.AbstractTilesContainerFactory;
+import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.servlet.wildcard.WildcardServletTilesApplicationContext;
import org.apache.tiles.startup.AbstractTilesInitializer;
@@ -41,8 +41,8 @@
/** {@inheritDoc} */
@Override
- protected TilesApplicationContext createTilesApplicationContext(
- TilesApplicationContext preliminaryContext) {
+ protected ApplicationContext createTilesApplicationContext(
+ ApplicationContext preliminaryContext) {
return new WildcardServletTilesApplicationContext(
(ServletContext) preliminaryContext.getContext());
}
@@ -50,7 +50,7 @@
/** {@inheritDoc} */
@Override
protected AbstractTilesContainerFactory createContainerFactory(
- TilesApplicationContext context) {
+ ApplicationContext context) {
return new CompleteAutoloadTilesContainerFactory();
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/module/ModularTilesInitializer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/module/ModularTilesInitializer.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/module/ModularTilesInitializer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/module/ModularTilesInitializer.java Sat Nov 7 19:17:09 2009
@@ -33,9 +33,9 @@
import javax.servlet.ServletContext;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.reflect.ClassUtil;
+import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.servlet.wildcard.WildcardServletTilesApplicationContext;
import org.apache.tiles.startup.TilesInitializer;
import org.slf4j.Logger;
@@ -64,8 +64,8 @@
private List<TilesInitializer> initializers;
/** {@inheritDoc} */
- public void initialize(TilesApplicationContext preliminaryContext) {
- TilesApplicationContext applicationContext = new WildcardServletTilesApplicationContext(
+ public void initialize(ApplicationContext preliminaryContext) {
+ ApplicationContext applicationContext = new WildcardServletTilesApplicationContext(
(ServletContext) preliminaryContext.getContext());
loadInitializers(applicationContext);
@@ -86,7 +86,7 @@
*
* @param applicationContext The application context.
*/
- private void loadInitializers(TilesApplicationContext applicationContext) {
+ private void loadInitializers(ApplicationContext applicationContext) {
initializers = new ArrayList<TilesInitializer>();
try {
Set<URL> urls = applicationContext
Modified: tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactoryTest.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactoryTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactoryTest.java Sat Nov 7 19:17:09 2009
@@ -40,7 +40,6 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.Definition;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.compat.definition.digester.CompatibilityDigesterDefinitionsReader;
import org.apache.tiles.context.ChainedTilesRequestContextFactory;
@@ -61,6 +60,7 @@
import org.apache.tiles.renderer.impl.DefinitionAttributeRenderer;
import org.apache.tiles.renderer.impl.StringAttributeRenderer;
import org.apache.tiles.renderer.impl.TemplateAttributeRenderer;
+import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.servlet.context.ServletTilesApplicationContext;
import org.apache.tiles.servlet.context.ServletTilesRequestContextFactory;
import org.apache.tiles.velocity.context.VelocityTilesRequestContextFactory;
@@ -101,7 +101,7 @@
/**
* Test method for
- * {@link CompleteAutoloadTilesContainerFactory#instantiateContainer(TilesApplicationContext)}
+ * {@link CompleteAutoloadTilesContainerFactory#instantiateContainer(ApplicationContext)}
* .
*/
@Test
@@ -133,7 +133,7 @@
/**
* Test method for
* {@link CompleteAutoloadTilesContainerFactory
- * #registerAttributeRenderers(BasicRendererFactory, TilesApplicationContext,
+ * #registerAttributeRenderers(BasicRendererFactory, ApplicationContext,
* TilesRequestContextFactory, TilesContainer, evaluator.AttributeEvaluatorFactory)}
* .
*/
@@ -197,11 +197,11 @@
/**
* Tests
* {@link CompleteAutoloadTilesContainerFactory#createDefaultAttributeRenderer(BasicRendererFactory,
- * TilesApplicationContext, TilesRequestContextFactory, TilesContainer, AttributeEvaluatorFactory)}.
+ * ApplicationContext, TilesRequestContextFactory, TilesContainer, AttributeEvaluatorFactory)}.
*/
@Test
public void testCreateDefaultAttributeRenderer() {
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
TilesContainer container = createMock(TilesContainer.class);
TilesRequestContextFactory requestContextFactory = createMock(TilesRequestContextFactory.class);
AttributeEvaluatorFactory attributeEvaluatorFactory = createMock(AttributeEvaluatorFactory.class);
@@ -232,12 +232,12 @@
/**
* Test method for
* {@link CompleteAutoloadTilesContainerFactory
- * #createAttributeEvaluatorFactory(TilesApplicationContext, TilesRequestContextFactory, locale.LocaleResolver)}
+ * #createAttributeEvaluatorFactory(ApplicationContext, TilesRequestContextFactory, locale.LocaleResolver)}
* .
*/
@Test
public void testCreateAttributeEvaluatorFactory() {
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
TilesRequestContextFactory contextFactory = createMock(TilesRequestContextFactory.class);
LocaleResolver resolver = createMock(LocaleResolver.class);
ServletContext servletContext = createMock(ServletContext.class);
@@ -288,13 +288,13 @@
/**
* Test method for
- * {@link CompleteAutoloadTilesContainerFactory#getSourceURLs(TilesApplicationContext, TilesRequestContextFactory)}
+ * {@link CompleteAutoloadTilesContainerFactory#getSourceURLs(ApplicationContext, TilesRequestContextFactory)}
* .
* @throws IOException If something goes wrong.
*/
@Test
public void testGetSourceURLs() throws IOException {
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
TilesRequestContextFactory contextFactory = createMock(TilesRequestContextFactory.class);
URL url1 = new URL("file:///nonexistent/tiles.xml");
@@ -322,12 +322,12 @@
/**
* Test method for
* {@link CompleteAutoloadTilesContainerFactory
- * #createDefinitionsReader(TilesApplicationContext, TilesRequestContextFactory)}
+ * #createDefinitionsReader(ApplicationContext, TilesRequestContextFactory)}
* .
*/
@Test
public void testCreateDefinitionsReader() {
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
TilesRequestContextFactory contextFactory = createMock(TilesRequestContextFactory.class);
replay(applicationContext, contextFactory);
Modified: tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesInitializerTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesInitializerTest.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesInitializerTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesInitializerTest.java Sat Nov 7 19:17:09 2009
@@ -26,7 +26,7 @@
import javax.servlet.ServletContext;
-import org.apache.tiles.TilesApplicationContext;
+import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.servlet.wildcard.WildcardServletTilesApplicationContext;
import org.junit.Before;
import org.junit.Test;
@@ -52,11 +52,11 @@
}
/**
- * Test method for {@link CompleteAutoloadTilesInitializer#createTilesApplicationContext(TilesApplicationContext)}.
+ * Test method for {@link CompleteAutoloadTilesInitializer#createTilesApplicationContext(ApplicationContext)}.
*/
@Test
public void testCreateTilesApplicationContext() {
- TilesApplicationContext preliminaryContext = createMock(TilesApplicationContext.class);
+ ApplicationContext preliminaryContext = createMock(ApplicationContext.class);
ServletContext servletContext = createMock(ServletContext.class);
expect(preliminaryContext.getContext()).andReturn(servletContext);
@@ -68,11 +68,11 @@
}
/**
- * Test method for {@link CompleteAutoloadTilesInitializer#createContainerFactory(TilesApplicationContext)}.
+ * Test method for {@link CompleteAutoloadTilesInitializer#createContainerFactory(ApplicationContext)}.
*/
@Test
public void testCreateContainerFactory() {
- TilesApplicationContext context = createMock(TilesApplicationContext.class);
+ ApplicationContext context = createMock(ApplicationContext.class);
replay(context);
assertTrue(initializer.createContainerFactory(context) instanceof CompleteAutoloadTilesContainerFactory);
Modified: tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/module/ModularTilesInitializerTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/module/ModularTilesInitializerTest.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/module/ModularTilesInitializerTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-extras/src/test/java/org/apache/tiles/extras/module/ModularTilesInitializerTest.java Sat Nov 7 19:17:09 2009
@@ -29,7 +29,7 @@
import javax.servlet.ServletContext;
-import org.apache.tiles.TilesApplicationContext;
+import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.startup.TilesInitializer;
import org.junit.Test;
@@ -41,14 +41,14 @@
public class ModularTilesInitializerTest {
/**
- * Tests {@link ModularTilesInitializer#initialize(TilesApplicationContext)}
+ * Tests {@link ModularTilesInitializer#initialize(ApplicationContext)}
* and {@link ModularTilesInitializer#destroy()}.
*
* @throws MalformedURLException Never thrown.
*/
@Test
public void testInitialize() throws MalformedURLException {
- TilesApplicationContext preliminaryContext = createMock(TilesApplicationContext.class);
+ ApplicationContext preliminaryContext = createMock(ApplicationContext.class);
ServletContext servletContext = createMock(ServletContext.class);
URL manifestUrl = getClass().getResource("/FAKE-MANIFEST.MF");
@@ -84,7 +84,7 @@
private static boolean destroyed = false;
/** {@inheritDoc} */
- public void initialize(TilesApplicationContext preliminaryContext) {
+ public void initialize(ApplicationContext preliminaryContext) {
initialized = true;
}
@@ -112,7 +112,7 @@
private static boolean destroyed = false;
/** {@inheritDoc} */
- public void initialize(TilesApplicationContext preliminaryContext) {
+ public void initialize(ApplicationContext preliminaryContext) {
initialized = true;
}
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java Sat Nov 7 19:17:09 2009
@@ -26,8 +26,8 @@
import java.io.Writer;
import java.util.Locale;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextWrapper;
+import org.apache.tiles.request.Request;
import freemarker.core.Environment;
@@ -37,7 +37,7 @@
* @version $Rev$ $Date$
* @since 2.2.0
*/
-public class FreeMarkerTilesRequestContext extends TilesRequestContextWrapper implements TilesRequestContext {
+public class FreeMarkerTilesRequestContext extends TilesRequestContextWrapper implements Request {
/**
* The FreeMarker current environment.
@@ -56,7 +56,7 @@
* @param env The FreeMarker environment.
*/
public FreeMarkerTilesRequestContext(
- TilesRequestContext enclosedRequest, Environment env) {
+ Request enclosedRequest, Environment env) {
super(enclosedRequest);
this.env = env;
}
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java Sat Nov 7 19:17:09 2009
@@ -24,11 +24,11 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextFactory;
import org.apache.tiles.freemarker.FreeMarkerTilesException;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
import org.apache.tiles.servlet.context.ServletTilesRequestContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -62,8 +62,8 @@
}
/** {@inheritDoc} */
- public TilesRequestContext createRequestContext(
- TilesApplicationContext context, Object... requestItems) {
+ public Request createRequestContext(
+ ApplicationContext context, Object... requestItems) {
if (requestItems.length == 1 && requestItems[0] instanceof Environment) {
Environment env = (Environment) requestItems[0];
HttpRequestHashModel requestModel;
@@ -75,7 +75,7 @@
}
HttpServletRequest request = requestModel.getRequest();
HttpServletResponse response = requestModel.getResponse();
- TilesRequestContext enclosedRequest;
+ Request enclosedRequest;
if (parent != null) {
enclosedRequest = parent.createRequestContext(context, request,
response);
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRenderer.java Sat Nov 7 19:17:09 2009
@@ -33,11 +33,11 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.tiles.Attribute;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.freemarker.FreeMarkerTilesException;
import org.apache.tiles.freemarker.servlet.TilesFreemarkerServlet;
import org.apache.tiles.impl.InvalidTemplateException;
import org.apache.tiles.renderer.impl.AbstractTypeDetectingAttributeRenderer;
+import org.apache.tiles.request.Request;
import org.apache.tiles.servlet.context.ExternalWriterHttpServletResponse;
import org.apache.tiles.servlet.context.ServletTilesRequestContext;
import org.apache.tiles.servlet.context.ServletUtil;
@@ -94,7 +94,7 @@
/** {@inheritDoc} */
@Override
public void write(Object value, Attribute attribute,
- TilesRequestContext request) throws IOException {
+ Request request) throws IOException {
if (value != null) {
if (value instanceof String) {
ServletTilesRequestContext servletRequest = ServletUtil.getServletRequest(request);
@@ -120,7 +120,7 @@
/** {@inheritDoc} */
public boolean isRenderable(Object value, Attribute attribute,
- TilesRequestContext request) {
+ Request request) {
if (value instanceof String) {
String string = (String) value;
return string.startsWith("/") && string.endsWith(".ftl");
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactoryTest.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactoryTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactoryTest.java Sat Nov 7 19:17:09 2009
@@ -30,9 +30,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextFactory;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
import org.junit.Test;
import freemarker.core.Environment;
@@ -55,7 +55,7 @@
private FreeMarkerTilesRequestContextFactory factory;
/**
- * Tests {@link FreeMarkerTilesRequestContextFactory#createRequestContext(TilesApplicationContext, Object...)}.
+ * Tests {@link FreeMarkerTilesRequestContextFactory#createRequestContext(ApplicationContext, Object...)}.
*
* @throws TemplateModelException If something goes wrong.
*/
@@ -66,13 +66,13 @@
StringWriter writer = new StringWriter();
expect(template.getMacros()).andReturn(new HashMap<Object, Object>());
TilesRequestContextFactory parentFactory = createMock(TilesRequestContextFactory.class);
- TilesApplicationContext applicationContext = createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = createMock(ApplicationContext.class);
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
ObjectWrapper wrapper = createMock(ObjectWrapper.class);
HttpRequestHashModel requestModel = new HttpRequestHashModel(request, response, wrapper);
expect(model.get("Request")).andReturn(requestModel);
- TilesRequestContext enclosedRequest = createMock(TilesRequestContext.class);
+ Request enclosedRequest = createMock(Request.class);
expect(parentFactory.createRequestContext(applicationContext, request, response)).andReturn(enclosedRequest);
replay(template, model, parentFactory, applicationContext, request, response, wrapper);
Environment env = new Environment(template, model, writer);
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextTest.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextTest.java Sat Nov 7 19:17:09 2009
@@ -29,7 +29,7 @@
import java.util.HashMap;
import java.util.Locale;
-import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.request.Request;
import org.junit.Before;
import org.junit.Test;
@@ -87,7 +87,7 @@
@Test
public void testDispatch() throws IOException {
String path = "this way";
- TilesRequestContext enclosedRequest = createMock(TilesRequestContext.class);
+ Request enclosedRequest = createMock(Request.class);
enclosedRequest.include(path);
replay(enclosedRequest);
context = new FreeMarkerTilesRequestContext(enclosedRequest, env);
@@ -100,7 +100,7 @@
*/
@Test
public void testGetRequestLocale() {
- TilesRequestContext enclosedRequest = createMock(TilesRequestContext.class);
+ Request enclosedRequest = createMock(Request.class);
replay(enclosedRequest);
context = new FreeMarkerTilesRequestContext(enclosedRequest, env);
assertEquals(locale, context.getRequestLocale());
@@ -112,7 +112,7 @@
*/
@Test
public void testGetRequest() {
- TilesRequestContext enclosedRequest = createMock(TilesRequestContext.class);
+ Request enclosedRequest = createMock(Request.class);
replay(enclosedRequest);
context = new FreeMarkerTilesRequestContext(enclosedRequest, env);
assertEquals(env, context.getEnvironment());
@@ -124,7 +124,7 @@
*/
@Test
public void testGetResponse() {
- TilesRequestContext enclosedRequest = createMock(TilesRequestContext.class);
+ Request enclosedRequest = createMock(Request.class);
replay(enclosedRequest);
context = new FreeMarkerTilesRequestContext(enclosedRequest, env);
assertEquals(env, context.getEnvironment());
@@ -138,7 +138,7 @@
*/
@Test
public void testGetPrintWriter() throws IOException {
- TilesRequestContext enclosedRequest = createMock(TilesRequestContext.class);
+ Request enclosedRequest = createMock(Request.class);
replay(enclosedRequest);
context = new FreeMarkerTilesRequestContext(enclosedRequest, env);
@@ -154,7 +154,7 @@
*/
@Test
public void testGetWriter() throws IOException {
- TilesRequestContext enclosedRequest = createMock(TilesRequestContext.class);
+ Request enclosedRequest = createMock(Request.class);
replay(enclosedRequest);
context = new FreeMarkerTilesRequestContext(enclosedRequest, env);
@@ -168,7 +168,7 @@
*/
@Test
public void testGetRequestObjects() {
- TilesRequestContext enclosedRequest = createMock(TilesRequestContext.class);
+ Request enclosedRequest = createMock(Request.class);
replay(enclosedRequest);
context = new FreeMarkerTilesRequestContext(enclosedRequest, env);
Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java Sat Nov 7 19:17:09 2009
@@ -27,8 +27,8 @@
import javax.servlet.ServletException;
import javax.servlet.jsp.PageContext;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextWrapper;
+import org.apache.tiles.request.Request;
import org.apache.tiles.servlet.context.ServletUtil;
/**
@@ -38,7 +38,7 @@
* @version $Rev$ $Date$
*/
public class JspTilesRequestContext extends TilesRequestContextWrapper
- implements TilesRequestContext {
+ implements Request {
/**
* The current page context.
@@ -56,7 +56,7 @@
* @param enclosedRequest The request that is wrapped here.
* @param pageContext The page context to use.
*/
- public JspTilesRequestContext(TilesRequestContext enclosedRequest,
+ public JspTilesRequestContext(Request enclosedRequest,
PageContext pageContext) {
super(enclosedRequest);
this.pageContext = pageContext;
Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactory.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactory.java Sat Nov 7 19:17:09 2009
@@ -27,14 +27,14 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.PageContext;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextFactory;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
import org.apache.tiles.servlet.context.ServletTilesRequestContext;
/**
- * Creates an instance of the appropriate {@link TilesRequestContext}
+ * Creates an instance of the appropriate {@link Request}
* implementation under a JSP environment.
*
* @version $Rev$ $Date$
@@ -55,13 +55,13 @@
}
/** {@inheritDoc} */
- public TilesRequestContext createRequestContext(
- TilesApplicationContext context, Object... requestItems) {
+ public Request createRequestContext(
+ ApplicationContext context, Object... requestItems) {
if (requestItems.length == 1 && requestItems[0] instanceof PageContext) {
PageContext pageContext = (PageContext) requestItems[0];
ServletRequest request = pageContext.getRequest();
ServletResponse response = pageContext.getResponse();
- TilesRequestContext enclosedRequest;
+ Request enclosedRequest;
if (parent != null) {
enclosedRequest = parent.createRequestContext(context, request,
response);
Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactoryTest.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactoryTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactoryTest.java Sat Nov 7 19:17:09 2009
@@ -25,9 +25,9 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.PageContext;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextFactory;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
import org.apache.tiles.servlet.context.ServletTilesRequestContext;
import org.easymock.classextension.EasyMock;
@@ -53,12 +53,12 @@
/**
* Tests
- * {@link JspTilesRequestContextFactory#createRequestContext(org.apache.tiles.TilesApplicationContext, Object...)}
+ * {@link JspTilesRequestContextFactory#createRequestContext(org.apache.tiles.request.ApplicationContext, Object...)}
* .
*/
public void testCreateRequestContextWithoutParent() {
- TilesApplicationContext context = EasyMock
- .createMock(TilesApplicationContext.class);
+ ApplicationContext context = EasyMock
+ .createMock(ApplicationContext.class);
PageContext pageContext = EasyMock.createMock(PageContext.class);
HttpServletRequest httpRequest = EasyMock
.createMock(HttpServletRequest.class);
@@ -76,12 +76,12 @@
/**
* Tests
- * {@link JspTilesRequestContextFactory#createRequestContext(org.apache.tiles.TilesApplicationContext, Object...)}
+ * {@link JspTilesRequestContextFactory#createRequestContext(org.apache.tiles.request.ApplicationContext, Object...)}
* .
*/
public void testCreateRequestContextWithParent() {
- TilesApplicationContext context = EasyMock
- .createMock(TilesApplicationContext.class);
+ ApplicationContext context = EasyMock
+ .createMock(ApplicationContext.class);
PageContext pageContext = EasyMock.createMock(PageContext.class);
HttpServletRequest httpRequest = EasyMock
.createMock(HttpServletRequest.class);
@@ -92,8 +92,8 @@
TilesRequestContextFactory parent = EasyMock
.createMock(TilesRequestContextFactory.class);
- TilesRequestContext enclosedRequest = EasyMock
- .createMock(TilesRequestContext.class);
+ Request enclosedRequest = EasyMock
+ .createMock(Request.class);
EasyMock.expect(parent.createRequestContext(context, httpRequest,
httpResponse)).andReturn(enclosedRequest);
factory.setRequestContextFactory(parent);
Modified: tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/MVELAttributeEvaluator.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/MVELAttributeEvaluator.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/MVELAttributeEvaluator.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/MVELAttributeEvaluator.java Sat Nov 7 19:17:09 2009
@@ -21,9 +21,9 @@
package org.apache.tiles.mvel;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextHolder;
import org.apache.tiles.evaluator.AbstractAttributeEvaluator;
+import org.apache.tiles.request.Request;
import org.mvel2.MVEL;
import org.mvel2.integration.VariableResolverFactory;
@@ -62,7 +62,7 @@
}
/** {@inheritDoc} */
- public Object evaluate(String expression, TilesRequestContext request) {
+ public Object evaluate(String expression, Request request) {
if (expression == null) {
throw new IllegalArgumentException("The expression parameter cannot be null");
}
Modified: tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactory.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactory.java Sat Nov 7 19:17:09 2009
@@ -23,8 +23,8 @@
import java.util.HashMap;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextHolder;
+import org.apache.tiles.request.Request;
import org.mvel2.UnresolveablePropertyException;
import org.mvel2.integration.VariableResolver;
import org.mvel2.integration.impl.BaseVariableResolverFactory;
@@ -97,7 +97,7 @@
/** {@inheritDoc} */
public boolean isTarget(String name) {
- TilesRequestContext request = requestHolder.getTilesRequestContext();
+ Request request = requestHolder.getTilesRequestContext();
return request.getRequestScope().containsKey(name)
|| request.getSessionScope().containsKey(name)
|| request.getApplicationContext().getApplicationScope()
@@ -149,7 +149,7 @@
/** {@inheritDoc} */
public Object getValue() {
- TilesRequestContext request = requestHolder.getTilesRequestContext();
+ Request request = requestHolder.getTilesRequestContext();
Object value = request.getRequestScope().get(name);
if (value == null) {
value = request.getSessionScope().get(name);
Modified: tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextVariableResolverFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextVariableResolverFactory.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextVariableResolverFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextVariableResolverFactory.java Sat Nov 7 19:17:09 2009
@@ -26,17 +26,17 @@
import java.lang.reflect.Method;
import java.util.HashMap;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextHolder;
import org.apache.tiles.reflect.CannotAccessMethodException;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
import org.apache.tiles.util.CombinedBeanInfo;
import org.mvel2.integration.VariableResolver;
import org.mvel2.integration.impl.BaseVariableResolverFactory;
/**
- * Resolves {@link org.apache.tiles.context.TilesRequestContext} and
- * {@link org.apache.tiles.TilesApplicationContext} properties as variables.
+ * Resolves {@link org.apache.tiles.request.Request} and
+ * {@link org.apache.tiles.request.ApplicationContext} properties as variables.
*
* @version $Rev$ $Date$
* @since 2.2.0
@@ -50,11 +50,11 @@
private TilesRequestContextHolder requestHolder;
/**
- * Beaninfo about {@link org.apache.tiles.context.TilesRequestContext} and
- * {@link org.apache.tiles.TilesApplicationContext}.
+ * Beaninfo about {@link org.apache.tiles.request.Request} and
+ * {@link org.apache.tiles.request.ApplicationContext}.
*/
private CombinedBeanInfo requestBeanInfo = new CombinedBeanInfo(
- TilesRequestContext.class, TilesApplicationContext.class);
+ Request.class, ApplicationContext.class);
/**
* Constructor.
@@ -66,12 +66,12 @@
this.requestHolder = requestHolder;
variableResolvers = new HashMap<String, VariableResolver>();
for (PropertyDescriptor descriptor : requestBeanInfo
- .getMappedDescriptors(TilesRequestContext.class).values()) {
+ .getMappedDescriptors(Request.class).values()) {
String descriptorName = descriptor.getName();
variableResolvers.put(descriptorName, new RequestVariableResolver(descriptorName));
}
for (PropertyDescriptor descriptor : requestBeanInfo
- .getMappedDescriptors(TilesApplicationContext.class).values()) {
+ .getMappedDescriptors(ApplicationContext.class).values()) {
String descriptorName = descriptor.getName();
variableResolvers.put(descriptorName, new ApplicationVariableResolver(descriptorName));
}
@@ -108,7 +108,7 @@
}
/**
- * Resolves a {@link org.apache.tiles.context.TilesRequestContext} property as a variable.
+ * Resolves a {@link org.apache.tiles.request.Request} property as a variable.
*
* @version $Rev$ $Date$
* @since 2.2.0
@@ -134,7 +134,7 @@
public RequestVariableResolver(String name) {
this.name = name;
descriptor = requestBeanInfo.getMappedDescriptors(
- TilesRequestContext.class).get(name);
+ Request.class).get(name);
}
/** {@inheritDoc} */
@@ -187,7 +187,7 @@
}
/**
- * Resolves a {@link org.apache.tiles.TilesApplicationContext} property as a
+ * Resolves a {@link org.apache.tiles.request.ApplicationContext} property as a
* variable.
*
* @version $Rev$ $Date$
@@ -218,7 +218,7 @@
public ApplicationVariableResolver(String name) {
this.name = name;
descriptor = requestBeanInfo.getMappedDescriptors(
- TilesApplicationContext.class).get(name);
+ ApplicationContext.class).get(name);
}
/** {@inheritDoc} */
Modified: tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/MVELAttributeEvaluatorTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/MVELAttributeEvaluatorTest.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/MVELAttributeEvaluatorTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/MVELAttributeEvaluatorTest.java Sat Nov 7 19:17:09 2009
@@ -27,12 +27,12 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.Expression;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextHolder;
import org.apache.tiles.mvel.MVELAttributeEvaluator;
import org.apache.tiles.mvel.TilesContextBeanVariableResolverFactory;
import org.apache.tiles.mvel.TilesContextVariableResolverFactory;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
import org.easymock.EasyMock;
import org.mvel2.integration.VariableResolverFactory;
@@ -51,7 +51,7 @@
/**
* The request object to use.
*/
- private TilesRequestContext request;
+ private Request request;
/** {@inheritDoc} */
@Override
@@ -72,13 +72,13 @@
sessionScope.put("object2", new Integer(1));
applicationScope.put("object3", new Float(2.0));
requestScope.put("paulaBean", new PaulaBean());
- request = EasyMock.createMock(TilesRequestContext.class);
+ request = EasyMock.createMock(Request.class);
EasyMock.expect(request.getRequestScope()).andReturn(requestScope)
.anyTimes();
EasyMock.expect(request.getSessionScope()).andReturn(sessionScope)
.anyTimes();
- TilesApplicationContext applicationContext = EasyMock
- .createMock(TilesApplicationContext.class);
+ ApplicationContext applicationContext = EasyMock
+ .createMock(ApplicationContext.class);
EasyMock.expect(request.getApplicationContext()).andReturn(
applicationContext).anyTimes();
EasyMock.expect(applicationContext.getApplicationScope()).andReturn(
@@ -88,7 +88,7 @@
/**
* Tests
- * {@link MVELAttributeEvaluator#evaluate(Attribute, TilesRequestContext)}.
+ * {@link MVELAttributeEvaluator#evaluate(Attribute, Request)}.
*/
public void testEvaluate() {
Attribute attribute = new Attribute();
@@ -125,7 +125,7 @@
}
/**
- * Tests {@link MVELAttributeEvaluator#evaluate(String, TilesRequestContext)}.
+ * Tests {@link MVELAttributeEvaluator#evaluate(String, Request)}.
*/
public void testEvaluateString() {
String expression = "requestScope.object1";
Modified: tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactoryTest.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactoryTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactoryTest.java Sat Nov 7 19:17:09 2009
@@ -27,10 +27,10 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextHolder;
import org.apache.tiles.mvel.TilesContextBeanVariableResolverFactory;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
import org.junit.Before;
import org.junit.Test;
import org.mvel2.UnresolveablePropertyException;
@@ -57,12 +57,12 @@
/**
* The Tiles request.
*/
- private TilesRequestContext request;
+ private Request request;
/**
* The Tiles application context.
*/
- private TilesApplicationContext applicationContext;
+ private ApplicationContext applicationContext;
/**
* The object to test.
@@ -74,10 +74,10 @@
*/
@Before
public void setUp() {
- request = createMock(TilesRequestContext.class);
+ request = createMock(Request.class);
TilesRequestContextHolder holder = new TilesRequestContextHolder();
holder.setTilesRequestContext(request);
- applicationContext = createMock(TilesApplicationContext.class);
+ applicationContext = createMock(ApplicationContext.class);
factory = new TilesContextBeanVariableResolverFactory(holder);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextVariableResolverFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextVariableResolverFactoryTest.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextVariableResolverFactoryTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextVariableResolverFactoryTest.java Sat Nov 7 19:17:09 2009
@@ -27,10 +27,10 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextHolder;
import org.apache.tiles.mvel.TilesContextVariableResolverFactory;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -46,12 +46,12 @@
/**
* The Tiles request.
*/
- private TilesRequestContext request;
+ private Request request;
/**
* The Tiles application context.
*/
- private TilesApplicationContext applicationContext;
+ private ApplicationContext applicationContext;
/**
* The object to test.
@@ -63,10 +63,10 @@
*/
@Before
public void setUp() {
- request = createMock(TilesRequestContext.class);
+ request = createMock(Request.class);
TilesRequestContextHolder holder = new TilesRequestContextHolder();
holder.setTilesRequestContext(request);
- applicationContext = createMock(TilesApplicationContext.class);
+ applicationContext = createMock(ApplicationContext.class);
factory = new TilesContextVariableResolverFactory(holder);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/ApplicationScopeNestedObjectExtractor.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/ApplicationScopeNestedObjectExtractor.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/ApplicationScopeNestedObjectExtractor.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/ApplicationScopeNestedObjectExtractor.java Sat Nov 7 19:17:09 2009
@@ -23,7 +23,7 @@
import java.util.Map;
-import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.request.Request;
/**
* Extracts the application scope from a Tiles request.
@@ -32,10 +32,10 @@
* @since 2.2.0
*/
public class ApplicationScopeNestedObjectExtractor implements
- NestedObjectExtractor<TilesRequestContext> {
+ NestedObjectExtractor<Request> {
/** {@inheritDoc} */
- public Map<String, Object> getNestedObject(TilesRequestContext obj) {
+ public Map<String, Object> getNestedObject(Request obj) {
return obj.getApplicationContext().getApplicationScope();
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/OGNLAttributeEvaluator.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/OGNLAttributeEvaluator.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/OGNLAttributeEvaluator.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/OGNLAttributeEvaluator.java Sat Nov 7 19:17:09 2009
@@ -24,9 +24,9 @@
import ognl.Ognl;
import ognl.OgnlException;
-import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.evaluator.AbstractAttributeEvaluator;
import org.apache.tiles.evaluator.EvaluationException;
+import org.apache.tiles.request.Request;
/**
* Evaluates attribute expressions and expressions with OGNL language.
@@ -37,7 +37,7 @@
public class OGNLAttributeEvaluator extends AbstractAttributeEvaluator {
/** {@inheritDoc} */
- public Object evaluate(String expression, TilesRequestContext request) {
+ public Object evaluate(String expression, Request request) {
if (expression == null) {
throw new IllegalArgumentException("The expression parameter cannot be null");
}
Modified: tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/RequestScopeNestedObjectExtractor.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/RequestScopeNestedObjectExtractor.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/RequestScopeNestedObjectExtractor.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/RequestScopeNestedObjectExtractor.java Sat Nov 7 19:17:09 2009
@@ -23,7 +23,7 @@
import java.util.Map;
-import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.request.Request;
/**
* Extracts the request scope from a Tiles request.
@@ -32,10 +32,10 @@
* @since 2.2.0
*/
public class RequestScopeNestedObjectExtractor implements
- NestedObjectExtractor<TilesRequestContext> {
+ NestedObjectExtractor<Request> {
/** {@inheritDoc} */
- public Map<String, Object> getNestedObject(TilesRequestContext obj) {
+ public Map<String, Object> getNestedObject(Request obj) {
return obj.getRequestScope();
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/SessionScopeNestedObjectExtractor.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/SessionScopeNestedObjectExtractor.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/SessionScopeNestedObjectExtractor.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/SessionScopeNestedObjectExtractor.java Sat Nov 7 19:17:09 2009
@@ -23,7 +23,7 @@
import java.util.Map;
-import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.request.Request;
/**
* Extracts the session scope from a Tiles request.
@@ -32,10 +32,10 @@
* @since 2.2.0
*/
public class SessionScopeNestedObjectExtractor implements
- NestedObjectExtractor<TilesRequestContext> {
+ NestedObjectExtractor<Request> {
/** {@inheritDoc} */
- public Map<String, Object> getNestedObject(TilesRequestContext obj) {
+ public Map<String, Object> getNestedObject(Request obj) {
return obj.getSessionScope();
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractor.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractor.java?rev=833737&r1=833736&r2=833737&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractor.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractor.java Sat Nov 7 19:17:09 2009
@@ -21,8 +21,8 @@
package org.apache.tiles.ognl;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.Request;
/**
* Extracts the application context from a Tiles request.
@@ -31,10 +31,10 @@
* @since 2.2.0
*/
public class TilesApplicationContextNestedObjectExtractor implements
- NestedObjectExtractor<TilesRequestContext> {
+ NestedObjectExtractor<Request> {
/** {@inheritDoc} */
- public TilesApplicationContext getNestedObject(TilesRequestContext obj) {
+ public ApplicationContext getNestedObject(Request obj) {
return obj.getApplicationContext();
}
}