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/01/12 17:17:24 UTC
svn commit: r733831 - in /tiles/framework/trunk:
src/site/apt/tutorial/advanced/utils.apt
tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java
tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java
Author: apetrelli
Date: Mon Jan 12 08:17:10 2009
New Revision: 733831
URL: http://svn.apache.org/viewvc?rev=733831&view=rev
Log:
TILES-348
Init parameter changed.
Added docs about this change.
Modified:
tiles/framework/trunk/src/site/apt/tutorial/advanced/utils.apt
tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java
tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java
Modified: tiles/framework/trunk/src/site/apt/tutorial/advanced/utils.apt
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/tutorial/advanced/utils.apt?rev=733831&r1=733830&r2=733831&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/apt/tutorial/advanced/utils.apt (original)
+++ tiles/framework/trunk/src/site/apt/tutorial/advanced/utils.apt Mon Jan 12 08:17:10 2009
@@ -49,6 +49,10 @@
</servlet-mapping>
------------------------------------
+ By using the <<<org.apache.tiles.web.util.TilesDispatchServlet.CONTAINER_KEY>>>
+ you can use a different container. The value of this parameter will be used
+ as the key under which the container is stored.
+
* <<<TilesDecorationFilter>>>
You can use the <<<TilesDecorationFilter>>> to use Tiles as a <decorator>
@@ -72,3 +76,7 @@
</init-param>
</filter>
------------------------------------
+
+ By using the <<<org.apache.tiles.web.util.TilesDecorationFilter.CONTAINER_KEY>>>
+ you can use a different container. The value of this parameter will be used
+ as the key under which the container is stored.
Modified: tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java?rev=733831&r1=733830&r2=733831&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java (original)
+++ tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java Mon Jan 12 08:17:10 2009
@@ -26,7 +26,6 @@
import org.apache.tiles.AttributeContext;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
-import org.apache.tiles.web.startup.BasicTilesServletInitializer;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
@@ -79,6 +78,14 @@
public class TilesDecorationFilter implements Filter {
/**
+ * Init parameter to define the key of the container to use.
+ *
+ * @since 2.1.2
+ */
+ public static final String CONTAINER_KEY_INIT_PARAMETER =
+ "org.apache.tiles.web.util.TilesDecorationFilter.CONTAINER_KEY";
+
+ /**
* The logging object.
*/
private static final Log LOG =
@@ -146,8 +153,8 @@
public void init(FilterConfig config) throws ServletException {
filterConfig = config;
- containerKey = filterConfig.getInitParameter(
- BasicTilesServletInitializer.CONTAINER_KEY_INIT_PARAMETER);
+ containerKey = filterConfig
+ .getInitParameter(CONTAINER_KEY_INIT_PARAMETER);
String temp = config.getInitParameter("attribute-name");
if (temp != null) {
Modified: tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java?rev=733831&r1=733830&r2=733831&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java (original)
+++ tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java Mon Jan 12 08:17:10 2009
@@ -25,7 +25,6 @@
import org.apache.tiles.TilesContainer;
import org.apache.tiles.AttributeContext;
import org.apache.tiles.access.TilesAccess;
-import org.apache.tiles.web.startup.BasicTilesServletInitializer;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
@@ -41,6 +40,14 @@
public class TilesDispatchServlet extends HttpServlet {
/**
+ * Init parameter to define the key of the container to use.
+ *
+ * @since 2.1.2
+ */
+ public static final String CONTAINER_KEY_INIT_PARAMETER =
+ "org.apache.tiles.web.util.TilesDispatchServlet.CONTAINER_KEY";
+
+ /**
* The logging object.
*/
private static final Log LOG =
@@ -63,7 +70,7 @@
super.init();
containerKey = getServletConfig().getInitParameter(
- BasicTilesServletInitializer.CONTAINER_KEY_INIT_PARAMETER);
+ CONTAINER_KEY_INIT_PARAMETER);
String temp = getInitParameter("mutator");
if (temp != null) {