Return-Path: Delivered-To: apmail-incubator-roller-commits-archive@www.apache.org Received: (qmail 25883 invoked from network); 16 Aug 2006 16:08:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 16 Aug 2006 16:08:39 -0000 Received: (qmail 97846 invoked by uid 500); 16 Aug 2006 16:08:39 -0000 Delivered-To: apmail-incubator-roller-commits-archive@incubator.apache.org Received: (qmail 97815 invoked by uid 500); 16 Aug 2006 16:08:39 -0000 Mailing-List: contact roller-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: roller-dev@incubator.apache.org Delivered-To: mailing list roller-commits@incubator.apache.org Received: (qmail 97800 invoked by uid 99); 16 Aug 2006 16:08:39 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Aug 2006 09:08:39 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Aug 2006 09:08:37 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 4C3A91A981A; Wed, 16 Aug 2006 09:08:17 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r431935 - in /incubator/roller/branches/roller_3.0: src/org/apache/roller/business/hibernate/ src/org/apache/roller/pojos/ src/org/apache/roller/ui/rendering/model/ tests/org/apache/roller/business/ web/themes/frontpage/ Date: Wed, 16 Aug 2006 16:08:15 -0000 To: roller-commits@incubator.apache.org From: snoopdave@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060816160817.4C3A91A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: snoopdave Date: Wed Aug 16 09:08:14 2006 New Revision: 431935 URL: http://svn.apache.org/viewvc?rev=431935&view=rev Log: Planet model works well in frontpage now Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernatePlanetManagerImpl.java incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetEntryData.java incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetSubscriptionData.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/SiteModel.java incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PlanetManagerTest.java incubator/roller/branches/roller_3.0/web/themes/frontpage/Weblog.vm incubator/roller/branches/roller_3.0/web/themes/frontpage/_blogdirectory.vm incubator/roller/branches/roller_3.0/web/themes/frontpage/_blogprofile.vm incubator/roller/branches/roller_3.0/web/themes/frontpage/_css.vm incubator/roller/branches/roller_3.0/web/themes/frontpage/directory.vm Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernatePlanetManagerImpl.java URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernatePlanetManagerImpl.java?rev=431935&r1=431934&r2=431935&view=diff ============================================================================== --- incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernatePlanetManagerImpl.java (original) +++ incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernatePlanetManagerImpl.java Wed Aug 16 09:08:14 2006 @@ -553,7 +553,7 @@ "No published date, assigning fake date for "+feedURL); entry.setPubTime(new Timestamp(cal.getTimeInMillis())); } - if (entry.getPermaLink() == null) { + if (entry.getPermalink() == null) { log.warn("No permalink, rejecting entry from "+feedURL); } else { newEntries.add(entry); Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetEntryData.java URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetEntryData.java?rev=431935&r1=431934&r2=431935&view=diff ============================================================================== --- incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetEntryData.java (original) +++ incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetEntryData.java Wed Aug 16 09:08:14 2006 @@ -97,7 +97,7 @@ */ private void initFromRomeEntry(SyndFeed romeFeed, SyndEntry romeEntry) { setTitle(romeEntry.getTitle()); - setPermaLink(romeEntry.getLink()); + setPermalink(romeEntry.getLink()); // Play some games to get the author DCModule entrydc = (DCModule)romeEntry.getModule(DCModule.URI); @@ -163,11 +163,11 @@ setAuthor( rollerEntry.getCreator().getFullName()); setTitle( rollerEntry.getTitle()); - setPermaLink( rollerEntry.getLink()); + setPermalink( rollerEntry.getLink()); setPubTime( rollerEntry.getPubTime()); setText( content); - setPermaLink(RollerRuntimeConfig.getProperty("site.absoluteurl") + setPermalink(RollerRuntimeConfig.getProperty("site.absoluteurl") + rollerEntry.getPermaLink()); List cats = new ArrayList(); @@ -261,10 +261,10 @@ * @hibernate.property column="permalink" non-null="true" unique="false" * @roller.wrapPojoMethod type="simple" */ - public String getPermaLink() { + public String getPermalink() { return permalink; } - public void setPermaLink(String permalink) { + public void setPermalink(String permalink) { this.permalink = permalink; } /** @@ -376,7 +376,7 @@ */ public int compareTo(Object o) { PlanetEntryData other = (PlanetEntryData)o; - return getPermaLink().compareTo(other.getPermaLink()); + return getPermalink().compareTo(other.getPermalink()); } /** @@ -386,7 +386,7 @@ if(this == other) return true; if(!(other instanceof PlanetEntryData)) return false; final PlanetEntryData that = (PlanetEntryData) other; - return this.permalink.equals(that.getPermaLink()); + return this.permalink.equals(that.getPermalink()); } /** Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetSubscriptionData.java URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetSubscriptionData.java?rev=431935&r1=431934&r2=431935&view=diff ============================================================================== --- incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetSubscriptionData.java (original) +++ incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PlanetSubscriptionData.java Wed Aug 16 09:08:14 2006 @@ -198,10 +198,10 @@ /** * @roller.wrapPojoMethod type="simple" */ - public String getUrl() { + public String getURL() { return siteUrl; } - public void setUrl(String url) { + public void setURL(String url) { siteUrl = url; } 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=431935&r1=431934&r2=431935&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 Wed Aug 16 09:08:14 2006 @@ -47,7 +47,7 @@ private static Log log = LogFactory.getLog(PlanetModel.class); private WeblogRequest weblogRequest = null; - private Template weblogPage = null; + private String pageLink = null; private int pageNum = 0; private WebsiteData weblog = null; @@ -65,7 +65,8 @@ // TODO 3.0: is it better to reparse URL to get these? if (weblogRequest instanceof WeblogPageRequest) { - weblogPage = ((WeblogPageRequest)weblogRequest).getWeblogPage(); + Template weblogPage = ((WeblogPageRequest)weblogRequest).getWeblogPage(); + pageLink = (weblogPage != null) ? weblogPage.getLink() : null; pageNum = ((WeblogPageRequest)weblogRequest).getPageNum(); } @@ -83,7 +84,7 @@ public Pager getAggregationPager(int sinceDays, int length) { String pagerUrl = URLUtilities.getWeblogPageURL(weblog, - weblogRequest.getLocale(), weblogPage.getLink(), + weblogRequest.getLocale(), pageLink, null, null, null, 0, false); return new PlanetEntriesPager( @@ -106,7 +107,7 @@ public Pager getAggregationPager(String groupHandle, int sinceDays, int length) { String pagerUrl = URLUtilities.getWeblogPageURL(weblog, - weblogRequest.getLocale(), weblogPage.getLink(), + weblogRequest.getLocale(), pageLink, null, null, null, 0, false); return new PlanetEntriesPager( @@ -129,7 +130,7 @@ public Pager getFeedPager(String feedURL, int length) { String pagerUrl = URLUtilities.getWeblogPageURL(weblog, - weblogRequest.getLocale(), weblogPage.getLink(), + weblogRequest.getLocale(), pageLink, null, null, null, 0, false); return new PlanetEntriesPager( Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SiteModel.java URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SiteModel.java?rev=431935&r1=431934&r2=431935&view=diff ============================================================================== --- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SiteModel.java (original) +++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SiteModel.java Wed Aug 16 09:08:14 2006 @@ -59,7 +59,6 @@ private WebsiteData weblog = null; private WeblogRequest weblogRequest = null; - //private Template weblogPage = null; private String pageLink = null; private int pageNum = 0; @@ -109,6 +108,29 @@ } + /** + * Get pager ofWeblogEntry objects across all weblogs, + * in reverse chrono order by pubTime. + * @param queryWeblog Restrict to this weblog + * @param sinceDays Limit to past X days in past (or -1 for no limit) + * @param length Max number of results to return + */ + public Pager getWeblogEntriesPager(WebsiteData queryWeblog, int sinceDays, int length) { + return getWeblogEntriesPager(queryWeblog, null, null, sinceDays, length); + } + + /** + * Get pager ofWeblogEntry objects across all weblogs, + * in reverse chrono order by pubTime. + * @param queryWeblog Restrict to this weblog + * @param user Restrict to this user + * @param sinceDays Limit to past X days in past (or -1 for no limit) + * @param length Max number of results to return + */ + public Pager getWeblogEntriesPager(WebsiteData queryWeblog, UserData user, int sinceDays, int length) { + return getWeblogEntriesPager(queryWeblog, user, null, sinceDays, length); + } + /** * Get pager ofWeblogEntry objects across all weblogs, * in reverse chrono order by pubTime. Modified: incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PlanetManagerTest.java URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PlanetManagerTest.java?rev=431935&r1=431934&r2=431935&view=diff ============================================================================== --- incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PlanetManagerTest.java (original) +++ incubator/roller/branches/roller_3.0/tests/org/apache/roller/business/PlanetManagerTest.java Wed Aug 16 09:08:14 2006 @@ -203,14 +203,14 @@ assertNotNull(sub); PlanetEntryData entry1 = new PlanetEntryData(); - entry1.setPermaLink("test_entry1"); + entry1.setPermalink("test_entry1"); entry1.setCategoriesString("test,test2"); entry1.setSubscription(sub); entry1.setPubTime(new Timestamp(System.currentTimeMillis())); sub.addEntry(entry1); PlanetEntryData entry2 = new PlanetEntryData(); - entry2.setPermaLink("test_entry2"); + entry2.setPermalink("test_entry2"); entry2.setCategoriesString("test_cat1,test_cat2,test_cat3"); entry2.setSubscription(sub); entry2.setPubTime(new Timestamp(System.currentTimeMillis())); @@ -230,7 +230,7 @@ assertNotNull(sub); PlanetEntryData entry3 = new PlanetEntryData(); - entry3.setPermaLink("test_entry3"); + entry3.setPermalink("test_entry3"); entry3.setCategoriesString("test,test3"); entry3.setSubscription(sub); entry3.setPubTime(new Timestamp(System.currentTimeMillis())); Modified: incubator/roller/branches/roller_3.0/web/themes/frontpage/Weblog.vm URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/frontpage/Weblog.vm?rev=431935&r1=431934&r2=431935&view=diff ============================================================================== --- incubator/roller/branches/roller_3.0/web/themes/frontpage/Weblog.vm (original) +++ incubator/roller/branches/roller_3.0/web/themes/frontpage/Weblog.vm Wed Aug 16 09:08:14 2006 @@ -31,53 +31,57 @@
+ + ## The below pager code should work against either: + + ## 1) SITE-WIDE entries (the default) + #set($pager = $site.getWeblogEntriesPager($since, $maxResults)) - #set($pager = $site.getWeblogEntriesPager($since, $maxResults)) + ## 2) PLANET-entries + ## set($pager = $planet.getAggregationPager($since, $maxResults)) - ## or if you want to show planet entries use this pager: - ## set($pager = $planet.getAggregationPager($since, $maxResults)) - #if($pager.items.size() > 0) - #set($entryCount = $pager.items.size() - 1) - #set($startDate = $pager.items.get(0).pubTime) - #set($endDate = $entries.get($entryCount).pubTime) - #end - #foreach($entry in $pager.items) - #if($velocityCount < $maxResults) - -
-

