You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2006/06/05 17:05:42 UTC
svn commit: r411807 - in /incubator/roller/branches/roller_3.0: ./
src/org/apache/roller/business/hibernate/ src/org/apache/roller/pojos/
src/org/apache/roller/ui/rendering/velocity/
Author: snoopdave
Date: Mon Jun 5 08:05:42 2006
New Revision: 411807
URL: http://svn.apache.org/viewvc?rev=411807&view=rev
Log:
Ongoing Atlas frontpage dev: page models and query refinements
Modified:
incubator/roller/branches/roller_3.0/build.xml
incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PermissionsData.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WebsiteData.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/SitePageModel.java
Modified: incubator/roller/branches/roller_3.0/build.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/build.xml?rev=411807&r1=411806&r2=411807&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/build.xml (original)
+++ incubator/roller/branches/roller_3.0/build.xml Mon Jun 5 08:05:42 2006
@@ -262,6 +262,7 @@
<include name="org/apache/roller/pojos/WebsiteData.java"/>
<include name="org/apache/roller/pojos/PlanetEntryData.java"/>
<include name="org/apache/roller/pojos/PlanetSubscriptionData.java"/>
+ <include name="org/apache/roller/pojos/PermissionsData.java"/>
</fileset>
<template
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java?rev=411807&r1=411806&r2=411807&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java Mon Jun 5 08:05:42 2006
@@ -448,7 +448,8 @@
* Get websites of a user
*/
public List getWebsites(
- UserData user, Boolean enabled, Boolean active, Date startDate, Date endDate, int offset, int length)
+ UserData user, Boolean enabled, Boolean active,
+ Date startDate, Date endDate, int offset, int length)
throws RollerException {
// TODO: ATLAS getWebsites DONE TESTED
if (endDate == null) endDate = new Date();
@@ -565,6 +566,7 @@
if (length != Integer.MAX_VALUE) {
criteria.setMaxResults(length);
}
+ criteria.addOrder(Order.desc("dateCreated"));
return criteria.list();
} catch (HibernateException e) {
throw new RollerException(e);
@@ -894,7 +896,7 @@
Session session =
((HibernatePersistenceStrategy)strategy).getSession();
StringBuffer sb = new StringBuffer();
- sb.append("select count(distinct c), c.weblogEntry.website.id, c.weblogEntry.website.name, c.weblogEntry.website.description ");
+ sb.append("select count(distinct c), c.weblogEntry.website.id, c.weblogEntry.website.handle, c.weblogEntry.website.name ");
sb.append("from CommentData c where c.weblogEntry.pubTime < :endDate ");
if (startDate != null) {
sb.append("and c.weblogEntry.pubTime > :startDate ");
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PermissionsData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PermissionsData.java?rev=411807&r1=411806&r2=411807&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PermissionsData.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PermissionsData.java Mon Jun 5 08:05:42 2006
@@ -65,6 +65,7 @@
}
/**
* @hibernate.many-to-one column="website_id" cascade="none" not-null="false"
+ * @roller.wrapPojoMethod type="pojo"
*/
public WebsiteData getWebsite()
{
@@ -76,6 +77,7 @@
}
/**
* @hibernate.many-to-one column="user_id" cascade="none" not-null="false"
+ * @roller.wrapPojoMethod type="pojo"
*/
public UserData getUser()
{
@@ -104,6 +106,7 @@
* And false if user is member of website.
* @ejb:persistent-field
* @hibernate.property column="pending" non-null="true" unique="false"
+ * @roller.wrapPojoMethod type="simple"
*/
public boolean isPending()
{
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WebsiteData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WebsiteData.java?rev=411807&r1=411806&r2=411807&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WebsiteData.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WebsiteData.java Mon Jun 5 08:05:42 2006
@@ -685,6 +685,7 @@
/**
* @ejb:persistent-field
* @hibernate.property column="datecreated" non-null="true" unique="false"
+ * @roller.wrapPojoMethod type="simple"
*/
public Date getDateCreated() {
if (dateCreated == null) {
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/SitePageModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/SitePageModel.java?rev=411807&r1=411806&r2=411807&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/SitePageModel.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/SitePageModel.java Mon Jun 5 08:05:42 2006
@@ -32,10 +32,12 @@
import org.apache.roller.model.UserManager;
import org.apache.roller.model.WeblogManager;
import org.apache.roller.pojos.CommentData;
+import org.apache.roller.pojos.PermissionsData;
import org.apache.roller.pojos.UserData;
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WebsiteData;
import org.apache.roller.pojos.wrapper.CommentDataWrapper;
+import org.apache.roller.pojos.wrapper.PermissionsDataWrapper;
import org.apache.roller.pojos.wrapper.UserDataWrapper;
import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
import org.apache.roller.pojos.wrapper.WebsiteDataWrapper;
@@ -68,6 +70,46 @@
for (Iterator it = weblogs.iterator(); it.hasNext();) {
WebsiteData website = (WebsiteData) it.next();
results.add(WebsiteDataWrapper.wrap(website));
+ }
+ } catch (Exception e) {
+ log.error("ERROR: fetching weblog list", e);
+ }
+ return results;
+ }
+
+ /**
+ * Return list of weblogs that user belongs to.
+ */
+ public List getUsersWeblogs(String userName) {
+ List results = new ArrayList();
+ try {
+ Roller roller = RollerFactory.getRoller();
+ UserManager umgr = roller.getUserManager();
+ UserData user = umgr.getUserByUserName(userName);
+ List perms = umgr.getAllPermissions(user);
+ for (Iterator it = perms.iterator(); it.hasNext();) {
+ PermissionsData perm = (PermissionsData) it.next();
+ results.add(PermissionsDataWrapper.wrap(perm));
+ }
+ } catch (Exception e) {
+ log.error("ERROR: fetching weblog list", e);
+ }
+ return results;
+ }
+
+ /**
+ * Return list of users that belong to website.
+ */
+ public List getWeblogsUsers(String handle) {
+ List results = new ArrayList();
+ try {
+ Roller roller = RollerFactory.getRoller();
+ UserManager umgr = roller.getUserManager();
+ WebsiteData website = umgr.getWebsiteByHandle(handle);
+ List perms = umgr.getAllPermissions(website);
+ for (Iterator it = perms.iterator(); it.hasNext();) {
+ PermissionsData perm = (PermissionsData) it.next();
+ results.add(PermissionsDataWrapper.wrap(perm));
}
} catch (Exception e) {
log.error("ERROR: fetching weblog list", e);