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:51:03 UTC
svn commit: r416534 - in
/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering:
model/FeedRenderModel.java servlets/FeedServlet.java
Author: agilliland
Date: Thu Jun 22 17:51:02 2006
New Revision: 416534
URL: http://svn.apache.org/viewvc?rev=416534&view=rev
Log:
- modifying FeedRenderModel to expect a "feedRequest" in its init data and removed knowledge of servlet request.
Modified:
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedRenderModel.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedRenderModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedRenderModel.java?rev=416534&r1=416533&r2=416534&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedRenderModel.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedRenderModel.java Thu Jun 22 17:51:02 2006
@@ -15,6 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
+
package org.apache.roller.ui.rendering.model;
import java.util.ArrayList;
@@ -38,42 +39,50 @@
import org.apache.roller.pojos.wrapper.WebsiteDataWrapper;
import org.apache.roller.ui.rendering.util.WeblogFeedRequest;
+
/**
* Model provides information needed to render a feed.
*/
public class FeedRenderModel implements RenderModel {
- private HttpServletRequest request = null;
+
private WebsiteData weblog = null;
private String categoryPath = null;
- protected static Log log =
- LogFactory.getFactory().getInstance(FeedRenderModel.class);
+ protected static Log log = LogFactory.getLog(FeedRenderModel.class);
- public FeedRenderModel() {
- }
- /** Init page model based on request */
- public void init(Map map) throws RollerException {
- HttpServletRequest request = (HttpServletRequest)map.get("request");
- WeblogFeedRequest parsed = new WeblogFeedRequest(request);
+ public FeedRenderModel() {}
+
+
+ public void init(Map initData) throws RollerException {
+
+ // we expect the init data to contain a feedRequest object
+ WeblogFeedRequest parsed = (WeblogFeedRequest) initData.get("feedRequest");
+ if(parsed == null) {
+ throw new RollerException("expected feedRequest from init data");
+ }
+
categoryPath = parsed.getWeblogCategory();
Roller roller = RollerFactory.getRoller();
UserManager umgr = roller.getUserManager();
weblog = umgr.getWebsiteByHandle(parsed.getWeblogHandle(), Boolean.TRUE);
}
+
/** Template context name to be used for model */
public String getModelName() {
return "model";
}
+
/**
* Get weblog being displayed.
*/
public WebsiteDataWrapper getWeblog() {
return WebsiteDataWrapper.wrap(weblog);
}
-
+
+
/**
* Get category path or name specified by request.
*/
@@ -135,4 +144,5 @@
}
return recentComments;
}
+
}
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java?rev=416534&r1=416533&r2=416534&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java Thu Jun 22 17:51:02 2006
@@ -87,7 +87,7 @@
super.init(servletConfig);
- log.info("Initializing weblog feed servlet");
+ log.info("Initializing FeedServlet");
Map cacheProps = new HashMap();
Enumeration allProps = RollerConfig.keys();
@@ -102,7 +102,7 @@
}
}
- log.info(cacheProps);
+ log.info("Feed cache = "+cacheProps);
contentCache = CacheManager.constructCache(this, cacheProps);
}
@@ -195,6 +195,7 @@
// populate the rendering model
Map initData = new HashMap();
initData.put("request", request);
+ initData.put("feedRequest", feedRequest);
// Feeds get the weblog specific page model
RenderModelLoader.loadFeedModels(model, initData);