Author: apetrelli
Date: Wed Oct 22 03:20:31 2008
New Revision: 707020
URL: http://svn.apache.org/viewvc?rev=707020&view=rev
Log:
TILES-319
Added "getApplicationContext" to TilesRequestContext and modified code in every
affected module.
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContext.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextWrapper.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java
tiles/framework/trunk/tiles-portlet/src/test/java/org/apache/tiles/portlet/context/PortletTilesRequestContextTest.java
tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContext.java
tiles/framework/trunk/tiles-servlet/src/test/java/org/apache/tiles/servlet/context/ServletTilesRequestContextTest.java
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContext.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContext.java?rev=707020&r1=707019&r2=707020&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContext.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContext.java
Wed Oct 22 03:20:31 2008
@@ -24,6 +24,8 @@
import java.util.Locale;
import java.util.Map;
+import org.apache.tiles.TilesApplicationContext;
+
/**
* Encapsulation of request information.
*
@@ -66,6 +68,14 @@
Map<String, Object> getSessionScope();
/**
+ * Returns the associated application context.
+ *
+ * @return The application context associated to this request.
+ * @since 2.1.1
+ */
+ TilesApplicationContext getApplicationContext();
+
+ /**
* Dispatches the request to a specified path.
*
* @param path The path to dispatch to.
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextWrapper.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextWrapper.java?rev=707020&r1=707019&r2=707020&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextWrapper.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextWrapper.java
Wed Oct 22 03:20:31 2008
@@ -24,6 +24,8 @@
import java.util.Locale;
import java.io.IOException;
+import org.apache.tiles.TilesApplicationContext;
+
/**
* Delegate for ease of customization.
*
@@ -68,6 +70,11 @@
}
/** [EMAIL PROTECTED] */
+ public TilesApplicationContext getApplicationContext() {
+ return context.getApplicationContext();
+ }
+
+ /** [EMAIL PROTECTED] */
public void dispatch(String path) throws IOException {
context.dispatch(path);
}
Modified:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java?rev=707020&r1=707019&r2=707020&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java
(original)
+++
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java
Wed Oct 22 03:20:31 2008
@@ -25,6 +25,7 @@
import java.util.Locale;
import java.util.Map;
+import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.context.TilesRequestContext;
/**
@@ -96,6 +97,11 @@
}
/** [EMAIL PROTECTED] */
+ public TilesApplicationContext getApplicationContext() {
+ return null;
+ }
+
+ /** [EMAIL PROTECTED] */
public void include(String path) throws IOException {
}
Modified:
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java?rev=707020&r1=707019&r2=707020&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java
(original)
+++
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java
Wed Oct 22 03:20:31 2008
@@ -33,6 +33,7 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
+import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.util.TilesIOException;
@@ -229,6 +230,11 @@
}
/** [EMAIL PROTECTED] */
+ public TilesApplicationContext getApplicationContext() {
+ return this;
+ }
+
+ /** [EMAIL PROTECTED] */
public void dispatch(String path) throws IOException {
include(path);
}
Modified:
tiles/framework/trunk/tiles-portlet/src/test/java/org/apache/tiles/portlet/context/PortletTilesRequestContextTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-portlet/src/test/java/org/apache/tiles/portlet/context/PortletTilesRequestContextTest.java?rev=707020&r1=707019&r2=707020&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-portlet/src/test/java/org/apache/tiles/portlet/context/PortletTilesRequestContextTest.java
(original)
+++
tiles/framework/trunk/tiles-portlet/src/test/java/org/apache/tiles/portlet/context/PortletTilesRequestContextTest.java
Wed Oct 22 03:20:31 2008
@@ -116,6 +116,14 @@
}
/**
+ * Tests [EMAIL PROTECTED]
PortletTilesRequestContext#getApplicationContext()}.
+ */
+ public void testGetApplicationContext() {
+// assertTrue("The objects are not the same", context == context
+// .getApplicationContext());
+ }
+
+ /**
* Tests getting request scope attributes.
*/
public void testGetRequestScope() {
Modified:
tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContext.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContext.java?rev=707020&r1=707019&r2=707020&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContext.java
(original)
+++
tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContext.java
Wed Oct 22 03:20:31 2008
@@ -30,6 +30,7 @@
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.util.TilesIOException;
@@ -172,6 +173,11 @@
}
/** [EMAIL PROTECTED] */
+ public TilesApplicationContext getApplicationContext() {
+ return this;
+ }
+
+ /** [EMAIL PROTECTED] */
public void dispatch(String path) throws IOException {
if (response.isCommitted() || ServletUtil.isForceInclude(request)) {
include(path);
Modified:
tiles/framework/trunk/tiles-servlet/src/test/java/org/apache/tiles/servlet/context/ServletTilesRequestContextTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-servlet/src/test/java/org/apache/tiles/servlet/context/ServletTilesRequestContextTest.java?rev=707020&r1=707019&r2=707020&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-servlet/src/test/java/org/apache/tiles/servlet/context/ServletTilesRequestContextTest.java
(original)
+++
tiles/framework/trunk/tiles-servlet/src/test/java/org/apache/tiles/servlet/context/ServletTilesRequestContextTest.java
Wed Oct 22 03:20:31 2008
@@ -160,6 +160,14 @@
}
/**
+ * Tests [EMAIL PROTECTED]
ServletTilesRequestContext#getApplicationContext()}.
+ */
+ public void testGetApplicationContext() {
+ assertTrue("The objects are not the same", context == context
+ .getApplicationContext());
+ }
+
+ /**
* Tests getting application scope attributes.
*/
public void testGetApplicationScope() {
