You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by gr...@apache.org on 2006/04/28 21:49:26 UTC

svn commit: r397992 - in /struts/sandbox/trunk/tiles/src/java/org/apache/tiles: ./ context/ filter/ listener/ servlets/ taglib/ taglib/util/

Author: greddin
Date: Fri Apr 28 12:49:24 2006
New Revision: 397992

URL: http://svn.apache.org/viewcvs?rev=397992&view=rev
Log:
SB-13

Added context package with TilesContextFactory and servlet implementation.  Refactored core code to use new context.


Added:
    struts/sandbox/trunk/tiles/src/java/org/apache/tiles/context/
    struts/sandbox/trunk/tiles/src/java/org/apache/tiles/context/ServletTilesContext.java   (with props)
    struts/sandbox/trunk/tiles/src/java/org/apache/tiles/context/TilesContextFactory.java   (with props)
Modified:
    struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ComponentContext.java
    struts/sandbox/trunk/tiles/src/java/org/apache/tiles/Controller.java
    struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ControllerSupport.java
    struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionsUtil.java
    struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesContext.java
    struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesUtil.java
    struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesUtilImpl.java
    struts/sandbox/trunk/tiles/src/java/org/apache/tiles/UrlController.java
    struts/sandbox/trunk/tiles/src/java/org/apache/tiles/filter/TilesFilter.java
    struts/sandbox/trunk/tiles/src/java/org/apache/tiles/listener/TilesListener.java
    struts/sandbox/trunk/tiles/src/java/org/apache/tiles/servlets/TilesServlet.java
    struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/InitDefinitionsTag.java
    struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/InsertTag.java
    struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/util/TagUtils.java

Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ComponentContext.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ComponentContext.java?rev=397992&r1=397991&r2=397992&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ComponentContext.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ComponentContext.java Fri Apr 28 12:49:24 2006
@@ -25,7 +25,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.ServletRequest;
 import javax.servlet.jsp.PageContext;
 
 import org.apache.tiles.taglib.ComponentConstants;
@@ -177,26 +176,26 @@
 
     /**
      * Get component context from request.
-     * @param request ServletRequest.
+     * @param tilesContext current Tiles application context.
      * @return ComponentContext or null if context is not found or an
      * jspException is present in the request.
      */
-    static public ComponentContext getContext(ServletRequest request) {
-       if (request.getAttribute("javax.servlet.jsp.jspException") != null) {
+    static public ComponentContext getContext(TilesContext tilesContext) {
+       if (tilesContext.getRequestScope().get("javax.servlet.jsp.jspException") != null) {
            return null;
-        }        return (ComponentContext) request.getAttribute(
+        }        return (ComponentContext) tilesContext.getRequestScope().get(
             ComponentConstants.COMPONENT_CONTEXT);
     }
 
     /**
      * Store component context into request.
      * @param context ComponentContext to store.
-     * @param request Request to store ComponentContext.
+     * @param tilesContext current Tiles application context.
      */
     static public void setContext(
         ComponentContext context,
-        ServletRequest request) {
+        TilesContext tilesContext) {
             
-        request.setAttribute(ComponentConstants.COMPONENT_CONTEXT, context);
+        tilesContext.getRequestScope().put(ComponentConstants.COMPONENT_CONTEXT, context);
     }
 }

Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/Controller.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/Controller.java?rev=397992&r1=397991&r2=397992&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/Controller.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/Controller.java Fri Apr 28 12:49:24 2006
@@ -20,11 +20,6 @@
 
 import java.io.IOException;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 /**
  * A controller is a piece of code called before rendering a jsp page.
  * A controller can be associated to a tile. See <insert> or 
@@ -32,35 +27,14 @@
  */
 public interface Controller {
 
-	/**
-	 * Method associated to a tile and called immediately before the tile 
-     * is included.
-	 * @param tileContext Current tile context.
-	 * @param request Current request
-	 * @param response Current response
-	 * @param servletContext Current servlet context
-     * @deprecated Use execute() instead.  This will be removed after 
-     * Struts 1.2.
-	 */
-	public void perform(
-		ComponentContext tileContext,
-		HttpServletRequest request,
-		HttpServletResponse response,
-		ServletContext servletContext)
-		throws ServletException, IOException;
-        
     /**
      * Method associated to a tile and called immediately before the tile 
      * is included.
-     * @param tileContext Current tile context.
-     * @param request Current request
-     * @param response Current response
-     * @param servletContext Current servlet context
+     * @param tilesContext Current tiles application context.
+     * @param componentContext Current tile context.
      */
     public void execute(
-        ComponentContext tileContext,
-        HttpServletRequest request,
-        HttpServletResponse response,
-        ServletContext servletContext)
-        throws Exception;
+            TilesContext tilesContext, 
+            ComponentContext componentContext)
+            throws Exception;
 }

Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ControllerSupport.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ControllerSupport.java?rev=397992&r1=397991&r2=397992&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ControllerSupport.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/ControllerSupport.java Fri Apr 28 12:49:24 2006
@@ -20,11 +20,6 @@
 
 import java.io.IOException;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 /**
  * Basic implementation of Controller.  Implementations can extend this class
  * to insulate themselves from changes in the <code>Controller</code> 
@@ -32,34 +27,10 @@
  */
 public class ControllerSupport implements Controller {
 
-	/**
-	 * Method associated to a tile and called immediately before tile is 
-	 * included. This implementation does nothing.
-	 * @param tileContext Current tile context.
-	 * @param request Current request
-	 * @param response Current response
-	 * @param servletContext Current servlet context
-       * @deprecated Use execute() instead.  This will be removed after 
-       * Struts 1.2.
-	 */
-	public void perform(
-		ComponentContext tileContext,
-		HttpServletRequest request,
-		HttpServletResponse response,
-		ServletContext servletContext)
-		throws ServletException, IOException {
-	}
-
-	/**
-	 * @see org.apache.tiles.Controller#execute(org.apache.tiles.ComponentContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext)
-	 */
-	public void execute(
-		ComponentContext tileContext,
-		HttpServletRequest request,
-		HttpServletResponse response,
-		ServletContext servletContext)
-		throws Exception {
-
-            perform(tileContext, request, response, servletContext);
-	}
+    /**
+     * Stubs out controller method.
+     */
+    public void execute(TilesContext tilesContext, 
+            ComponentContext componentContext) throws Exception {
+    }
 }

Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionsUtil.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionsUtil.java?rev=397992&r1=397991&r2=397992&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionsUtil.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/DefinitionsUtil.java Fri Apr 28 12:49:24 2006
@@ -21,11 +21,9 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
+import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -85,14 +83,14 @@
      * If a factory class name is provided, a factory of this class is created. Otherwise,
      * default factory is created.
      * @param classname Class name of the factory to create.