- - $utils.truncateNicely($utils.removeHTML($entry.title), 50, 50, "...")
- $entry.website.name - #if($entry.category.name)| $entry.category.name #end - #if($entry.pubTime) | $utils.formatDate($entry.pubTime, $text.get("macro.weblog.date.toStringFormat")) #end - #if($entry.creator.userName)| By $entry.creator.userName #end -
-

-

- #if(!$utils.isEmpty($entry.summary)) - $utils.truncateNicely($utils.removeHTML($entry.transformedSummary), 240, 260, "...") - #else - $utils.truncateNicely($utils.removeHTML($entry.transformedText), 240, 260, "...") + #if($pager.items.size() > 0) + #set($entryCount = $pager.items.size() - 1) + #set($startDate = $pager.items.get(0).pubTime) + #set($endDate = $entries.get($entryCount).pubTime) #end -

-
+ #foreach($entry in $pager.items) + #if($velocityCount < $maxResults) - #end - #end -
- #if($pager.nextLink) - < $pager.nextName - #end - #if($pager.nextLink && $pager.prevLink) -  |  - #end - #if($pager.prevLink) - $pager.prevName > - #end -
+
+

+ + $utils.truncateNicely($utils.removeHTML($entry.title), 50, 50, "...")
+ $entry.website.name + #if($entry.category.name)| $entry.category.name #end + #if($entry.pubTime) | $utils.formatDate($entry.pubTime, $text.get("macro.weblog.date.toStringFormat")) #end + #if($entry.creator.userName)| By $entry.creator.userName #end +
+

