roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r427415 - in /incubator/roller/branches/roller_3.0: src/org/apache/roller/ui/rendering/model/ src/org/apache/roller/ui/rendering/pagers/ src/org/apache/roller/ui/rendering/servlets/ web/WEB-INF/velocity/templates/feeds/
Date Tue, 01 Aug 2006 03:01:50 GMT
Author: snoopdave
Date: Mon Jul 31 20:01:49 2006
New Revision: 427415

URL: http://svn.apache.org/viewvc?rev=427415&view=rev
Log:

This commit:
 
1) Removes the need for the SiteModel in the FeedServlet, which is 
good because SiteModel wants a WeblogPageRequest object and all we have in the
FeedServlet is a WeblogFeedRequest. I added site-wide smarts to FeedModel and 
commented out the code in FeedServlet that loads the site-wide models.

I'm not completely happy about this because I'd like to allow for feeds of
new users, new weblogs and other things that are available in the site model.
But the site model has pagers, pagers need page numbers and page numbers are
not part of WeblogFeedRequest.  We should take another look at the request 
hierarchy and perhaps consolidate models into a similar hierarchy as well.

2) Moves all pagers to org.apache.roller.ui.rendering.pagers


Added:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/AbstractPager.java
      - copied, changed from r427313, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/AbstractPager.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/CommentsPager.java
      - copied, changed from r427313, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/CommentsPager.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/Pager.java
      - copied, changed from r427313, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/Pager.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/PlanetEntriesPager.java
      - copied, changed from r427313, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PlanetEntriesPager.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/SearchResultsPager.java
      - copied, changed from r427313, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsPager.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/UsersPager.java
      - copied, changed from r427313, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/UsersPager.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesListPager.java
      - copied, changed from r427313, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesListPager.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesPager.java
      - copied, changed from r427313, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesPager.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesPagerImpl.java
      - copied, changed from r427313, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesPagerImpl.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/WeblogsPager.java
      - copied, changed from r427313, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogsPager.java