-     * @param servletContext Servlet Context passed to newly created factory.
+     * @param tilesContext The current Tiles application context.
      * @param properties Map of name/property used to initialize factory configuration object.
      * @return newly created factory.
      * @throws DefinitionsFactoryException If an error occur while initializing factory
      * @deprecated Use createDefinitionsFactory(ServletContext servletContext, ServletConfig servletConfig)
      */
     public static DefinitionsFactory createDefinitionsFactory(
-        ServletContext servletContext,
+        TilesContext tilesContext,
         Map properties,
         String classname)
         throws DefinitionsFactoryException {
@@ -114,22 +112,22 @@
             factoryConfig.setFactoryClassname(classname);
 
         // Create factory using config object
-        return createDefinitionsFactory(servletContext, factoryConfig);
+        return createDefinitionsFactory(tilesContext, factoryConfig);
     }
 
     /**
      * Create default Definition factory.
-     * @param servletContext Servlet Context passed to newly created factory.
+     * @param tilesContext The current Tiles application context.
      * @param properties Map of name/property used to initialize factory configuration object.
      * @return newly created factory of type ConfigurableDefinitionsFactory.
      * @throws DefinitionsFactoryException If an error occur while initializing factory
      */
     public static DefinitionsFactory createDefinitionsFactory(
-        ServletContext servletContext,
+        TilesContext tilesContext,
         Map properties)
         throws DefinitionsFactoryException {
 
-        return createDefinitionsFactory(servletContext, properties, null);
+        return createDefinitionsFactory(tilesContext, properties, null);
     }
 
     /**
@@ -139,19 +137,17 @@
      * <p>
      * Convenience method. Calls createDefinitionsFactory(ServletContext servletContext, DefinitionsFactoryConfig factoryConfig)
      *
-     * @param servletContext Servlet Context passed to newly created factory.
-     * @param servletConfig Servlet config containing parameters to be passed to factory configuration object.
+     * @param tilesContext The current Tiles application context.
      * @return newly created factory of type ConfigurableDefinitionsFactory.
      * @throws DefinitionsFactoryException If an error occur while initializing factory
      */
     public static DefinitionsFactory createDefinitionsFactory(
-        ServletContext servletContext,
-        ServletConfig servletConfig)
+        TilesContext tilesContext)
         throws DefinitionsFactoryException {
 
-        DefinitionsFactoryConfig factoryConfig = readFactoryConfig(servletConfig);
+        DefinitionsFactoryConfig factoryConfig = readFactoryConfig(tilesContext);
 
-        return createDefinitionsFactory(servletContext, factoryConfig);
+        return createDefinitionsFactory(tilesContext, factoryConfig);
     }
 
     /**
@@ -166,7 +162,7 @@
      * <p>
      * Convenience method. Calls createDefinitionsFactory(ServletContext servletContext, DefinitionsFactoryConfig factoryConfig)
      *
-     * @param servletContext Servlet Context passed to newly created factory.
+     * @param tilesContext The current Tiles application context.
      * @param servletConfig Servlet config containing parameters to be passed to factory configuration object.
      * @param checkIfExist Check if factory already exist. If true and factory exist, return it.
      * If true and factory doesn't exist, create it. If false, create it in all cases.
@@ -174,37 +170,38 @@
      * @throws DefinitionsFactoryException If an error occur while initializing factory
      */
     public static DefinitionsFactory createDefinitionsFactory(
-        ServletContext servletContext,
-        ServletConfig servletConfig,
+        TilesContext tilesContext,
         boolean checkIfExist)
         throws DefinitionsFactoryException {
 
         if (checkIfExist) {
             // Check if already exist in context
-            DefinitionsFactory factory = getDefinitionsFactory(servletContext);
+            DefinitionsFactory factory = getDefinitionsFactory(tilesContext);
             if (factory != null)
                 return factory;
         }
 
-        return createDefinitionsFactory(servletContext, servletConfig);
+        return createDefinitionsFactory(tilesContext);
     }
 
     /**
      * Get definition factory from appropriate servlet context.
+     *
+     * @param tilesContext the current Tiles application context.
      * @return Definitions factory or null if not found.
      * @deprecated Use {@link TilesUtil#getDefinitionsFactory(ServletRequest, ServletContext)}
      * @since 20020708
      */