+

+ #if($entry.displayContent) + $utils.truncateNicely($utils.removeHTML($entry.displayContent), 240, 260, "...") + #else ## planet entries don't have displayContent + $utils.truncateNicely($utils.removeHTML($entry.text), 240, 260, "...") + #end +

+
+ + #end + #end +
+ #if($pager.nextLink) + < $pager.nextName + #end + #if($pager.nextLink && $pager.prevLink) +  |  + #end + #if($pager.prevLink) + $pager.prevName > + #end +
Modified: incubator/roller/branches/roller_3.0/web/themes/frontpage/_blogdirectory.vm URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/frontpage/_blogdirectory.vm?rev=431935&r1=431934&r2=431935&view=diff ============================================================================== --- incubator/roller/branches/roller_3.0/web/themes/frontpage/_blogdirectory.vm (original) +++ incubator/roller/branches/roller_3.0/web/themes/frontpage/_blogdirectory.vm Wed Aug 16 09:08:14 2006 @@ -1,76 +1,75 @@ - #if($model.getRequestParameter("letter")) - #set($chosenLetter = $model.getRequestParameter("letter")) - #end - - #set($weblogLetterMap = $site.getWeblogHandleLetterMap()) -
-

- #set($firstLetterDone = 0) - #foreach($letter in $weblogLetterMap.keySet()) - #if($firstLetterDone == 1) - #end - #set($firstLetterDone = 1) - #set($letterCount = $weblogLetterMap.get($letter)) - #if($letter == $chosenLetter)#end - #if($letterCount > 0) - $letter - #else - $letter - #end - #if($letter == $chosenLetter)#end - #end -