Removed:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/AbstractPager.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/CommentsPager.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/Pager.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PlanetEntriesPager.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsPager.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/UsersPager.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesListPager.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesPager.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesPagerImpl.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogsPager.java
Modified:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedModel.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PageModel.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PlanetModel.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsModel.java
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-atom.vm
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-rss.vm
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-atom.vm
    incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-rss.vm

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedModel.java?rev=427415&r1=427414&r2=427415&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedModel.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedModel.java
Mon Jul 31 20:01:49 2006
@@ -41,6 +41,7 @@
 
 /**
  * Model which provides information needed to render a feed.
+ * Returns site-wide feeds when weblog is a
  */
 public class FeedModel implements Model {
     
@@ -121,7 +122,8 @@
         try {             
             Roller roller = RollerFactory.getRoller();
             WeblogManager wmgr = roller.getWeblogManager();
-            List entries = wmgr.getWeblogEntries(weblog,
+            List entries = wmgr.getWeblogEntries(
+                    RollerRuntimeConfig.isSiteWideWeblog(weblog.getHandle()) ? null : weblog,
                     null, 
                     null, 
                     new Date(), 
@@ -147,7 +149,7 @@
      * the weblog.entryDisplayCount.
      */
     public List getComments() {
-        
+            
         // Display same number of entries in feed as displayed on page
         int entryCount = weblog.getEntryDisplayCount();
         
@@ -163,7 +165,7 @@
         try {
             WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
             List recent = wmgr.getComments(
-                    weblog,
+                    RollerRuntimeConfig.isSiteWideWeblog(weblog.getHandle()) ? null : weblog,
                     null,          // weblog entry
                     null,          // search String
                     null,          // startDate

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PageModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PageModel.java?rev=427415&r1=427414&r2=427415&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PageModel.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PageModel.java
Mon Jul 31 20:01:49 2006
@@ -33,6 +33,8 @@
 import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
 import org.apache.roller.pojos.wrapper.WebsiteDataWrapper;
 import org.apache.roller.ui.authoring.struts.formbeans.CommentFormEx;
+import org.apache.roller.ui.rendering.pagers.WeblogEntriesPager;
+import org.apache.roller.ui.rendering.pagers.WeblogEntriesPagerImpl;
 import org.apache.roller.ui.rendering.util.WeblogEntryCommentForm;
 import org.apache.roller.ui.rendering.util.WeblogPageRequest;
 

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PlanetModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PlanetModel.java?rev=427415&r1=427414&r2=427415&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PlanetModel.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PlanetModel.java
Mon Jul 31 20:01:49 2006
@@ -31,6 +31,8 @@
 import org.apache.roller.pojos.PlanetSubscriptionData;
 import org.apache.roller.pojos.WebsiteData;
 import org.apache.roller.pojos.wrapper.PlanetSubscriptionDataWrapper;
+import org.apache.roller.ui.rendering.pagers.Pager;
+import org.apache.roller.ui.rendering.pagers.PlanetEntriesPager;
 import org.apache.roller.ui.rendering.util.WeblogPageRequest;
 
 

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsModel.java?rev=427415&r1=427414&r2=427415&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsModel.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsModel.java
Mon Jul 31 20:01:49 2006
@@ -40,6 +40,8 @@
 import org.apache.roller.pojos.WeblogEntryData;
 import org.apache.roller.pojos.WeblogEntryWrapperComparator;
 import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
+import org.apache.roller.ui.rendering.pagers.SearchResultsPager;
+import org.apache.roller.ui.rendering.pagers.WeblogEntriesPager;
 import org.apache.roller.ui.rendering.util.WeblogSearchRequest;
 import org.apache.roller.util.DateUtil;
 

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/AbstractPager.java
(from r427313, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/AbstractPager.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/AbstractPager.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/AbstractPager.java&p1=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/AbstractPager.java&r1=427313&r2=427415&rev=427415&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/AbstractPager.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/AbstractPager.java
Mon Jul 31 20:01:49 2006
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.rendering.model;
+package org.apache.roller.ui.rendering.pagers;
 
 import java.util.List;
 import org.apache.roller.pojos.WeblogTemplate;

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/CommentsPager.java
(from r427313, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/CommentsPager.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/CommentsPager.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/CommentsPager.java&p1=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/CommentsPager.java&r1=427313&r2=427415&rev=427415&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/CommentsPager.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/CommentsPager.java
Mon Jul 31 20:01:49 2006
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.rendering.model;
+package org.apache.roller.ui.rendering.pagers;
 
 import java.util.ArrayList;
 import java.util.Calendar;

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/Pager.java
(from r427313, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/Pager.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/Pager.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/Pager.java&p1=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/Pager.java&r1=427313&r2=427415&rev=427415&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/Pager.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/Pager.java
Mon Jul 31 20:01:49 2006
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.rendering.model;
+package org.apache.roller.ui.rendering.pagers;
 
 import java.util.List;
 

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/PlanetEntriesPager.java
(from r427313, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PlanetEntriesPager.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/PlanetEntriesPager.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/PlanetEntriesPager.java&p1=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PlanetEntriesPager.java&r1=427313&r2=427415&rev=427415&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PlanetEntriesPager.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/PlanetEntriesPager.java
Mon Jul 31 20:01:49 2006
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.rendering.model;
+package org.apache.roller.ui.rendering.pagers;
 
 import java.util.ArrayList;
 import java.util.Calendar;

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/SearchResultsPager.java
(from r427313, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsPager.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/SearchResultsPager.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/SearchResultsPager.java&p1=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsPager.java&r1=427313&r2=427415&rev=427415&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsPager.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/SearchResultsPager.java
Mon Jul 31 20:01:49 2006
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.rendering.model;
+package org.apache.roller.ui.rendering.pagers;
 
 import java.util.Map;
 import java.util.ResourceBundle;

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/UsersPager.java
(from r427313, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/UsersPager.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/UsersPager.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/UsersPager.java&p1=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/UsersPager.java&r1=427313&r2=427415&rev=427415&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/UsersPager.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/UsersPager.java
Mon Jul 31 20:01:49 2006
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.rendering.model;
+package org.apache.roller.ui.rendering.pagers;
 
 import java.util.ArrayList;
 import java.util.Iterator;

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesListPager.java
(from r427313, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesListPager.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesListPager.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesListPager.java&p1=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesListPager.java&r1=427313&r2=427415&rev=427415&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesListPager.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesListPager.java
Mon Jul 31 20:01:49 2006
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.rendering.model;
+package org.apache.roller.ui.rendering.pagers;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -34,6 +34,7 @@
 import org.apache.roller.pojos.WeblogTemplate;
 import org.apache.roller.pojos.WebsiteData;
 import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
+import org.apache.roller.ui.rendering.model.*;
 
 /**
  * Simple pager for list of weblog entries.

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesPager.java
(from r427313, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesPager.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesPager.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesPager.java&p1=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesPager.java&r1=427313&r2=427415&rev=427415&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesPager.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesPager.java
Mon Jul 31 20:01:49 2006
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.rendering.model;
+package org.apache.roller.ui.rendering.pagers;
 
 import java.util.Map;
 

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesPagerImpl.java
(from r427313, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesPagerImpl.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesPagerImpl.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesPagerImpl.java&p1=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesPagerImpl.java&r1=427313&r2=427415&rev=427415&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesPagerImpl.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesPagerImpl.java
Mon Jul 31 20:01:49 2006
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.rendering.model;
+package org.apache.roller.ui.rendering.pagers;
 
 import java.text.MessageFormat;
 import java.text.ParsePosition;
@@ -43,6 +43,7 @@
 import org.apache.roller.pojos.WeblogTemplate;
 import org.apache.roller.pojos.WebsiteData;
 import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
+import org.apache.roller.ui.rendering.model.*;
 import org.apache.roller.util.DateUtil;
 import org.apache.roller.util.URLUtilities;
 import org.apache.roller.util.Utilities;

Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/WeblogsPager.java
(from r427313, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogsPager.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/WeblogsPager.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/WeblogsPager.java&p1=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogsPager.java&r1=427313&r2=427415&rev=427415&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogsPager.java
(original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/pagers/WeblogsPager.java
Mon Jul 31 20:01:49 2006
@@ -16,7 +16,7 @@
  * directory of this distribution.
  */
 
-package org.apache.roller.ui.rendering.model;
+package org.apache.roller.ui.rendering.pagers;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -31,6 +31,7 @@
 import org.apache.roller.pojos.WeblogTemplate;
 import org.apache.roller.pojos.WebsiteData;
 import org.apache.roller.pojos.wrapper.WebsiteDataWrapper;
+import org.apache.roller.ui.rendering.model.*;
 
 /**
  * Paging for weblogs.

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=427415&r1=427414&r2=427415&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
Mon Jul 31 20:01:49 2006
@@ -192,10 +192,12 @@
             ModelLoader.loadModels(feedModels, model, initData, true);
             
             // Load special models for site-wide blog
-            if(RollerRuntimeConfig.isSiteWideWeblog(weblog.getHandle())) {
-                String siteModels = RollerConfig.getProperty("rendering.siteModels");
-                ModelLoader.loadModels(siteModels, model, initData, true);
-            }
+            
+            // TODO 3.0 decide what do do about site models in feeds   
+            //if(RollerRuntimeConfig.isSiteWideWeblog(weblog.getHandle())) {
+            //    String siteModels = RollerConfig.getProperty("rendering.siteModels");
+            //    ModelLoader.loadModels(siteModels, model, initData, true);
+            //}
 
             // Load weblog custom models
             ModelLoader.loadCustomModels(weblog, model, initData);

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-atom.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-atom.vm?rev=427415&r1=427414&r2=427415&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-atom.vm
(original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-atom.vm
Mon Jul 31 20:01:49 2006
@@ -25,7 +25,7 @@
     <link rel="self" type="application/atom+xml" href="$url.feed.comments.atom($model.categoryPath,
$model.excerpts)" />
     <updated>$utils.formatIso8601Date($model.weblog.lastModified)</updated>
     <generator uri="http://rollerweblogger.org" version="$config.rollerVersion ($config.rollerBuildTimestamp:$config.rollerBuildUser)">Roller
Weblogger</generator>
-    #set($comments = $site.getComments(60, 0, $config.feedSize))
+    #set($comments = $model.comments)
     #showCommentsAtom10($comments)
 </feed>
 

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-rss.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-rss.vm?rev=427415&r1=427414&r2=427415&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-rss.vm
(original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-comments-rss.vm
Mon Jul 31 20:01:49 2006
@@ -29,7 +29,7 @@
   <copyright>Copyright $utils.formatDate($model.weblog.lastModified, "yyyy")</copyright>
   <lastBuildDate>$utils.formatRfc822Date($model.weblog.lastModified)</lastBuildDate>
   <generator>Roller Weblogger $config.rollerVersion ($config.rollerBuildTimestamp:$config.rollerBuildUser)</generator>
-  #set($comments = $site.getComments(60, 0, $config.feedSize))
+  #set($comments = $model.comments)
   #showCommentsAtom10($comments)
 </channel>
 </rss>

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-atom.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-atom.vm?rev=427415&r1=427414&r2=427415&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-atom.vm
(original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-atom.vm
Mon Jul 31 20:01:49 2006
@@ -25,7 +25,7 @@
     <link rel="self" type="application/atom+xml" href="$url.feed.entries.atom($model.categoryPath,
$model.excerpts)" />
     <updated>$utils.formatIso8601Date($model.weblog.lastModified)</updated>
     <generator uri="http://rollerweblogger.org" version="$config.rollerVersion ($config.rollerBuildTimestamp:$config.rollerBuildUser)">Roller
Weblogger</generator>
-    #set($entries = $site.getWeblogEntries("nil", "nil", $model.categoryPath, 60, 0, $config.feedSize)
)
+    #set($entries = $model.weblogEntries)
     #showEntriesAtom10($entries)
 </feed>
 

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-rss.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-rss.vm?rev=427415&r1=427414&r2=427415&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-rss.vm
(original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/templates/feeds/site-entries-rss.vm
Mon Jul 31 20:01:49 2006
@@ -29,7 +29,7 @@
   <copyright>Copyright $utils.formatDate($model.weblog.lastModified, "yyyy")</copyright>
   <lastBuildDate>$utils.formatRfc822Date($model.weblog.lastModified)</lastBuildDate>
   <generator>Roller Weblogger $config.rollerVersion ($config.rollerBuildTimestamp:$config.rollerBuildUser)</generator>
-  #set($entries = $site.getWeblogEntries("nil", "nil", $model.categoryPath, 60, 0, $config.feedSize)
)
+  #set($entries = $model.weblogEntries)
   #showEntriesRSS20($entries)
 </channel>
 </rss>



Mime
View raw message