-    public static DefinitionsFactory getDefinitionsFactory(ServletContext servletContext) {
-        return (DefinitionsFactory) servletContext.getAttribute(DEFINITIONS_FACTORY);
+    public static DefinitionsFactory getDefinitionsFactory(TilesContext tilesContext) {
+        return (DefinitionsFactory) tilesContext.getApplicationScope().get(DEFINITIONS_FACTORY);
     }
 
     /**
      * Get Definition stored in jsp context by an action.
      * @return ComponentDefinition or null if not found.
      */
-    public static ComponentDefinition getActionDefinition(ServletRequest request) {
-        return (ComponentDefinition) request.getAttribute(ACTION_DEFINITION);
+    public static ComponentDefinition getActionDefinition(TilesContext tilesContext) {
+        return (ComponentDefinition) tilesContext.getRequestScope().get(ACTION_DEFINITION);
     }
 
     /**
@@ -212,10 +209,10 @@
      * Mainly used by Struts to pass a definition defined in an Action to the forward.
      */
     public static void setActionDefinition(
-        ServletRequest request,
+        TilesContext tilesContext,
         ComponentDefinition definition) {
 
-        request.setAttribute(ACTION_DEFINITION, definition);
+        tilesContext.getRequestScope().put(ACTION_DEFINITION, definition);
     }
 
     /**
@@ -223,16 +220,16 @@
      * Mainly used by Struts to pass a definition defined in an Action to the forward.
      */
     public static void removeActionDefinition(
-        ServletRequest request,
+        TilesContext tilesContext,
         ComponentDefinition definition) {
 
-        request.removeAttribute(ACTION_DEFINITION);
+        tilesContext.getRequestScope().remove(ACTION_DEFINITION);
     }
 
     /**
      * Populate Definition Factory Config from web.xml properties.
      * @param factoryConfig Definition Factory Config to populate.
-     * @param servletConfig Current servlet config containing web.xml properties.
+     * @param tilesContext The current Tiles application context.
      * @exception IllegalAccessException if the caller does not have
      *  access to the property accessor method
      * @exception java.lang.reflect.InvocationTargetException if the property accessor method
@@ -242,22 +239,21 @@
      */
     public static void populateDefinitionsFactoryConfig(
         DefinitionsFactoryConfig factoryConfig,
-        ServletConfig servletConfig)
+        TilesContext tilesContext)
         throws IllegalAccessException, InvocationTargetException {
 
-        Map properties = new DefinitionsUtil.ServletPropertiesMap(servletConfig);
+        Map properties = new DefinitionsUtil.ServletPropertiesMap(tilesContext);
         factoryConfig.populate(properties);
     }
 
     /**
      * Create FactoryConfig and initialize it from web.xml.
      *
-     * @param servletConfig ServletConfig for the module with which
-     *  this plug in is associated
+     * @param tilesContext the current Tiles application context.
      * @exception DefinitionsFactoryException if this <code>PlugIn</code> cannot
      *  be successfully initialized
      */
-    protected static DefinitionsFactoryConfig readFactoryConfig(ServletConfig servletConfig)
+    protected static DefinitionsFactoryConfig readFactoryConfig(TilesContext tilesContext)
         throws DefinitionsFactoryException {
 
         // Create tiles definitions config object
@@ -267,7 +263,7 @@
         try {
             DefinitionsUtil.populateDefinitionsFactoryConfig(
                 factoryConfig,
-                servletConfig);
+                tilesContext);
 
         } catch (Exception ex) {
             ex.printStackTrace();
@@ -281,7 +277,7 @@
 
     /**
      * Inner class.
-     * Wrapper for ServletContext init parameters.
+     * Wrapper for application init parameters.
      * Object of this class is an hashmap containing parameters and values
      * defined in the servlet config file (web.xml).
      */
@@ -289,14 +285,15 @@
         /**
          * Constructor.
          */
-        ServletPropertiesMap(ServletConfig config) {
+        ServletPropertiesMap(TilesContext tilesContext) {
             // This implementation is very simple.
             // It is possible to avoid creation of a new structure, but this need
             // imply writing all Map interface.
-            Enumeration e = config.getInitParameterNames();
-            while (e.hasMoreElements()) {
-                String key = (String) e.nextElement();
-                put(key, config.getInitParameter(key));
+            Set initParams = tilesContext.getInitParams().keySet();
+            Iterator i = initParams.iterator();
+            while (i.hasNext()) {
+                String key = (String) i.next();
+                put(key, tilesContext.getInitParams().get(key));
             }
         }
     } // end inner class

Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesContext.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesContext.java?rev=397992&r1=397991&r2=397992&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesContext.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesContext.java Fri Apr 28 12:49:24 2006
@@ -18,6 +18,10 @@
 
 package org.apache.tiles;
 
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Locale;
 import java.util.Map;
 
 /**
@@ -50,7 +54,7 @@
      * Return an immutable Map that maps context application initialization 
      * parameters to their values.
      */
-    public Map getInitParmas();
+    public Map getInitParams();
     
     /**
      * Return an immutable Map that maps request parameter names to the first 
@@ -75,4 +79,24 @@
      * values.
      */
     public Map getSessionScope();
+    
+    /**
+     * Dispatches the request to a specified path.
+     */
+    public void dispatch(String path) throws IOException, Exception;
+    
+    /**
+     * Includes the response from the specified URL in the current response output.
+     */
+    public void include(String path) throws IOException, Exception;
+    
+    /**
+     * Return a URL for the application resource mapped to the specified path.
+     */
+    public URL getResource(String path) throws MalformedURLException;
+    
+    /**
+     * Return the preferred Locale in which the client will accept content.
+     */
+    public Locale getRequestLocale();
 }

Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesUtil.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesUtil.java?rev=397992&r1=397991&r2=397992&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesUtil.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesUtil.java Fri Apr 28 12:49:24 2006
@@ -20,11 +20,6 @@
 
 import java.io.IOException;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import javax.servlet.jsp.PageContext;
 
 import org.apache.commons.logging.Log;
@@ -88,18 +83,14 @@
      *
      * This method is used by the Tiles package anytime a forward is required.
      * @param uri Uri or Definition name to forward.
-     * @param request Current page request.
-     * @param response Current page response.
-     * @param servletContext Current servlet context.
+     * @param tilesContext Current Tiles application context.
      */
     public static void doForward(
         String uri,
-        HttpServletRequest request,
-        HttpServletResponse response,
-        ServletContext servletContext)
-        throws IOException, ServletException {
+        TilesContext tilesContext)
+        throws IOException, Exception {
             
-        tilesUtilImpl.doForward(uri, request, response, servletContext);
+        tilesUtilImpl.doForward(uri, tilesContext);
     }
 
     /**
@@ -108,18 +99,14 @@
      * This method is used by the Tiles package when an include is required.
      * The Tiles package can use indifferently any form of this method.
      * @param uri Uri or Definition name to forward.
-     * @param request Current page request.
-     * @param response Current page response.
-     * @param servletContext Current servlet context.
+     * @param tilesContext Current Tiles application context.
      */
     public static void doInclude(
         String uri,
-        HttpServletRequest request,
-        HttpServletResponse response,
-        ServletContext servletContext)
-        throws IOException, ServletException {
+        TilesContext tilesContext)
+        throws IOException, Exception {
             
-        tilesUtilImpl.doInclude(uri, request, response, servletContext);
+        tilesUtilImpl.doInclude(uri, tilesContext);
     }
 
     /**
@@ -131,7 +118,7 @@
      * @param pageContext Current page context.
      */
     public static void doInclude(String uri, PageContext pageContext)
-        throws IOException, ServletException {
+        throws IOException, Exception {
         doInclude(uri, pageContext, true);
     }
     
@@ -145,7 +132,7 @@
      * @param pageContext Current page context.
      */
     public static void doInclude(String uri, PageContext pageContext, boolean flush)
-        throws IOException, ServletException {
+        throws IOException, Exception {
         tilesUtilImpl.doInclude(uri, pageContext, flush);
     }
 
@@ -154,9 +141,8 @@
      * @return Definitions factory or <code>null</code> if not found.
      */
     public static DefinitionsFactory getDefinitionsFactory(
-        ServletRequest request,
-        ServletContext servletContext) {
-        return tilesUtilImpl.getDefinitionsFactory(request, servletContext);
+        TilesContext tilesContext) {
+        return tilesUtilImpl.getDefinitionsFactory(tilesContext);
     }
 
     /**
@@ -167,16 +153,16 @@
      * <p>
      * Fallback of several factory creation methods.
      *
-     * @param servletContext Servlet Context passed to newly created factory.
+     * @param tilesContext Current Tiles application context.
      * @param factoryConfig Configuration object passed to factory.
      * @return newly created factory of type ConfigurableDefinitionsFactory.
      * @throws DefinitionsFactoryException If an error occur while initializing factory
      */
     public static DefinitionsFactory createDefinitionsFactory(
-        ServletContext servletContext,
+        TilesContext tilesContext,
         DefinitionsFactoryConfig factoryConfig)
         throws DefinitionsFactoryException {
-        return tilesUtilImpl.createDefinitionsFactory(servletContext, factoryConfig);
+        return tilesUtilImpl.createDefinitionsFactory(tilesContext, factoryConfig);
     }
 
     /**
@@ -184,19 +170,17 @@
      * First, retrieve definition factory and then get requested definition.
      * Throw appropriate exception if definition or definition factory is not found.
      * @param definitionName Name of requested definition.
-     * @param request Current servelet request.
-     * @param servletContext current servlet context.
+     * @param tilesContext Current Tiles application context.
      * @throws FactoryNotFoundException Can't find definition factory.
      * @throws DefinitionsFactoryException General error in factory while getting definition.
      * @throws NoSuchDefinitionException No definition found for specified name
      */
     public static ComponentDefinition getDefinition(
         String definitionName,
-        ServletRequest request,
-        ServletContext servletContext)
+        TilesContext tilesContext)
         throws FactoryNotFoundException, DefinitionsFactoryException {
             
-        return tilesUtilImpl.getDefinition(definitionName, request, servletContext);
+        return tilesUtilImpl.getDefinition(definitionName, tilesContext);
     }
 
     /**

Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesUtilImpl.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesUtilImpl.java?rev=397992&r1=397991&r2=397992&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesUtilImpl.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/TilesUtilImpl.java Fri Apr 28 12:49:24 2006
@@ -29,11 +29,6 @@
 import java.util.Map;
 import java.util.StringTokenizer;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import javax.servlet.jsp.PageContext;
 
 import org.apache.commons.logging.Log;
@@ -84,17 +79,14 @@
      *
      * This method is used by the Tiles package anytime a forward is required.
      * @param uri Uri or Definition name to forward.
-     * @param request Current page request.
-     * @param servletContext Current servlet context.
+     * @param tilesContext Current Tiles application context.
      */
     public void doForward(
         String uri,
-        HttpServletRequest request,
-        HttpServletResponse response,
-        ServletContext servletContext)
-        throws IOException, ServletException {
+        TilesContext tilesContext)
+        throws IOException, Exception {
             
-        request.getRequestDispatcher(uri).forward(request, response);
+        tilesContext.dispatch(uri);
     }
 
     /**
@@ -103,18 +95,14 @@
      * This method is used by the Tiles package when an include is required.
      * The Tiles package can use indifferently any form of this method.
      * @param uri Uri or Definition name to forward.
-     * @param request Current page request.
-     * @param response Current page response.
-     * @param servletContext Current servlet context.
+     * @param tilesContext Current Tiles application context.
      */
     public void doInclude(
         String uri,
-        HttpServletRequest request,
-        HttpServletResponse response,
-        ServletContext servletContext)
-        throws IOException, ServletException {
+        TilesContext tilesContext)
+        throws IOException, Exception {
             
-        request.getRequestDispatcher(uri).include(request, response);
+        tilesContext.include(uri);
     }
 
     /**
@@ -127,7 +115,7 @@
      * @param flush If the writer should be flushed before the include
      */
     public void doInclude(String uri, PageContext pageContext, boolean flush)
-        throws IOException, ServletException {
+        throws IOException, Exception {
         try {
             // perform include with new JSP 2.0 method that supports flushing
             if (include != null) {
@@ -148,10 +136,9 @@
      * @return Definitions factory or <code>null</code> if not found.
      */
     public DefinitionsFactory getDefinitionsFactory(
-        ServletRequest request,
-        ServletContext servletContext) {
+            TilesContext tilesContext) {
             
-        return (DefinitionsFactory) servletContext.getAttribute(DEFINITIONS_FACTORY);
+        return (DefinitionsFactory) tilesContext.getApplicationScope().get(DEFINITIONS_FACTORY);
     }
 
     /**
@@ -163,13 +150,13 @@
      * Factory creation is done by {@link #createDefinitionFactoryInstance(String)}.
      * <p>
      *
-     * @param servletContext Servlet Context passed to newly created factory.
+     * @param tilesContext current Tiles application context.
      * @param factoryConfig Configuration object passed to factory.
      * @return newly created factory of type specified in the config object.
      * @throws DefinitionsFactoryException If an error occur while initializing factory
      */
     public DefinitionsFactory createDefinitionsFactory(
-        ServletContext servletContext,
+        TilesContext tilesContext,
         DefinitionsFactoryConfig factoryConfig)
         throws DefinitionsFactoryException {
             
@@ -194,7 +181,7 @@
         try {
             for (int i = 0; i < filenames.size(); i++) {
                 String filename = (String) filenames.get(i);
-                factory.addSource(servletContext.getResource(filename));
+                factory.addSource(tilesContext.getResource(filename));
             }
         } catch (MalformedURLException e) {
             throw new DefinitionsFactoryException("Problem with filename URL: ", e);
@@ -203,37 +190,36 @@
         ComponentDefinitions definitions = factory.readDefinitions();
         
         // Make factory accessible from jsp tags (push it in appropriate context)
-        makeDefinitionsFactoryAccessible(factory, servletContext);
-        makeDefinitionsAccessible(definitions, servletContext);
+        makeDefinitionsFactoryAccessible(factory, tilesContext);
+        makeDefinitionsAccessible(definitions, tilesContext);
         
         return factory;
     }
 
     public ComponentDefinition getDefinition(String definitionName,
-            ServletRequest request,
-            ServletContext servletContext) 
+            TilesContext tilesContext) 
             throws FactoryNotFoundException, DefinitionsFactoryException {
         
         try {
-            DefinitionsFactory factory = getDefinitionsFactory(request, servletContext);
+            DefinitionsFactory factory = getDefinitionsFactory(tilesContext);
             ComponentDefinitions definitions = (ComponentDefinitions) 
-                servletContext.getAttribute(TilesUtilImpl.DEFINITIONS_OBJECT);
+                tilesContext.getApplicationScope().get(TilesUtilImpl.DEFINITIONS_OBJECT);
             ComponentDefinition definition = definitions.getDefinition(
-                    definitionName, request.getLocale());
+                    definitionName, tilesContext.getRequestLocale());
             
             if (definition == null) {
-                if (!factory.isLocaleProcessed(request.getLocale())) {
+                if (!factory.isLocaleProcessed(tilesContext.getRequestLocale())) {
                     // FIXME This will modify the factory as well as the definitions
                     // but we are only locking the definitions.
                     // 
                     // We'll have to refactor again to remove this issue.
                     synchronized (definitions) {
-                        factory.addDefinitions(definitions, request.getLocale());
+                        factory.addDefinitions(definitions, tilesContext.getRequestLocale());
                     }
                 }
                 
                 definition = definitions.getDefinition(
-                    definitionName, request.getLocale());
+                    definitionName, tilesContext.getRequestLocale());
             }
             
             return definition;
@@ -284,26 +270,26 @@
      * Make definition factory accessible to Tags.
      * Factory is stored in servlet context.
      * @param factory Factory to be made accessible.
-     * @param servletContext Current servlet context.
+     * @param tilesContext Current application context.
      */
     protected void makeDefinitionsFactoryAccessible(
         DefinitionsFactory factory,
-        ServletContext servletContext) {
+        TilesContext tilesContext) {
             
-        servletContext.setAttribute(DEFINITIONS_FACTORY, factory);
+        tilesContext.getApplicationScope().put(DEFINITIONS_FACTORY, factory);
     }
 
     /**
      * Make definition factory accessible to Tags.
      * Factory is stored in servlet context.
      * @param definitions Definition factory to be made accessible
-     * @param servletContext Current servlet context.
+     * @param tilesContext current Tiles application context.
      */
     protected void makeDefinitionsAccessible(
         ComponentDefinitions definitions,
-        ServletContext servletContext) {
+        TilesContext tilesContext) {
             
-        servletContext.setAttribute(DEFINITIONS_OBJECT, definitions);
+        tilesContext.getApplicationScope().put(DEFINITIONS_OBJECT, definitions);
     }
 
     /**

Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/UrlController.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/UrlController.java?rev=397992&r1=397991&r2=397992&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/UrlController.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/UrlController.java Fri Apr 28 12:49:24 2006
@@ -20,74 +20,32 @@
 
 import java.io.IOException;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 /**
  * Tiles controller including a local URL.
  */
 public class UrlController implements Controller {
 
-	/** 
-	 * URL associated with this controller. 
-	 */
-	protected String url = null;
-
-	/**
-	 * Constructor.
-	 * @param url URL.
-	 */
-	public UrlController(String url) {
-		this.url = url;
-	}
-
-	/**
-	 * Method associated to a tile and called immediately before the tile 
-	 * is included.  This implementation calls an <code>Action</code>. 
-	 * No servlet is set by this method.
-	 *
-	 * @param tileContext Current tile context.
-	 * @param request Current request.
-	 * @param response Current response.
-	 * @param servletContext Current servlet context.
-	 */
-	public void perform(
-		ComponentContext tileContext,
-		HttpServletRequest request,
-		HttpServletResponse response,
-		ServletContext servletContext)
-		throws ServletException, IOException {
-
-		RequestDispatcher rd = servletContext.getRequestDispatcher(url);
-		if (rd == null) {
-			throw new ServletException(
-				"Controller can't find url '" + url + "'.");
-		}
-
-		rd.include(request, response);
-	}
-
-	/**
-	 * @see org.apache.tiles.Controller#execute(org.apache.tiles.ComponentContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext)
-	 */
-	public void execute(
-		ComponentContext tileContext,
-		HttpServletRequest request,
-		HttpServletResponse response,
-		ServletContext servletContext)
-		throws Exception {
-            
-		RequestDispatcher rd = servletContext.getRequestDispatcher(url);
-		if (rd == null) {
-			throw new ServletException(
-				"Controller can't find url '" + url + "'.");
-		}
-
-		rd.include(request, response);
-
-	}
+    /** 
+     * URL associated with this controller. 
+     */
+    protected String url = null;
+
+    /**
+     * Constructor.
+     * @param url URL.
+     */
+    public UrlController(String url) {
+            this.url = url;
+    }
+
+    /**
+     * @see org.apache.tiles.Controller#execute(org.apache.tiles.TilesContext, org.apache.tiles.ComponentContext)
+     */
+    public void execute(TilesContext tilesContext, 
+            ComponentContext componentContext) 
+            throws Exception {
+        
+        tilesContext.include(url);
+    }
 
 }

Added: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/context/ServletTilesContext.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/context/ServletTilesContext.java?rev=397992&view=auto
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/context/ServletTilesContext.java (added)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/context/ServletTilesContext.java Fri Apr 28 12:49:24 2006
@@ -0,0 +1,147 @@
+/*
+ * $Id$
+ *
+ * Copyright 1999-2006 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.tiles.context;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import org.apache.tiles.TilesContext;
+
+/**
+ * Servlet-bsed implementation of the TilesContext interface.
+ *
+ * @version $Rev$ $Date$
+ */
+public class ServletTilesContext implements TilesContext {
+
+    private ServletContext servletContext;
+    
+    private ServletRequest request;
+    
+    private ServletResponse response;
+    
+    /** Creates a new instance of ServletTilesContext */
+    public ServletTilesContext(ServletContext servletContext) {
+        this.servletContext = servletContext;
+    }
+
+    /** Creates a new instance of ServletTilesContext */
+    public ServletTilesContext(ServletContext servletContext, ServletRequest request) {
+        this.servletContext = servletContext;
+        this.request = request;
+    }
+
+    /** Creates a new instance of ServletTilesContext */
+    public ServletTilesContext(ServletContext servletContext, 
+            ServletRequest request,
+            ServletResponse response) {
+        this.servletContext = servletContext;
+        this.request = request;
+        this.response = response;
+    }
+
+    public Map getApplicationScope() {
+        Enumeration e = servletContext.getAttributeNames();
+        Map contextMap = new HashMap();
+        while (e.hasMoreElements()) {
+            String key = (String)  e.nextElement();
+            contextMap.put(key, servletContext.getAttribute(key));
+        }
+        
+        return contextMap;
+    }
+
+    public Map getHeader() {
+        return null;
+    }
+
+    public Map getHeaderValues() {
+        return null;
+    }
+
+    public Map getInitParams() {
+        Enumeration e = servletContext.getInitParameterNames();
+        Map paramMap = new HashMap();
+        while (e.hasMoreElements()) {
+            String key = (String) e.nextElement();
+            paramMap.put(key, servletContext.getInitParameter(key));
+        }
+        
+        return paramMap;
+    }
+
+    public Map getParam() {
+        return null;
+    }
+
+    public Map getParamValues() {
+        return request.getParameterMap();
+    }
+
+    public Map getRequestScope() {
+        Enumeration e = request.getAttributeNames();
+        Map params = new HashMap();
+        while (e.hasMoreElements()) {
+            String key = (String) e.nextElement();
+            params.put(key, request.getAttribute(key));
+        }
+        
+        return params;
+    }
+
+    public Map getSessionScope() {
+        return null;
+    }
+
+    public void dispatch(String path) throws IOException, Exception {
+        RequestDispatcher rd = request.getRequestDispatcher(path);
+        try {
+            rd.forward(request, response);
+        } catch (ServletException ex) {
+            throw new Exception("Error forwarding request.", ex);
+        }
+    }
+
+    public void include(String path) throws IOException, Exception {
+        RequestDispatcher rd = request.getRequestDispatcher(path);
+        try {
+            rd.include(request, response);
+        } catch (ServletException ex) {
+            throw new Exception("Error including path.", ex);
+        }
+    }
+
+    public URL getResource(String path) throws MalformedURLException {
+        return servletContext.getResource(path);
+    }
+
+    public Locale getRequestLocale() {
+        return request.getLocale();
+    }
+    
+}

Propchange: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/context/ServletTilesContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/context/ServletTilesContext.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/context/TilesContextFactory.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/context/TilesContextFactory.java?rev=397992&view=auto
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/context/TilesContextFactory.java (added)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/context/TilesContextFactory.java Fri Apr 28 12:49:24 2006
@@ -0,0 +1,49 @@
+/*
+ * $Id$
+ *
+ * Copyright 1999-2006 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.tiles.context;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletRequest;
+import javax.servlet.jsp.PageContext;
+import org.apache.tiles.TilesContext;
+
+/**
+ * Creates an instance of the appropriate TilesContext implementation.
+ *
+ * @version $Rev$ $Date$
+ */
+public class TilesContextFactory {
+    
+    /**
+     * Creates a TilesContext from parameters found in the Servlet environment.
+     */
+    public static TilesContext getInstance(ServletRequest request, 
+            ServletContext servletContext) {
+        return new ServletTilesContext(servletContext, request);
+    }
+
+    public static TilesContext getInstance(ServletContext servletContext) {
+        return new ServletTilesContext(servletContext);
+    }
+
+    public static TilesContext getInstance(PageContext pageContext) {
+        return new ServletTilesContext(pageContext.getServletContext(), 
+                pageContext.getRequest(), pageContext.getResponse());
+    }
+}

Propchange: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/context/TilesContextFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/context/TilesContextFactory.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/filter/TilesFilter.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/filter/TilesFilter.java?rev=397992&r1=397991&r2=397992&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/filter/TilesFilter.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/filter/TilesFilter.java Fri Apr 28 12:49:24 2006
@@ -28,8 +28,10 @@
 import org.apache.tiles.ComponentDefinitions;
 import org.apache.tiles.DefinitionsFactory;
 import org.apache.tiles.ReloadableDefinitionsFactory;
+import org.apache.tiles.TilesContext;
 import org.apache.tiles.TilesUtil;
 import org.apache.tiles.TilesUtilImpl;
+import org.apache.tiles.context.TilesContextFactory;
 
 /**
  * Processes Reloadable Tiles Definitions.
@@ -64,8 +66,9 @@
             throws IOException, ServletException {
         
         try {
-            DefinitionsFactory factory = TilesUtil.getDefinitionsFactory(request, 
-                    filterConfig.getServletContext());
+            TilesContext tilesContext = TilesContextFactory.getInstance(
+                    request, filterConfig.getServletContext());
+            DefinitionsFactory factory = TilesUtil.getDefinitionsFactory(tilesContext);
             
             if (factory instanceof ReloadableDefinitionsFactory) {
                 if (((ReloadableDefinitionsFactory) factory).refreshRequired()) {

Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/listener/TilesListener.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/listener/TilesListener.java?rev=397992&r1=397991&r2=397992&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/listener/TilesListener.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/listener/TilesListener.java Fri Apr 28 12:49:24 2006
@@ -30,8 +30,10 @@
 import org.apache.tiles.DefinitionsFactory;
 import org.apache.tiles.DefinitionsFactoryConfig;
 import org.apache.tiles.DefinitionsFactoryException;
+import org.apache.tiles.TilesContext;
 import org.apache.tiles.TilesUtil;
 import org.apache.tiles.TilesUtilImpl;
+import org.apache.tiles.context.TilesContextFactory;
 
 /**
  * @version $Rev$ $Date$
@@ -151,8 +153,9 @@
         logger.info("initializing definitions factory...");
         // Create configurable factory
         try {
+            TilesContext tilesContext = TilesContextFactory.getInstance(servletContext);
             definitionFactory = TilesUtil.createDefinitionsFactory(
-                                            servletContext, factoryConfig);
+                                            tilesContext, factoryConfig);
         } catch (DefinitionsFactoryException ex) {
                     ex.printStackTrace();
             throw new ServletException(ex.getMessage(), ex);

Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/servlets/TilesServlet.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/servlets/TilesServlet.java?rev=397992&r1=397991&r2=397992&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/servlets/TilesServlet.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/servlets/TilesServlet.java Fri Apr 28 12:49:24 2006
@@ -30,6 +30,7 @@
 import java.util.logging.Logger;
 
 import org.apache.tiles.*;
+import org.apache.tiles.context.TilesContextFactory;
 
 /**
  * This is the entry point for Tiles. The <code>TilesServlet</code> initializes
@@ -223,13 +224,14 @@
 	 * @param factoryConfig The definitions factory config
 	 */
    private void initDefinitionsFactory(ServletContext servletContext,
-        											DefinitionsFactoryConfig factoryConfig)
-        											throws ServletException {
+        DefinitionsFactoryConfig factoryConfig)
+        throws ServletException {
 		logger.info("initializing definitions factory...");
 		// Create configurable factory
 		try {
+                    TilesContext tilesContext = TilesContextFactory.getInstance(servletContext);
 			definitionFactory = DefinitionsUtil.createDefinitionsFactory(
-											servletContext, factoryConfig);
+                                tilesContext, factoryConfig);
 		} catch (DefinitionsFactoryException ex) {
                     ex.printStackTrace();
 			throw new ServletException(ex.getMessage(), ex);

Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/InitDefinitionsTag.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/InitDefinitionsTag.java?rev=397992&r1=397991&r2=397992&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/InitDefinitionsTag.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/InitDefinitionsTag.java Fri Apr 28 12:49:24 2006
@@ -25,7 +25,9 @@
 import org.apache.tiles.DefinitionsFactory;
 import org.apache.tiles.DefinitionsFactoryConfig;
 import org.apache.tiles.DefinitionsFactoryException;
+import org.apache.tiles.TilesContext;
 import org.apache.tiles.TilesUtil;
+import org.apache.tiles.context.TilesContextFactory;
 
   /**
    * Init definitions factory.
@@ -69,26 +71,25 @@
     /**
      * Do start tag.
      */
-  public int doStartTag() throws JspException
-  {
-  DefinitionsFactory factory = TilesUtil.getDefinitionsFactory(pageContext.getRequest(),pageContext.getServletContext());
-  if(factory != null )
-    return SKIP_BODY;
-
-  DefinitionsFactoryConfig factoryConfig = new DefinitionsFactoryConfig();
-  factoryConfig.setFactoryClassname( classname );
-  factoryConfig.setDefinitionConfigFiles( filename );
-
-  try
-    {
-    factory = TilesUtil.createDefinitionsFactory(pageContext.getServletContext(), factoryConfig);
-    }
-   catch( DefinitionsFactoryException ex )
-      {
-      ex.printStackTrace();
-      throw new JspException( ex );
+  public int doStartTag() throws JspException {
+      TilesContext tilesContext = TilesContextFactory.getInstance(pageContext);
+      DefinitionsFactory factory = TilesUtil.getDefinitionsFactory(tilesContext);
+      if(factory != null ) {
+        return SKIP_BODY;
+      }
+
+      DefinitionsFactoryConfig factoryConfig = new DefinitionsFactoryConfig();
+      factoryConfig.setFactoryClassname( classname );
+      factoryConfig.setDefinitionConfigFiles( filename );
+
+      try {
+        factory = TilesUtil.createDefinitionsFactory(tilesContext, factoryConfig);
+      } catch( DefinitionsFactoryException ex ) {
+          ex.printStackTrace();
+          throw new JspException( ex );
       }
-  return SKIP_BODY;
+    
+      return SKIP_BODY;
   }
 
     /**

Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/InsertTag.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/InsertTag.java?rev=397992&r1=397991&r2=397992&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/InsertTag.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/InsertTag.java Fri Apr 28 12:49:24 2006
@@ -32,6 +32,8 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.tiles.ComponentAttribute;
+import org.apache.tiles.TilesContext;
+import org.apache.tiles.context.TilesContextFactory;
 import org.apache.tiles.taglib.util.TagUtils;
 import org.apache.tiles.ComponentContext;
 import org.apache.tiles.ComponentDefinition;
@@ -550,40 +552,39 @@
 	protected TagHandler processDefinitionName(String name)
 		throws JspException {
 
-		try {
-			ComponentDefinition definition =
-				TilesUtil.getDefinition(
-					name,
-					(HttpServletRequest) pageContext.getRequest(),
-					pageContext.getServletContext());
-
-			if (definition == null) { // is it possible ?
-				throw new NoSuchDefinitionException();
-			}
-
-			return processDefinition(definition);
-
-		} catch (NoSuchDefinitionException ex) {
-			throw new JspException(
-				"Error -  Tag Insert : Can't get definition '"
-					+ definitionName
-					+ "'. Check if this name exist in definitions factory.", ex);
-
-		} catch (FactoryNotFoundException ex) {
-			throw new JspException(ex.getMessage());
-
-		} catch (DefinitionsFactoryException ex) {
-			if (log.isDebugEnabled()) {
-				ex.printStackTrace();
-			}
-
-			// Save exception to be able to show it later
-			pageContext.setAttribute(
-				ComponentConstants.EXCEPTION_KEY,
-				ex,
-				PageContext.REQUEST_SCOPE);
-			throw new JspException(ex);
-		}
+            try {
+                TilesContext tilesContext = TilesContextFactory.getInstance(
+                        pageContext);
+                ComponentDefinition definition = TilesUtil.getDefinition(
+                        name, tilesContext);
+
+                if (definition == null) { // is it possible ?
+                    throw new NoSuchDefinitionException();
+                }
+
+                return processDefinition(definition);
+
+            } catch (NoSuchDefinitionException ex) {
+                throw new JspException(
+                        "Error -  Tag Insert : Can't get definition '"
+                        + definitionName
+                        + "'. Check if this name exist in definitions factory.", ex);
+
+            } catch (FactoryNotFoundException ex) {
+                throw new JspException(ex.getMessage());
+
+            } catch (DefinitionsFactoryException ex) {
+                if (log.isDebugEnabled()) {
+                    ex.printStackTrace();
+                }
+
+                // Save exception to be able to show it later
+                pageContext.setAttribute(
+                    ComponentConstants.EXCEPTION_KEY,
+                    ex,
+                    PageContext.REQUEST_SCOPE);
+                throw new JspException(ex);
+            }
 	}
 
 	/**
@@ -700,23 +701,22 @@
 	 */
 	public TagHandler processAsDefinitionOrURL(String name)
 		throws JspException {
-		try {
-			ComponentDefinition definition =
-				TilesUtil.getDefinition(
-					name,
-					pageContext.getRequest(),
-					pageContext.getServletContext());
-
-			if (definition != null) {
-				return processDefinition(definition);
-			}
+            
+            try {
+                TilesContext tilesContext = TilesContextFactory.getInstance(pageContext);
+                ComponentDefinition definition =
+                        TilesUtil.getDefinition(name, tilesContext);
+
+                if (definition != null) {
+                    return processDefinition(definition);
+                }
 
-		} catch (DefinitionsFactoryException ex) {
-			// silently failed, because we can choose to not define a factory.
-		}
+            } catch (DefinitionsFactoryException ex) {
+                // silently failed, because we can choose to not define a factory.
+            }
 
-		// no definition found, try as url
-		return processUrl(name);
+            // no definition found, try as url
+            return processUrl(name);
 	}
 
 	/**
@@ -759,7 +759,7 @@
 	 * @throws IOException - Thrown by call to pageContext.include()
 	 */
 	protected void doInclude(String page, boolean flush)
-		throws ServletException, IOException {
+		throws Exception, IOException {
 		TilesUtil.doInclude(page, pageContext, flush);
 	}
 
@@ -853,90 +853,85 @@
 		 * Include requested page.
 		 */
 		public int doEndTag() throws JspException {
-			// Check role
-			HttpServletRequest request =
-				(HttpServletRequest) pageContext.getRequest();
-
-			if (role != null && !request.isUserInRole(role)) {
-				return EVAL_PAGE;
-			}
+                    // Check role
+                    HttpServletRequest request =
+                            (HttpServletRequest) pageContext.getRequest();
+
+                    if (role != null && !request.isUserInRole(role)) {
+                        return EVAL_PAGE;
+                    }
+
+                    try {
+                        if (log.isDebugEnabled()) {
+                            log.debug("insert page='" + page + "'.");
+                        }
+
+                        // set new context for included component.
+                        pageContext.setAttribute(
+                                ComponentConstants.COMPONENT_CONTEXT,
+                                subCompContext,
+                                PageContext.REQUEST_SCOPE);
+
+                        // Call controller if any
+                        if (controller != null) {
+                            try {
+                                TilesContext tilesContext = TilesContextFactory.getInstance(pageContext);
+                                controller.execute(tilesContext, subCompContext);
+                            } catch (Exception e) {
+                                throw new ServletException(e);
+                            }
+
+                        }
+
+                        // include requested component.
+                        if (flush) {
+                            pageContext.getOut().flush();
+                        }
+
+                        doInclude(page, flush);
+
+                    } catch (IOException e) {
+                        String msg =
+                                "Can't insert page '" + page + "' : " + e.getMessage();
+                        log.error(msg, e);
+                        throw new JspException(msg);
+
+                    } catch (IllegalArgumentException e) {
+                        // Can't resolve page uri, should we ignore it?
+                        if (!(page == null && isErrorIgnored)) {
+                            String msg =
+                                    "Can't insert page '" + page
+                                    + "'. Check if it exists.\n"
+                                    + e.getMessage();
+
+                            log.error(msg, e);
+                            throw new JspException(msg,e);
+                        }
+
+                    } catch (Exception e) {
+                        Throwable cause = e;
+                        if (e.getCause() != null) {
+                            cause = e.getCause();
+                        }
+
+                        String msg =
+                                "Exception in '" + page + "': " + cause.getMessage();
+
+                        log.error(msg, e);
+                        throw new JspException(msg,e);
+
+                    } finally {
+                        // restore old context only if currentContext not null 
+                        // (bug with Silverstream ?; related by Arvindra Sehmi 20010712)
+                        if (currentContext != null) {
+                            pageContext.setAttribute(
+                                        ComponentConstants.COMPONENT_CONTEXT,
+                                        currentContext,
+                                        PageContext.REQUEST_SCOPE);
+                        }
+                    }
 
-			try {
-				if (log.isDebugEnabled()) {
-					log.debug("insert page='" + page + "'.");
-				}
-
-				// set new context for included component.
-				pageContext.setAttribute(
-					ComponentConstants.COMPONENT_CONTEXT,
-					subCompContext,
-					PageContext.REQUEST_SCOPE);
-
-				// Call controller if any
-				if (controller != null) {
-					try {
-						controller.execute(
-							subCompContext,
-							(HttpServletRequest) pageContext.getRequest(),
-							(HttpServletResponse) pageContext.getResponse(),
-							pageContext.getServletContext());
-                            
-					} catch (Exception e) {
-						throw new ServletException(e);
-					}
-
-				}
-
-				// include requested component.
-				if (flush) {
-					pageContext.getOut().flush();
-				}
-
-				doInclude(page, flush);
-
-			} catch (IOException e) {
-				String msg =
-					"Can't insert page '" + page + "' : " + e.getMessage();
-				log.error(msg, e);
-				throw new JspException(msg);
-
-			} catch (IllegalArgumentException e) {
-				// Can't resolve page uri, should we ignore it?
-				if (!(page == null && isErrorIgnored)) {
-					String msg =
-						"Can't insert page '"
-							+ page
-							+ "'. Check if it exists.\n"
-							+ e.getMessage();
-
-					log.error(msg, e);
-					throw new JspException(msg,e);
-				}
-
-			} catch (ServletException e) {
-				Throwable cause = e;
-				if (e.getRootCause() != null) {
-					cause = e.getRootCause();
-				}
-
-				String msg =
-					"ServletException in '" + page + "': " + cause.getMessage();
-
-				log.error(msg, e);
-				throw new JspException(msg,e);
-
-			} finally {
-				// restore old context only if currentContext not null 
-				// (bug with Silverstream ?; related by Arvindra Sehmi 20010712)
-				if (currentContext != null) {
-					pageContext.setAttribute(
-						ComponentConstants.COMPONENT_CONTEXT,
-						currentContext,
-						PageContext.REQUEST_SCOPE);
-				}
-			}
-
-			return EVAL_PAGE;
+                    return EVAL_PAGE;
 		}
 
 		/**

Modified: struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/util/TagUtils.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/util/TagUtils.java?rev=397992&r1=397991&r2=397992&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/util/TagUtils.java (original)
+++ struts/sandbox/trunk/tiles/src/java/org/apache/tiles/taglib/util/TagUtils.java Fri Apr 28 12:49:24 2006
@@ -26,6 +26,8 @@
 import javax.servlet.jsp.PageContext;
 
 import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.tiles.TilesContext;
+import org.apache.tiles.context.TilesContextFactory;
 import org.apache.tiles.taglib.ComponentConstants;
 import org.apache.tiles.ComponentContext;
 import org.apache.tiles.ComponentDefinition;
@@ -170,7 +172,8 @@
      * @return Requested bean or <code>null</code> if not found.
      */
     public static Object findAttribute(String beanName, PageContext pageContext) {
-        ComponentContext compContext = ComponentContext.getContext(pageContext.getRequest());
+        TilesContext tilesContext = TilesContextFactory.getInstance(pageContext);
+        ComponentContext compContext = ComponentContext.getContext(tilesContext);
         
         if (compContext != null) {
             Object attribute = compContext.findAttribute(beanName, pageContext);
@@ -193,7 +196,8 @@
      */
     public static Object getAttribute(String beanName, int scope, PageContext pageContext) {
         if (scope == ComponentConstants.COMPONENT_SCOPE) {
-            ComponentContext compContext = ComponentContext.getContext(pageContext.getRequest());
+            TilesContext tilesContext = TilesContextFactory.getInstance(pageContext);
+            ComponentContext compContext = ComponentContext.getContext(tilesContext);
             return compContext.getAttribute(beanName);
         }
         return pageContext.getAttribute(beanName, scope);
@@ -336,10 +340,9 @@
         throws JspException {
             
         try {
+            TilesContext tilesContext = TilesContextFactory.getInstance(pageContext);
             return TilesUtil.getDefinition(
-                name,
-                pageContext.getRequest(),
-                pageContext.getServletContext());
+                name, tilesContext);
                 
         } catch (NoSuchDefinitionException ex) {
             throw new JspException(



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org