-
+#includeTemplate($model.weblog "_header") - #if($chosenLetter) -

Weblogs starting with $chosenLetter

- #else -

All weblogs

- #end - - #set($weblogsPager = $site.getWeblogsByLetterPager($chosenLetter, -1, $pageLength)) - - - - - - - - - #foreach($loopblog in $weblogsPager.items) - - - - - #end - - - - - - - -
Blog NameDescription
$loopblog.handle$loopblog.name
- - #if($chosenLetter) - #if($weblogsPager.prevLink) - <$weblogsPager.prevName - #end - #if($weblogsPager.nextLink && $weblogsPager.prevLink()) -  |  - #end - #if($weblogsPager.nextLink) - $weblogsPager.nextName > - #end - #else - #if($weblogsPager.prevLink) - <$weblogsPager.prevName - #end - #if($weblogsPager.nextLink && $weblogsPager.prevLink()) -  |  - #end - #if($weblogsPager.nextLink) - $weblogsPager.nextName > +#set($maxResults = 25) +#set($since = 365) + +
+
+

$config.siteName

+

$config.siteDescription

+ + + + + + +
+
+
+   Recent Entries   +
+
+ 		+
+
+   Weblog Directory   +
+
+
+ +
+ +
+
+ #if($model.getRequestParameter("weblog")) + #set($handle = $model.getRequestParameter("weblog")) + Back to blog directory + #set($profileWeblog = $site.getWeblog($handle)) + #includeTemplate($model.weblog "_blogprofile") + #else + #set($pageLength = $maxResults) + #includeTemplate($model.weblog "_blogdirectory") #end - #end +
+
+ +
+
+ +
+
+ +
+
+
+

