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/07/15 20:03:48 UTC
svn commit: r422274 - in /incubator/roller/branches/roller_3.0:
src/org/apache/roller/ui/rendering/servlets/
web/WEB-INF/velocity/templates/weblog/
Author: agilliland
Date: Sat Jul 15 11:03:47 2006
New Revision: 422274
URL: http://svn.apache.org/viewvc?rev=422274&view=rev
Log:
just reviewing servlet code and doing a little bit of tidy up.
Modified:
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/FeedServlet.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/servlets/RSDServlet.java
incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/weblog/rsd.vm
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=422274&r1=422273&r2=422274&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 Sat Jul 15 11:03:47 2006
@@ -117,16 +117,14 @@
log.debug("Entering");
- WeblogFeedRequest feedRequest = null;
WebsiteData weblog = null;
+
+ WeblogFeedRequest feedRequest = null;
try {
// parse the incoming request and extract the relevant data
feedRequest = new WeblogFeedRequest(request);
- // lookup weblog specified by feed request
- UserManager uMgr = RollerFactory.getRoller().getUserManager();
- weblog = uMgr.getWebsiteByHandle(feedRequest.getWeblogHandle());
-
+ weblog = feedRequest.getWeblog();
if(weblog == null) {
throw new RollerException("unable to lookup weblog: "+
feedRequest.getWeblogHandle());
@@ -153,14 +151,11 @@
// cached content checking
String cacheKey = this.CACHE_ID+":"+this.generateKey(feedRequest);
-
- // we need the last expiration time for the given weblog
- long lastExpiration = weblog.getLastModified().getTime();
-
LazyExpiringCacheEntry entry =
(LazyExpiringCacheEntry) this.contentCache.get(cacheKey);
if(entry != null) {
- CachedContent cachedContent = (CachedContent) entry.getValue(lastExpiration);
+ CachedContent cachedContent =
+ (CachedContent) entry.getValue(weblog.getLastModified().getTime());
if(cachedContent != null) {
log.debug("HIT "+cacheKey);
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=422274&r1=422273&r2=422274&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 Sat Jul 15 11:03:47 2006
@@ -72,7 +72,7 @@
* Handle GET requests for weblog pages.
*/
public void doGet(HttpServletRequest request, HttpServletResponse response)
- throws ServletException, IOException {
+ throws ServletException, IOException {
log.debug("Entering");
@@ -84,7 +84,6 @@
// lookup weblog specified by preview request
weblog = previewRequest.getWeblog();
-
if(weblog == null) {
throw new RollerException("unable to lookup weblog: "+
previewRequest.getWeblogHandle());
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java?rev=422274&r1=422273&r2=422274&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java Sat Jul 15 11:03:47 2006
@@ -27,9 +27,8 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.RollerException;
import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.model.RollerFactory;
-import org.apache.roller.model.UserManager;
import org.apache.roller.pojos.WebsiteData;
import org.apache.roller.ui.rendering.util.WeblogRequest;
import org.apache.roller.ui.rendering.Renderer;
@@ -70,17 +69,18 @@
log.debug("Entering");
- HashMap model = new HashMap();
WebsiteData weblog = null;
- WeblogRequest weblogRequest = null;
- // first off lets parse the incoming request and validate it
+ WeblogRequest weblogRequest = null;
try {
weblogRequest = new WeblogRequest(request);
// now make sure the specified weblog really exists
- UserManager userMgr = RollerFactory.getRoller().getUserManager();
- weblog = userMgr.getWebsiteByHandle(weblogRequest.getWeblogHandle(), Boolean.TRUE);
+ weblog = weblogRequest.getWeblog();
+ if(weblog == null) {
+ throw new RollerException("Unable to lookup weblog: "+
+ weblogRequest.getWeblogHandle());
+ }
} catch(Exception e) {
// invalid rsd request format or weblog doesn't exist
@@ -107,6 +107,7 @@
// populate the model
+ HashMap model = new HashMap();
model.put("website", weblog);
model.put("absBaseURL", RollerRuntimeConfig.getAbsoluteContextURL());
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/weblog/rsd.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/weblog/rsd.vm?rev=422274&r1=422273&r2=422274&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/weblog/rsd.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/weblog/rsd.vm Sat Jul 15 11:03:47 2006
@@ -3,7 +3,7 @@
<service>
<engineName>Roller Weblogger</engineName>
<engineLink>http://www.rollerweblogger.org/</engineLink>
- <homePageLink>${absBaseURL}/page/${website.handle}</homePageLink>
+ <homePageLink>${website.absoluteURL}</homePageLink>
<apis>
<api name="blogger" preferred="false"
apiLink="${absBaseURL}/xmlrpc"