You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2006/06/23 02:29:08 UTC
svn commit: r416526 - in
/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering:
model/RenderModelLoader.java servlets/PageServlet.java
servlets/PreviewServlet.java velocity/PageServlet.java
velocity/deprecated/ContextLoader.java
Author: agilliland
Date: Thu Jun 22 17:29:08 2006
New Revision: 416526
URL: http://svn.apache.org/viewvc?rev=416526&view=rev
Log:
- adding PageContext to old ContextLoader.setupContext() method params, can't rely on RollerRequest.getPageContext().
- added new loadSearchModels() method to model loader.
Modified:
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/RenderModelLoader.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PageServlet.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/PageServlet.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/RenderModelLoader.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/RenderModelLoader.java?rev=416526&r1=416525&r2=416526&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/RenderModelLoader.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/RenderModelLoader.java Thu Jun 22 17:29:08 2006
@@ -77,15 +77,16 @@
* Load old page models, but only if velocity.pagemodel.classname defined.
*/
public static void loadOldModels(
- HttpServletResponse response,
- HttpServletRequest request,
- Map model) throws RollerException {
-
+ Map model,
+ HttpServletRequest request,
+ HttpServletResponse response,
+ PageContext pageContext) throws RollerException {
+
// Only load old model if it's specified
String useOldModel =
RollerConfig.getProperty("velocity.pagemodel.classname");
if (useOldModel != null) {
- ContextLoader.setupContext(model, request, response);
+ ContextLoader.setupContext(model, request, response, pageContext);
}
}
@@ -103,10 +104,11 @@
loadModels(weblogModels, model, initData);
}
+
/**
- * Load set of common weblog models.
+ * Load set of common feed models.
*
- * This is the list of models defined by rendering.weblogPageModels
+ * This is the list of models defined by rendering.feedRendererModels
*/
public static void loadFeedModels(Map model, Map initData)
throws RollerException {
@@ -114,6 +116,20 @@
String weblogModels =
RollerConfig.getProperty("rendering.feedRenderModels");
loadModels(weblogModels, model, initData);
+ }
+
+
+ /**
+ * Load set of common search models.
+ *
+ * This is the list of models defined by rendering.searchRendererModels
+ */
+ public static void loadSearchModels(Map model, Map initData)
+ throws RollerException {
+
+ String searchModels =
+ RollerConfig.getProperty("rendering.searchRenderModels");
+ loadModels(searchModels, model, initData);
}
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PageServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PageServlet.java?rev=416526&r1=416525&r2=416526&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PageServlet.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PageServlet.java Thu Jun 22 17:29:08 2006
@@ -257,6 +257,7 @@
// populate the rendering model
Map initData = new HashMap();
initData.put("request", request);
+ initData.put("pageRequest", pageRequest);
// Feeds get the weblog specific page model
RenderModelLoader.loadPageModels(model, initData);
@@ -275,7 +276,7 @@
RenderModelLoader.loadCustomModels(weblog, model, initData);
// ick, gotta load pre-3.0 model stuff as well :(
- RenderModelLoader.loadOldModels(response, request, model);
+ RenderModelLoader.loadOldModels(model, request, response, pageContext);
} catch (RollerException ex) {
log.error("Error loading model objects for page", ex);
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java?rev=416526&r1=416525&r2=416526&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java Thu Jun 22 17:29:08 2006
@@ -182,7 +182,7 @@
RenderModelLoader.loadCustomModels(tmpWebsite, model, initData);
// ick, gotta load pre-3.0 model stuff as well :(
- RenderModelLoader.loadOldModels(response, request, model);
+ RenderModelLoader.loadOldModels(model, request, response, pageContext);
} catch (RollerException ex) {
log.error("ERROR loading model for page", ex);
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/PageServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/PageServlet.java?rev=416526&r1=416525&r2=416526&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/PageServlet.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/PageServlet.java Thu Jun 22 17:29:08 2006
@@ -192,7 +192,7 @@
// Made it this far, populate the Context
Map mapCtx = new HashMap();
- ContextLoader.setupContext(mapCtx, rreq.getRequest(), response);
+ ContextLoader.setupContext(mapCtx, rreq.getRequest(), response, rreq.getPageContext());
// hack. put mapCtx info velocity ctx
String key = null;
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java?rev=416526&r1=416525&r2=416526&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java Thu Jun 22 17:29:08 2006
@@ -88,8 +88,8 @@
public static void setupContext(
Map ctx,
HttpServletRequest request,
- HttpServletResponse response)
- throws RollerException {
+ HttpServletResponse response,
+ PageContext pageContext) throws RollerException {
mLogger.debug("setupContext( ctx = "+ctx+")");
@@ -105,7 +105,6 @@
// grab data from the request that we'll need to use
RollerRequest rreq = RollerRequest.getRollerRequest(request);
- PageContext pageContext = rreq.getPageContext();
WebsiteData weblog = rreq.getWebsite();
WeblogEntryData entry = rreq.getWeblogEntry();
WeblogCategoryData category = rreq.getWeblogCategory();