New blogs

+
+
+
+ +
+ #set($newblogs = $site.getNewWeblogs($since, $maxResults)) +
    + #foreach($blog in $newblogs) +
  • $blog.name ($blog.handle)
    • + #end +
+
+ +
+
+ -
+
+ +#includeTemplate($model.weblog "_footer") Modified: incubator/roller/branches/roller_3.0/web/themes/frontpage/_blogprofile.vm URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/frontpage/_blogprofile.vm?rev=431935&r1=431934&r2=431935&view=diff ============================================================================== --- incubator/roller/branches/roller_3.0/web/themes/frontpage/_blogprofile.vm (original) +++ incubator/roller/branches/roller_3.0/web/themes/frontpage/_blogprofile.vm Wed Aug 16 09:08:14 2006 @@ -1,40 +1,38 @@ -

Weblog: $weblog.name

- +

Weblog: $profileWeblog.name

+
- - + + - + - - + - + - +
Handle$weblog.handleHandle$profileWeblog.handle
Description$weblog.description$profileWeblog.description
Created by<$weblog.creator.fullName/td> + <$profileWeblog.creator.fullName/td>
Last modified$weblog.lastModified$profileWeblog.lastModified
Locale$!weblog.locale$!profileWeblog.locale
Timezone$weblog.timeZone$profileWeblog.timeZone

Weblog users

- #set($users = $site.getWeblogsUsers($weblog.handle)) - - - - - - - + #set($users = $site.getWeblogsUsers($profileWeblog.handle)) +
UsernameFull name
+ + + + #foreach($user in $users) @@ -44,16 +42,14 @@
UsernameFull name
$user.userName

Recent posts

- #set($entriesPager = $site.getWeblogEntriesPager($weblog, $null, $null, 90, 5)) + #set($entriesPager = $site.getWeblogEntriesPager($profileWeblog, 90, 5)) #if($entriesPager.items.size() > 0) - - - - - - - - +
UserPub. timeTitle
+ + + + + #foreach($entry in $entriesPager.items) Modified: incubator/roller/branches/roller_3.0/web/themes/frontpage/_css.vm URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/frontpage/_css.vm?rev=431935&r1=431934&r2=431935&view=diff ============================================================================== --- incubator/roller/branches/roller_3.0/web/themes/frontpage/_css.vm (original) +++ incubator/roller/branches/roller_3.0/web/themes/frontpage/_css.vm Wed Aug 16 09:08:14 2006 @@ -98,10 +98,10 @@ border: 1px solid #f1ebdf; } #directory { - padding: 5px; + padding: 15px; } #recentEntries{ - padding: 5px; + padding: 10px; } Modified: incubator/roller/branches/roller_3.0/web/themes/frontpage/directory.vm URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/frontpage/directory.vm?rev=431935&r1=431934&r2=431935&view=diff ============================================================================== --- incubator/roller/branches/roller_3.0/web/themes/frontpage/directory.vm (original) +++ incubator/roller/branches/roller_3.0/web/themes/frontpage/directory.vm Wed Aug 16 09:08:14 2006 @@ -20,7 +20,7 @@ @@ -31,10 +31,10 @@
- #if($pageModel.getRequestParameter("weblog")) - #set($handle = $pageModel.getRequestParameter("weblog")) - Back to blog directory - #set($weblog = $site.getWeblog($handle)) + #if($model.getRequestParameter("weblog")) + #set($handle = $model.getRequestParameter("weblog")) + Back to blog directory + #set($profileWeblog = $site.getWeblog($handle)) #includeTemplate($model.weblog "_blogprofile") #else #set($pageLength = $maxResults)
UserPub. timeTitle
$entry.creator.userName
-   Weblog Directory   +   Weblog Directory