You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by ce...@apache.org on 2002/12/29 22:29:23 UTC
cvs commit: jakarta-struts/src/share/org/apache/struts/tiles TilesUtilStrutsModulesImpl.java
cedric 2002/12/29 13:29:23
Modified: src/share/org/apache/struts/tiles
TilesUtilStrutsModulesImpl.java
Log:
Change the way the moduleConfig object is found
Revision Changes Path
1.2 +12 -9 jakarta-struts/src/share/org/apache/struts/tiles/TilesUtilStrutsModulesImpl.java
Index: TilesUtilStrutsModulesImpl.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/TilesUtilStrutsModulesImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TilesUtilStrutsModulesImpl.java 27 Dec 2002 10:41:23 -0000 1.1
+++ TilesUtilStrutsModulesImpl.java 29 Dec 2002 21:29:23 -0000 1.2
@@ -103,7 +103,8 @@
HttpServletRequest request, HttpServletResponse response, ServletContext servletContext)
throws IOException, ServletException
{
- request.getRequestDispatcher(uri).include(request, response);
+ // forward uri
+ request.getRequestDispatcher(uri).forward(request, response);
}
/**
@@ -118,8 +119,9 @@
public void doInclude(String uri,
HttpServletRequest request, HttpServletResponse response, ServletContext servletContext)
throws IOException, ServletException
- { // modify uri
- request.getRequestDispatcher(uri).forward(request, response);
+ {
+ // include to uri
+ request.getRequestDispatcher(uri).include(request, response);
}
/**
@@ -141,6 +143,7 @@
*/
public DefinitionsFactory getDefinitionsFactory(ServletContext servletContext, ModuleConfig moduleConfig)
{
+ //System.out.println("Get tiles factory for module '" + moduleConfig.getPrefix() + "'");
return (DefinitionsFactory) servletContext.getAttribute( DEFINITIONS_FACTORY + moduleConfig.getPrefix());
}
@@ -203,12 +206,12 @@
*/
protected ModuleConfig getModuleConfig( HttpServletRequest request, ServletContext servletContext)
{
- ModuleConfig moduleConfig = RequestUtils.getModuleConfig(request, servletContext);
+ ModuleConfig moduleConfig = RequestUtils.getRequestModuleConfig(request);
if (moduleConfig == null)
- {
+ { // not set, do it
// ModuleConfig not found in current request. Select it.
RequestUtils.selectModule(request, servletContext);
- moduleConfig = RequestUtils.getModuleConfig(request, servletContext);
+ moduleConfig = RequestUtils.getRequestModuleConfig(request);
}
return moduleConfig;
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>