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 2007/05/29 23:22:27 UTC
svn commit: r542656 [2/6] - in /roller/trunk: ./ src/META-INF/
src/org/apache/roller/business/ src/org/apache/roller/business/hibernate/
src/org/apache/roller/business/jpa/ src/org/apache/roller/business/pings/
src/org/apache/roller/business/referrers/...
Modified: roller/trunk/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java (original)
+++ roller/trunk/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java Tue May 29 14:22:19 2007
@@ -49,7 +49,7 @@
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WeblogEntryTagData;
import org.apache.roller.pojos.WeblogEntryTagAggregateData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
import org.apache.roller.pojos.EntryAttributeData;
import org.apache.roller.util.DateUtil;
import org.hibernate.Criteria;
@@ -167,7 +167,7 @@
// Loop through entries in src cat, assign them to dest cat
Iterator iter = results.iterator();
- WebsiteData website = destCat.getWebsite();
+ Weblog website = destCat.getWebsite();
while (iter.hasNext()) {
WeblogEntryData entry = (WeblogEntryData) iter.next();
entry.setCategory(destCat);
@@ -370,7 +370,7 @@
}
}
- public WeblogCategoryData getRootWeblogCategory(WebsiteData website)
+ public WeblogCategoryData getRootWeblogCategory(Weblog website)
throws RollerException {
if (website == null)
throw new RollerException("website is null");
@@ -391,7 +391,7 @@
}
- public List getWeblogCategories(WebsiteData website, boolean includeRoot)
+ public List getWeblogCategories(Weblog website, boolean includeRoot)
throws RollerException {
if (website == null) {
@@ -415,7 +415,7 @@
public List getWeblogEntries(
- WebsiteData website,
+ Weblog website,
UserData user,
Date startDate,
Date endDate,
@@ -551,7 +551,7 @@
}
- public WeblogEntryData getWeblogEntryByAnchor(WebsiteData website, String anchor)
+ public WeblogEntryData getWeblogEntryByAnchor(Weblog website, String anchor)
throws RollerException {
if (website == null)
@@ -718,7 +718,7 @@
public List getComments(
- WebsiteData website,
+ Weblog website,
WeblogEntryData entry,
String searchString,
Date startDate,
@@ -791,7 +791,7 @@
}
public int removeMatchingComments(
- WebsiteData website,
+ Weblog website,
WeblogEntryData entry,
String searchString,
Date startDate,
@@ -908,7 +908,7 @@
//--------------------------------------------- WeblogCategoryData Queries
- public WeblogCategoryData getWeblogCategoryByPath(WebsiteData website,
+ public WeblogCategoryData getWeblogCategoryByPath(Weblog website,
String categoryPath)
throws RollerException {
@@ -945,7 +945,7 @@
public Map getWeblogEntryObjectMap(
- WebsiteData website,
+ Weblog website,
Date startDate,
Date endDate,
String catName,
@@ -968,7 +968,7 @@
}
public Map getWeblogEntryStringMap(
- WebsiteData website,
+ Weblog website,
Date startDate,
Date endDate,
String catName,
@@ -993,7 +993,7 @@
}
private Map getWeblogEntryMap(
- WebsiteData website,
+ Weblog website,
Date startDate,
Date endDate,
String catName,
@@ -1047,7 +1047,7 @@
}
public List getMostCommentedWeblogEntries(
- WebsiteData website, Date startDate, Date endDate, int offset, int length)
+ Weblog website, Date startDate, Date endDate, int offset, int length)
throws RollerException {
// TODO: ATLAS getMostCommentedWeblogEntries DONE
String msg = "Getting most commented weblog entries";
@@ -1147,7 +1147,7 @@
* all existing entries in a website using a single HQL query.
* @param website Website where comment defaults are from/to be applied.
*/
- public void applyCommentDefaultsToEntries(WebsiteData website) throws RollerException {
+ public void applyCommentDefaultsToEntries(Weblog website) throws RollerException {
if (log.isDebugEnabled()) {
log.debug("applyCommentDefaults");
}
@@ -1170,7 +1170,7 @@
/* (non-Javadoc)
* @see org.apache.roller.model.WeblogManager#getPopularTags(org.apache.roller.pojos.WebsiteData, java.util.Date, int)
*/
- public List getPopularTags(WebsiteData website, Date startDate, int limit)
+ public List getPopularTags(Weblog website, Date startDate, int limit)
throws RollerException {
try {
Session session = ((HibernatePersistenceStrategy) strategy)
@@ -1245,7 +1245,7 @@
* @see org.apache.roller.model.WeblogManager#getTags(org.apache.roller.pojos.WebsiteData,
* java.lang.String, java.lang.String, int)
*/
- public List getTags(WebsiteData website, String sortBy, String startsWith, int limit) throws RollerException {
+ public List getTags(Weblog website, String sortBy, String startsWith, int limit) throws RollerException {
try {
List results = new ArrayList();
@@ -1297,7 +1297,7 @@
* list of tags is "foo", "bar" and we only find "foo" then that's a
* miss and we return false.
*/
- public boolean getTagComboExists(List tags, WebsiteData weblog)
+ public boolean getTagComboExists(List tags, Weblog weblog)
throws RollerException {
boolean comboExists = false;
@@ -1335,7 +1335,7 @@
}
- public void updateTagCount(String name, WebsiteData website, int amount) throws RollerException {
+ public void updateTagCount(String name, Weblog website, int amount) throws RollerException {
Session session = ((HibernatePersistenceStrategy) strategy)
.getSession();
@@ -1419,7 +1419,7 @@
}
}
- public HitCountData getHitCountByWeblog(WebsiteData weblog)
+ public HitCountData getHitCountByWeblog(Weblog weblog)
throws RollerException {
// do lookup
@@ -1482,7 +1482,7 @@
}
- public void incrementHitCount(WebsiteData weblog, int amount)
+ public void incrementHitCount(Weblog weblog, int amount)
throws RollerException {
Session session = ((HibernatePersistenceStrategy) strategy).getSession();
@@ -1525,7 +1525,7 @@
}
- public void resetHitCount(WebsiteData weblog) throws RollerException {
+ public void resetHitCount(Weblog weblog) throws RollerException {
try {
Session session = ((HibernatePersistenceStrategy)strategy).getSession();
@@ -1547,7 +1547,7 @@
/**
* Get weblog comment count
*/
- public long getCommentCount(WebsiteData website) throws RollerException {
+ public long getCommentCount(Weblog website) throws RollerException {
long ret = 0;
try {
Session session = ((HibernatePersistenceStrategy)strategy).getSession();
@@ -1582,7 +1582,7 @@
/**
* Get weblog entry count
*/
- public long getEntryCount(WebsiteData website) throws RollerException {
+ public long getEntryCount(Weblog website) throws RollerException {
long ret = 0;
try {
Session session = ((HibernatePersistenceStrategy)strategy).getSession();
Modified: roller/trunk/src/org/apache/roller/business/jpa/JPAAutoPingManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/business/jpa/JPAAutoPingManagerImpl.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/business/jpa/JPAAutoPingManagerImpl.java (original)
+++ roller/trunk/src/org/apache/roller/business/jpa/JPAAutoPingManagerImpl.java Tue May 29 14:22:19 2007
@@ -28,7 +28,7 @@
import org.apache.roller.pojos.AutoPingData;
import org.apache.roller.pojos.PingTargetData;
import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
import java.util.Collection;
import java.util.Collections;
@@ -72,7 +72,7 @@
strategy.remove(autoPing);
}
- public void removeAutoPing(PingTargetData pingTarget, WebsiteData website)
+ public void removeAutoPing(PingTargetData pingTarget, Weblog website)
throws RollerException {
Query q = strategy.getNamedUpdate("AutoPingData.removeByPingTarget&Website");
q.setParameter(1, pingTarget);
@@ -109,7 +109,7 @@
}
}
- public List getAutoPingsByWebsite(WebsiteData website)
+ public List getAutoPingsByWebsite(Weblog website)
throws RollerException {
Query q = strategy.getNamedQuery("AutoPingData.getByWebsite");
q.setParameter(1, website);
Modified: roller/trunk/src/org/apache/roller/business/jpa/JPABookmarkManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/business/jpa/JPABookmarkManagerImpl.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/business/jpa/JPABookmarkManagerImpl.java (original)
+++ roller/trunk/src/org/apache/roller/business/jpa/JPABookmarkManagerImpl.java Tue May 29 14:22:19 2007
@@ -29,9 +29,9 @@
import org.apache.roller.RollerException;
import org.apache.roller.business.BookmarkManager;
import org.apache.roller.business.RollerFactory;
-import org.apache.roller.pojos.BookmarkData;
-import org.apache.roller.pojos.FolderData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.WeblogBookmark;
+import org.apache.roller.pojos.WeblogBookmarkFolder;
+import org.apache.roller.pojos.Weblog;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.input.SAXBuilder;
@@ -62,7 +62,7 @@
this.strategy = strategy;
}
- public void saveBookmark(BookmarkData bookmark) throws RollerException {
+ public void saveBookmark(WeblogBookmark bookmark) throws RollerException {
boolean exists = getBookmark(bookmark.getId()) != null;
if (!exists) {
// New object make sure that relationship is set on managed copy of other side
@@ -76,11 +76,11 @@
saveWebsite(bookmark.getWebsite());
}
- public BookmarkData getBookmark(String id) throws RollerException {
- return (BookmarkData) strategy.load(BookmarkData.class, id);
+ public WeblogBookmark getBookmark(String id) throws RollerException {
+ return (WeblogBookmark) strategy.load(WeblogBookmark.class, id);
}
- public void removeBookmark(BookmarkData bookmark) throws RollerException {
+ public void removeBookmark(WeblogBookmark bookmark) throws RollerException {
//Now remove it from database
this.strategy.remove(bookmark);
//Remove the bookmark from its parent folder
@@ -90,7 +90,7 @@
.saveWebsite(bookmark.getWebsite());
}
- public void saveFolder(FolderData folder) throws RollerException {
+ public void saveFolder(WeblogBookmarkFolder folder) throws RollerException {
if(folder.getId() == null || this.getFolder(folder.getId()) == null) {
// New folder, so make sure name is unique
@@ -99,7 +99,7 @@
}
// And If it has a parent, maintain relationship from both sides
- FolderData parent = folder.getParent();
+ WeblogBookmarkFolder parent = folder.getParent();
if(parent != null) {
parent.getFolders().add(folder);
}
@@ -111,9 +111,9 @@
RollerFactory.getRoller().getUserManager().saveWebsite(folder.getWebsite());
}
- public void removeFolder(FolderData folder) throws RollerException {
+ public void removeFolder(WeblogBookmarkFolder folder) throws RollerException {
this.strategy.remove(folder);
- FolderData parent = folder.getParent();
+ WeblogBookmarkFolder parent = folder.getParent();
if (parent != null) {
parent.getFolders().remove(folder);
}
@@ -123,7 +123,7 @@
saveWebsite(folder.getWebsite());
}
- public void moveFolder(FolderData srcFolder, FolderData destFolder)
+ public void moveFolder(WeblogBookmarkFolder srcFolder, WeblogBookmarkFolder destFolder)
throws RollerException {
// TODO: this check should be made before calling this method?
@@ -136,7 +136,7 @@
destFolder.getPath());
// Manage relationships
- FolderData oldParent = srcFolder.getParent();
+ WeblogBookmarkFolder oldParent = srcFolder.getParent();
if(oldParent != null) {
oldParent.getFolders().add(srcFolder);
}
@@ -156,14 +156,14 @@
}
// updates the paths of all descendents of the given folder
- private void updatePathTree(FolderData folder) throws RollerException {
+ private void updatePathTree(WeblogBookmarkFolder folder) throws RollerException {
log.debug("Updating path tree for folder "+folder.getPath());
- FolderData childFolder = null;
+ WeblogBookmarkFolder childFolder = null;
Iterator childFolders = folder.getFolders().iterator();
while(childFolders.hasNext()) {
- childFolder = (FolderData) childFolders.next();
+ childFolder = (WeblogBookmarkFolder) childFolders.next();
log.debug("OLD child folder path was "+childFolder.getPath());
@@ -187,13 +187,13 @@
/**
* Retrieve folder and lazy-load it's sub-folders and bookmarks.
*/
- public FolderData getFolder(String id) throws RollerException {
- return (FolderData) strategy.load(FolderData.class, id);
+ public WeblogBookmarkFolder getFolder(String id) throws RollerException {
+ return (WeblogBookmarkFolder) strategy.load(WeblogBookmarkFolder.class, id);
}
public void importBookmarks(
- WebsiteData website, String folderName, String opml)
+ Weblog website, String folderName, String opml)
throws RollerException {
String msg = "importBookmarks";
try {
@@ -202,9 +202,9 @@
StringReader reader = new StringReader( opml );
Document doc = builder.build( reader );
- FolderData newFolder = getFolder(website, folderName);
+ WeblogBookmarkFolder newFolder = getFolder(website, folderName);
if (newFolder == null) {
- newFolder = new FolderData(
+ newFolder = new WeblogBookmarkFolder(
getRootFolder(website),
folderName, folderName, website);
this.strategy.store(newFolder);
@@ -227,7 +227,7 @@
// NOTE: this method does not commit any changes;
// that is done by importBookmarks()
private void importOpmlElement(
- WebsiteData website, Element elem, FolderData parent)
+ Weblog website, Element elem, WeblogBookmarkFolder parent)
throws RollerException {
String text = elem.getAttributeValue("text");
String title = elem.getAttributeValue("title");
@@ -252,7 +252,7 @@
// TODO: Consider providing error feedback instead of
// silently skipping the invalid bookmarks here.
if (null != title && null != url) {
- BookmarkData bd = new BookmarkData(parent,
+ WeblogBookmark bd = new WeblogBookmark(parent,
title,
desc,
url,
@@ -266,7 +266,7 @@
}
} else {
// Store a folder
- FolderData fd = new FolderData(
+ WeblogBookmarkFolder fd = new WeblogBookmarkFolder(
parent,
title,
desc,
@@ -283,7 +283,7 @@
}
- public FolderData getFolder(WebsiteData website, String path)
+ public WeblogBookmarkFolder getFolder(Weblog website, String path)
throws RollerException {
if (path == null || path.trim().equals("/")) {
@@ -297,11 +297,11 @@
}
// now just do simple lookup by path
- Query query = strategy.getNamedQuery("FolderData.getByWebsite&Path");
+ Query query = strategy.getNamedQuery("WeblogBookmarkFolder.getByWebsite&Path");
query.setParameter(1, website);
query.setParameter(2, folderPath);
try {
- return (FolderData)query.getSingleResult();
+ return (WeblogBookmarkFolder)query.getSingleResult();
} catch (NoResultException e) {
return null;
}
@@ -310,9 +310,9 @@
/**
* @see org.apache.roller.model.BookmarkManager#retrieveBookmarks(
- * org.apache.roller.pojos.FolderData, boolean)
+ * org.apache.roller.pojos.WeblogBookmarkFolder, boolean)
*/
- public List getBookmarks(FolderData folder, boolean subfolders)
+ public List getBookmarks(WeblogBookmarkFolder folder, boolean subfolders)
throws RollerException {
Query query = null;
List results = null;
@@ -335,26 +335,26 @@
return results;
}
- public FolderData getRootFolder(WebsiteData website)
+ public WeblogBookmarkFolder getRootFolder(Weblog website)
throws RollerException {
if (website == null)
throw new RollerException("website is null");
- Query q = strategy.getNamedQuery("FolderData.getByWebsite&ParentNull");
+ Query q = strategy.getNamedQuery("WeblogBookmarkFolder.getByWebsite&ParentNull");
q.setParameter(1, website);
try {
- return (FolderData)q.getSingleResult();
+ return (WeblogBookmarkFolder)q.getSingleResult();
} catch (NoResultException e) {
return null;
}
}
- public List getAllFolders(WebsiteData website)
+ public List getAllFolders(Weblog website)
throws RollerException {
if (website == null)
throw new RollerException("Website is null");
- Query q = strategy.getNamedQuery("FolderData.getByWebsite");
+ Query q = strategy.getNamedQuery("WeblogBookmarkFolder.getByWebsite");
q.setParameter(1, website);
return q.getResultList();
}
@@ -363,11 +363,11 @@
/**
* make sure the given folder doesn't already exist.
*/
- private boolean isDuplicateFolderName(FolderData folder)
+ private boolean isDuplicateFolderName(WeblogBookmarkFolder folder)
throws RollerException {
// ensure that no sibling categories share the same name
- FolderData parent = folder.getParent();
+ WeblogBookmarkFolder parent = folder.getParent();
if (null != parent) {
return (getFolder(folder.getWebsite(), folder.getPath()) != null);
}
Modified: roller/trunk/src/org/apache/roller/business/jpa/JPAPingTargetManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/business/jpa/JPAPingTargetManagerImpl.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/business/jpa/JPAPingTargetManagerImpl.java (original)
+++ roller/trunk/src/org/apache/roller/business/jpa/JPAPingTargetManagerImpl.java Tue May 29 14:22:19 2007
@@ -34,7 +34,7 @@
import org.apache.roller.business.pings.PingTargetManager;
import org.apache.roller.pojos.AutoPingData;
import org.apache.roller.pojos.PingTargetData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
/*
* JPAPingTargetManagerImpl.java
@@ -106,7 +106,7 @@
// Determine the set of "brother" targets (custom or common)
// among which this name should be unique.
List brotherTargets = null;
- WebsiteData website = pingTarget.getWebsite();
+ Weblog website = pingTarget.getWebsite();
if (website == null) {
brotherTargets = getCommonPingTargets();
} else {
@@ -171,7 +171,7 @@
return q.getResultList();
}
- public List getCustomPingTargets(WebsiteData website)
+ public List getCustomPingTargets(Weblog website)
throws RollerException {
Query q = strategy.getNamedQuery(
"PingTargetData.getByWebsiteOrderByName");
Modified: roller/trunk/src/org/apache/roller/business/jpa/JPARefererManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/business/jpa/JPARefererManagerImpl.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/business/jpa/JPARefererManagerImpl.java (original)
+++ roller/trunk/src/org/apache/roller/business/jpa/JPARefererManagerImpl.java Tue May 29 14:22:19 2007
@@ -42,7 +42,7 @@
import org.apache.roller.pojos.RefererData;
import org.apache.roller.pojos.StatCount;
import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
import org.apache.roller.pojos.StatCountCountComparator;
import org.apache.roller.util.LinkbackExtractor;
import org.apache.roller.util.Utilities;
@@ -96,7 +96,7 @@
/**
* Clear referrer dayhits and remove referrers without excerpts.
*/
- public void clearReferrers(WebsiteData website) throws RollerException {
+ public void clearReferrers(Weblog website) throws RollerException {
clearDayHitsByWebsite(website);
Query q = strategy.getNamedUpdate("RefererData.removeByNullOrEmptyExcerpt&Website");
q.setParameter(1, website);
@@ -121,7 +121,7 @@
/**
* Apply ignoreWord/spam filters to all referers in website.
*/
- public void applyRefererFilters(WebsiteData website)
+ public void applyRefererFilters(Weblog website)
throws RollerException {
if (null == website) throw new RollerException("website is null");
if (null == website.getBlacklist()) return;
@@ -136,7 +136,7 @@
}
}
- protected List getExistingReferers(WebsiteData website, String dateString,
+ protected List getExistingReferers(Weblog website, String dateString,
String permalink) throws RollerException {
Query q = strategy.getNamedQuery(
@@ -147,7 +147,7 @@
return q.getResultList();
}
- protected List getMatchingReferers(WebsiteData website, String requestUrl,
+ protected List getMatchingReferers(Weblog website, String requestUrl,
String refererUrl) throws RollerException {
Query q = strategy.getNamedQuery(
@@ -212,7 +212,7 @@
return results;
}
- protected int getHits(WebsiteData website, String type)
+ protected int getHits(Weblog website, String type)
throws RollerException {
int hits = -1;
if (log.isDebugEnabled()) {
@@ -249,7 +249,7 @@
* @param weblog
* @return List of type RefererData
*/
- public List getReferers(WebsiteData weblog) throws RollerException {
+ public List getReferers(Weblog weblog) throws RollerException {
Query q = strategy.getNamedQuery(
"RefererData.getByWebsiteOrderByTotalHitsDesc");
q.setParameter(1, weblog);
@@ -261,7 +261,7 @@
* @param website Web site.
* @return List of type RefererData
*/
- public List getTodaysReferers(WebsiteData website) throws RollerException {
+ public List getTodaysReferers(Weblog website) throws RollerException {
Query q = strategy.getNamedQuery(
"RefererData.getByWebsite&DayHitsGreaterZeroOrderByDayHitsDesc");
q.setParameter(1, website);
@@ -275,7 +275,7 @@
* @return List of type RefererData.
* @throws org.apache.roller.RollerException
*/
- public List getReferersToDate(WebsiteData website, String date)
+ public List getReferersToDate(Weblog website, String date)
throws RollerException {
if (website==null )
@@ -314,7 +314,7 @@
/**
* Query for collection of referers.
*/
- protected List getReferersToWebsite(WebsiteData website, String refererUrl)
+ protected List getReferersToWebsite(Weblog website, String refererUrl)
throws RollerException {
Query q = strategy.getNamedQuery(
"RefererData.getByWebsite&RefererUrl");
@@ -326,7 +326,7 @@
/**
* Query for collection of referers.
*/
- protected List getReferersWithSameTitle(WebsiteData website,
+ protected List getReferersWithSameTitle(Weblog website,
String requestUrl,
String title,
String excerpt)
@@ -343,14 +343,14 @@
/**
* Get user's day hits
*/
- public int getDayHits(WebsiteData website) throws RollerException {
+ public int getDayHits(Weblog website) throws RollerException {
return getHits(website, DAYHITS);
}
/**
* Get user's all-time total hits
*/
- public int getTotalHits(WebsiteData website) throws RollerException {
+ public int getTotalHits(Weblog website) throws RollerException {
return getHits(website, TOTALHITS);
}
@@ -373,7 +373,7 @@
return;
String selfSiteFragment = "/"+weblogHandle;
- WebsiteData weblog = null;
+ Weblog weblog = null;
WeblogEntryData entry = null;
// lookup the weblog now
@@ -636,7 +636,7 @@
query.executeUpdate();
}
- protected void clearDayHitsByWebsite(WebsiteData website) throws RollerException {
+ protected void clearDayHitsByWebsite(Weblog website) throws RollerException {
Query query = strategy.getNamedUpdate("RefererData.clearDayHitsByWebsite");
query.setParameter(1, website);
query.executeUpdate();
@@ -649,7 +649,7 @@
return (List) query.getResultList();
}
- protected List getBlackListedReferer(WebsiteData website, String[] blacklist)
+ protected List getBlackListedReferer(Weblog website, String[] blacklist)
throws RollerException {
StringBuffer queryString = getQueryStringForBlackList(blacklist);
queryString.append(" AND r.website = ?1 ");
Modified: roller/trunk/src/org/apache/roller/business/jpa/JPAUserManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/business/jpa/JPAUserManagerImpl.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/business/jpa/JPAUserManagerImpl.java (original)
+++ roller/trunk/src/org/apache/roller/business/jpa/JPAUserManagerImpl.java Tue May 29 14:22:19 2007
@@ -76,13 +76,13 @@
/**
* Update existing website.
*/
- public void saveWebsite(WebsiteData website) throws RollerException {
+ public void saveWebsite(Weblog website) throws RollerException {
website.setLastModified(new java.util.Date());
strategy.store(website);
}
- public void removeWebsite(WebsiteData weblog) throws RollerException {
+ public void removeWebsite(Weblog weblog) throws RollerException {
// remove contents first, then remove website
this.removeWebsiteContents(weblog);
@@ -96,7 +96,7 @@
* convenience method for removing contents of a weblog.
* TODO BACKEND: use manager methods instead of queries here
*/
- private void removeWebsiteContents(WebsiteData website)
+ private void removeWebsiteContents(Weblog website)
throws RollerException {
BookmarkManager bmgr = RollerFactory.getRoller().getBookmarkManager();
@@ -174,7 +174,7 @@
}
// remove folders (including bookmarks)
- FolderData rootFolder = bmgr.getRootFolder(website);
+ WeblogBookmarkFolder rootFolder = bmgr.getRootFolder(website);
if (null != rootFolder) {
this.strategy.remove(rootFolder);
}
@@ -199,7 +199,7 @@
// remove permissions
// make sure that both sides of the relationship are maintained
for (Iterator iterator = website.getPermissions().iterator(); iterator.hasNext();) {
- PermissionsData perms = (PermissionsData) iterator.next();
+ WeblogPermission perms = (WeblogPermission) iterator.next();
//Remove it from website
iterator.remove();
@@ -213,7 +213,7 @@
}
// flush the changes before returning. This is required as there is a
- // circular dependency between WeblogCategoryData and WebsiteData
+ // circular dependency between WeblogCategoryData and Weblog
this.strategy.flush();
}
@@ -238,13 +238,13 @@
//remove permissions
// make sure that both sides of the relationship are maintained
for (Iterator iterator = user.getPermissions().iterator(); iterator.hasNext();) {
- PermissionsData perms = (PermissionsData) iterator.next();
+ WeblogPermission perms = (WeblogPermission) iterator.next();
//Remove it from database
this.strategy.remove(perms);
//Remove it from website
iterator.remove();
//Remove it from corresponding user
- WebsiteData website = perms.getWebsite();
+ Weblog website = perms.getWebsite();
website.getPermissions().remove(perms);
}
@@ -254,12 +254,12 @@
this.userNameToIdMap.remove(user.getUserName());
}
- public void savePermissions(PermissionsData perms)
+ public void savePermissions(WeblogPermission perms)
throws RollerException {
if (getPermissions(perms.getId()) == null) {
// This is a new object make sure that relationship is set on managed
// copy of other side
- WebsiteData website = perms.getWebsite(); //(WebsiteData) getManagedObject(perms.getWebsite());
+ Weblog website = perms.getWebsite(); //(Weblog) getManagedObject(perms.getWebsite());
website.getPermissions().add(perms);
UserData user = perms.getUser(); //(UserData) getManagedObject(perms.getUser());
@@ -268,12 +268,12 @@
this.strategy.store(perms);
}
- public void removePermissions(PermissionsData perms)
+ public void removePermissions(WeblogPermission perms)
throws RollerException {
this.strategy.remove(perms);
// make sure that relationship is set on managed
// copy of other side
- WebsiteData website = perms.getWebsite(); //WebsiteData) getManagedObject(perms.getWebsite());
+ Weblog website = perms.getWebsite(); //Weblog) getManagedObject(perms.getWebsite());
website.getPermissions().remove(perms);
UserData user = perms.getUser(); //(UserData) getManagedObject(perms.getUser());
@@ -329,22 +329,22 @@
this.strategy.store(newUser);
}
- public void addWebsite(WebsiteData newWeblog) throws RollerException {
+ public void addWebsite(Weblog newWeblog) throws RollerException {
this.strategy.store(newWeblog);
this.strategy.flush();
this.addWeblogContents(newWeblog);
}
- private void addWeblogContents(WebsiteData newWeblog)
+ private void addWeblogContents(Weblog newWeblog)
throws RollerException {
// grant weblog creator ADMIN permissions
- PermissionsData perms = new PermissionsData();
+ WeblogPermission perms = new WeblogPermission();
perms.setUser(newWeblog.getCreator());
perms.setWebsite(newWeblog);
perms.setPending(false);
- perms.setPermissionMask(PermissionsData.ADMIN);
+ perms.setPermissionMask(WeblogPermission.ADMIN);
savePermissions(perms);
// add default category
@@ -381,7 +381,7 @@
this.strategy.store(newWeblog);
// add default bookmarks
- FolderData root = new FolderData(
+ WeblogBookmarkFolder root = new WeblogBookmarkFolder(
null, "root", "root", newWeblog);
this.strategy.store(root);
@@ -392,7 +392,7 @@
for (int i=0; i<splitroll.length; i++) {
String[] rollitems = splitroll[i].split("\\|");
if (rollitems != null && rollitems.length > 1) {
- BookmarkData b = new BookmarkData(
+ WeblogBookmark b = new WeblogBookmark(
root, // parent
rollitems[0], // name
"", // description
@@ -426,16 +426,16 @@
}
/**
- * Creates and stores a pending PermissionsData for user and website specified.
+ * Creates and stores a pending WeblogPermission for user and website specified.
* TODO BACKEND: do we really need this? can't we just use storePermissions()?
*/
- public PermissionsData inviteUser(WebsiteData website,
+ public WeblogPermission inviteUser(Weblog website,
UserData user, short mask) throws RollerException {
if (website == null) throw new RollerException("Website cannot be null");
if (user == null) throw new RollerException("User cannot be null");
- PermissionsData perms = new PermissionsData();
+ WeblogPermission perms = new WeblogPermission();
perms.setWebsite(website);
perms.setUser(user);
perms.setPermissionMask(mask);
@@ -449,15 +449,15 @@
*
* TODO: replace this with a domain model method like weblog.retireUser(user)
*/
- public void retireUser(WebsiteData website, UserData user) throws RollerException {
+ public void retireUser(Weblog website, UserData user) throws RollerException {
if (website == null) throw new RollerException("Website cannot be null");
if (user == null) throw new RollerException("User cannot be null");
Iterator perms = website.getPermissions().iterator();
- PermissionsData target = null;
+ WeblogPermission target = null;
while (perms.hasNext()) {
- PermissionsData pd = (PermissionsData)perms.next();
+ WeblogPermission pd = (WeblogPermission)perms.next();
if (pd.getUser().getId().equals(user.getId())) {
target = pd;
break;
@@ -473,7 +473,7 @@
Collection roles = user.getRoles();
Iterator iter = roles.iterator();
while (iter.hasNext()) {
- RoleData role = (RoleData) iter.next();
+ UserRole role = (UserRole) iter.next();
if (role.getRole().equals(roleName)) {
this.strategy.remove(role);
iter.remove();
@@ -481,18 +481,18 @@
}
}
- public WebsiteData getWebsite(String id) throws RollerException {
- return (WebsiteData) this.strategy.load(WebsiteData.class, id);
+ public Weblog getWebsite(String id) throws RollerException {
+ return (Weblog) this.strategy.load(Weblog.class, id);
}
- public WebsiteData getWebsiteByHandle(String handle) throws RollerException {
+ public Weblog getWebsiteByHandle(String handle) throws RollerException {
return getWebsiteByHandle(handle, Boolean.TRUE);
}
/**
* Return website specified by handle.
*/
- public WebsiteData getWebsiteByHandle(String handle, Boolean enabled)
+ public Weblog getWebsiteByHandle(String handle, Boolean enabled)
throws RollerException {
if (handle==null )
@@ -502,7 +502,7 @@
// NOTE: if we ever allow changing handles then this needs updating
if(this.weblogHandleToIdMap.containsKey(handle)) {
- WebsiteData weblog = this.getWebsite(
+ Weblog weblog = this.getWebsite(
(String) this.weblogHandleToIdMap.get(handle));
if(weblog != null) {
// only return weblog if enabled status matches
@@ -516,11 +516,11 @@
}
}
- Query query = strategy.getNamedQuery("WebsiteData.getByHandle");
+ Query query = strategy.getNamedQuery("Weblog.getByHandle");
query.setParameter(1, handle);
- WebsiteData website = null;
+ Weblog website = null;
try {
- website = (WebsiteData)query.getSingleResult();
+ website = (Weblog)query.getSingleResult();
} catch (NoResultException e) {
website = null;
}
@@ -553,11 +553,11 @@
StringBuffer queryString = new StringBuffer();
StringBuffer whereClause = new StringBuffer();
- //queryString.append("SELECT w FROM WebsiteData w WHERE ");
+ //queryString.append("SELECT w FROM Weblog w WHERE ");
if (user == null) { // OpenJPA likes JOINs
- queryString.append("SELECT w FROM WebsiteData w WHERE ");
+ queryString.append("SELECT w FROM Weblog w WHERE ");
} else {
- queryString.append("SELECT w FROM WebsiteData w JOIN w.permissions p WHERE ");
+ queryString.append("SELECT w FROM Weblog w JOIN w.permissions p WHERE ");
params.add(size++, user);
whereClause.append(" p.user = ?" + size);
params.add(size++, Boolean.FALSE);
@@ -587,7 +587,7 @@
}
/*if (user != null) { // Toplink likes sub-selects
if (whereClause.length() > 0) whereClause.append(" AND ");
- whereClause.append(" EXISTS (SELECT p from PermissionsData p WHERE p.website = w ");
+ whereClause.append(" EXISTS (SELECT p from WeblogPermission p WHERE p.website = w ");
params.add(size++, user);
whereClause.append(" AND p.user = ?" + size);
params.add(size++, Boolean.FALSE);
@@ -673,7 +673,7 @@
return user;
}
- public List getUsers(WebsiteData weblog, Boolean enabled, Date startDate,
+ public List getUsers(Weblog weblog, Boolean enabled, Date startDate,
Date endDate, int offset, int length)
throws RollerException {
Query query = null;
@@ -788,7 +788,7 @@
/**
* Get users of a website
*/
- public List getUsers(WebsiteData website, Boolean enabled, int offset, int length) throws RollerException {
+ public List getUsers(Weblog website, Boolean enabled, int offset, int length) throws RollerException {
Query query = null;
List results = null;
boolean setRange = offset != 0 || length != -1;
@@ -867,7 +867,7 @@
/**
* Use JPA directly because Roller's Query API does too much allocation.
*/
- public WeblogTemplate getPageByLink(WebsiteData website, String pagelink)
+ public WeblogTemplate getPageByLink(Weblog website, String pagelink)
throws RollerException {
if (website == null)
@@ -887,9 +887,9 @@
}
/**
- * @see org.apache.roller.model.UserManager#getPageByAction(WebsiteData, java.lang.String)
+ * @see org.apache.roller.model.UserManager#getPageByAction(Weblog, java.lang.String)
*/
- public WeblogTemplate getPageByAction(WebsiteData website, String action)
+ public WeblogTemplate getPageByAction(Weblog website, String action)
throws RollerException {
if (website == null)
@@ -910,9 +910,9 @@
}
/**
- * @see org.apache.roller.model.UserManager#getPageByName(WebsiteData, java.lang.String)
+ * @see org.apache.roller.model.UserManager#getPageByName(Weblog, java.lang.String)
*/
- public WeblogTemplate getPageByName(WebsiteData website, String pagename)
+ public WeblogTemplate getPageByName(Weblog website, String pagename)
throws RollerException {
if (website == null)
@@ -932,9 +932,9 @@
}
/**
- * @see org.apache.roller.model.UserManager#getPages(WebsiteData)
+ * @see org.apache.roller.model.UserManager#getPages(Weblog)
*/
- public List getPages(WebsiteData website) throws RollerException {
+ public List getPages(Weblog website) throws RollerException {
if (website == null)
throw new RollerException("website is null");
Query q = strategy.getNamedQuery(
@@ -943,23 +943,23 @@
return q.getResultList();
}
- public PermissionsData getPermissions(String inviteId)
+ public WeblogPermission getPermissions(String inviteId)
throws RollerException {
- return (PermissionsData)this.strategy.load(
- PermissionsData.class, inviteId);
+ return (WeblogPermission)this.strategy.load(
+ WeblogPermission.class, inviteId);
}
/**
* Return permissions for specified user in website
*/
- public PermissionsData getPermissions(
- WebsiteData website, UserData user) throws RollerException {
+ public WeblogPermission getPermissions(
+ Weblog website, UserData user) throws RollerException {
Query q = strategy.getNamedQuery(
- "PermissionsData.getByWebsiteAndUser");
+ "WeblogPermission.getByWebsiteAndUser");
q.setParameter(1, website);
q.setParameter(2, user);
try {
- return (PermissionsData)q.getSingleResult();
+ return (WeblogPermission)q.getSingleResult();
} catch (NoResultException e) {
return null;
}
@@ -970,7 +970,7 @@
*/
public List getPendingPermissions(UserData user) throws RollerException {
Query q = strategy.getNamedQuery(
- "PermissionsData.getByUserAndPending");
+ "WeblogPermission.getByUserAndPending");
q.setParameter(1, user);
q.setParameter(2, Boolean.TRUE);
return q.getResultList();
@@ -979,9 +979,9 @@
/**
* Get pending permissions for website
*/
- public List getPendingPermissions(WebsiteData website) throws RollerException {
+ public List getPendingPermissions(Weblog website) throws RollerException {
Query q = strategy.getNamedQuery(
- "PermissionsData.getByWebsiteAndPending");
+ "WeblogPermission.getByWebsiteAndPending");
q.setParameter(1, website);
q.setParameter(2, Boolean.TRUE);
return q.getResultList();
@@ -990,9 +990,9 @@
/**
* Get all permissions of a website (pendings not including)
*/
- public List getAllPermissions(WebsiteData website) throws RollerException {
+ public List getAllPermissions(Weblog website) throws RollerException {
Query q = strategy.getNamedQuery(
- "PermissionsData.getByWebsiteAndPending");
+ "WeblogPermission.getByWebsiteAndPending");
q.setParameter(1, website);
q.setParameter(2, Boolean.FALSE);
return q.getResultList();
@@ -1003,7 +1003,7 @@
*/
public List getAllPermissions(UserData user) throws RollerException {
Query q = strategy.getNamedQuery(
- "PermissionsData.getByUserAndPending");
+ "WeblogPermission.getByUserAndPending");
q.setParameter(1, user);
q.setParameter(2, Boolean.FALSE);
return q.getResultList();
@@ -1044,7 +1044,7 @@
String lc = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
Map results = new TreeMap();
Query query = strategy.getNamedQuery(
- "WebsiteData.getCountByHandleLike");
+ "Weblog.getCountByHandleLike");
for (int i=0; i<26; i++) {
char currentChar = lc.charAt(i);
query.setParameter(1, currentChar + "%");
@@ -1058,7 +1058,7 @@
public List getWeblogsByLetter(char letter, int offset, int length)
throws RollerException {
Query query = strategy.getNamedQuery(
- "WebsiteData.getByLetterOrderByHandle");
+ "Weblog.getByLetterOrderByHandle");
query.setParameter(1, letter + "%");
if (offset != 0) {
query.setFirstResult(offset);
@@ -1120,7 +1120,7 @@
public long getWeblogCount() throws RollerException {
long ret = 0;
List results = strategy.getNamedQuery(
- "WebsiteData.getCountAllDistinct").getResultList();
+ "Weblog.getCountAllDistinct").getResultList();
ret = ((Long)results.get(0)).longValue();
Modified: roller/trunk/src/org/apache/roller/business/jpa/JPAWeblogManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/business/jpa/JPAWeblogManagerImpl.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/business/jpa/JPAWeblogManagerImpl.java (original)
+++ roller/trunk/src/org/apache/roller/business/jpa/JPAWeblogManagerImpl.java Tue May 29 14:22:19 2007
@@ -52,7 +52,7 @@
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WeblogEntryTagAggregateData;
import org.apache.roller.pojos.WeblogEntryTagData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
import org.apache.roller.pojos.EntryAttributeData;
import org.apache.roller.pojos.StatCountCountComparator;
import org.apache.roller.pojos.UserData;
@@ -231,7 +231,7 @@
// Loop through entries in src cat, assign them to dest cat
Iterator iter = results.iterator();
- WebsiteData website = destCat.getWebsite();
+ Weblog website = destCat.getWebsite();
while (iter.hasNext()) {
WeblogEntryData entry = (WeblogEntryData) iter.next();
entry.setCategory(destCat);
@@ -441,7 +441,7 @@
/**
* @inheritDoc
*/
- public WeblogCategoryData getRootWeblogCategory(WebsiteData website)
+ public WeblogCategoryData getRootWeblogCategory(Weblog website)
throws RollerException {
if (website == null)
throw new RollerException("website is null");
@@ -459,7 +459,7 @@
/**
* @inheritDoc
*/
- public List getWeblogCategories(WebsiteData website, boolean includeRoot)
+ public List getWeblogCategories(Weblog website, boolean includeRoot)
throws RollerException {
if (website == null)
throw new RollerException("website is null");
@@ -475,7 +475,7 @@
/**
* @inheritDoc
*/
- public List getWeblogCategories(WebsiteData website)
+ public List getWeblogCategories(Weblog website)
throws RollerException {
if (website == null)
throw new RollerException("website is null");
@@ -490,7 +490,7 @@
* @inheritDoc
*/
public List getWeblogEntries(
- WebsiteData website,
+ Weblog website,
UserData user,
Date startDate,
Date endDate,
@@ -674,7 +674,7 @@
/**
* @inheritDoc
*/
- public WeblogEntryData getWeblogEntryByAnchor(WebsiteData website,
+ public WeblogEntryData getWeblogEntryByAnchor(Weblog website,
String anchor) throws RollerException {
if (website == null)
@@ -828,7 +828,7 @@
* @inheritDoc
*/
public List getComments(
- WebsiteData website,
+ Weblog website,
WeblogEntryData entry,
String searchString,
Date startDate,
@@ -913,7 +913,7 @@
* @inheritDoc
*/
public int removeMatchingComments(
- WebsiteData website,
+ Weblog website,
WeblogEntryData entry,
String searchString,
Date startDate,
@@ -951,7 +951,7 @@
/**
* @inheritDoc
*/
- public WeblogCategoryData getWeblogCategoryByPath(WebsiteData website,
+ public WeblogCategoryData getWeblogCategoryByPath(Weblog website,
String categoryPath) throws RollerException {
return getWeblogCategoryByPath(website, null, categoryPath);
}
@@ -960,7 +960,7 @@
* @inheritDoc
*/
// TODO: ditch this method in favor of getWeblogCategoryByPath(weblog, path)
- public WeblogCategoryData getWeblogCategoryByPath(WebsiteData website,
+ public WeblogCategoryData getWeblogCategoryByPath(Weblog website,
WeblogCategoryData category, String path) throws RollerException {
if (path == null || path.trim().equals("/")) {
@@ -1004,7 +1004,7 @@
* @inheritDoc
*/
public Map getWeblogEntryObjectMap(
- WebsiteData website,
+ Weblog website,
Date startDate,
Date endDate,
String catName,
@@ -1030,7 +1030,7 @@
* @inheritDoc
*/
public Map getWeblogEntryStringMap(
- WebsiteData website,
+ Weblog website,
Date startDate,
Date endDate,
String catName,
@@ -1054,7 +1054,7 @@
}
private Map getWeblogEntryMap(
- WebsiteData website,
+ Weblog website,
Date startDate,
Date endDate,
String catName,
@@ -1109,7 +1109,7 @@
/**
* @inheritDoc
*/
- public List getMostCommentedWeblogEntries(WebsiteData website,
+ public List getMostCommentedWeblogEntries(Weblog website,
Date startDate, Date endDate, int offset,
int length) throws RollerException {
Query query = null;
@@ -1205,7 +1205,7 @@
/**
* @inheritDoc
*/
- public void applyCommentDefaultsToEntries(WebsiteData website)
+ public void applyCommentDefaultsToEntries(Weblog website)
throws RollerException {
if (log.isDebugEnabled()) {
log.debug("applyCommentDefaults");
@@ -1223,7 +1223,7 @@
/**
* @inheritDoc
*/
- public List getPopularTags(WebsiteData website, Date startDate, int limit)
+ public List getPopularTags(Weblog website, Date startDate, int limit)
throws RollerException {
Query query = null;
List queryResults = null;
@@ -1292,7 +1292,7 @@
/**
* @inheritDoc
*/
- public List getTags(WebsiteData website, String sortBy,
+ public List getTags(Weblog website, String sortBy,
String startsWith, int limit) throws RollerException {
Query query = null;
List queryResults = null;
@@ -1354,7 +1354,7 @@
/**
* @inheritDoc
*/
- public boolean getTagComboExists(List tags, WebsiteData weblog) throws RollerException{
+ public boolean getTagComboExists(List tags, Weblog weblog) throws RollerException{
if(tags == null || tags.size() == 0) {
return false;
@@ -1402,7 +1402,7 @@
/**
* @inheritDoc
*/
- public void updateTagCount(String name, WebsiteData website, int amount)
+ public void updateTagCount(String name, Weblog website, int amount)
throws RollerException {
if(amount == 0) {
throw new RollerException("Tag increment amount cannot be zero.");
@@ -1495,7 +1495,7 @@
/**
* @inheritDoc
*/
- public HitCountData getHitCountByWeblog(WebsiteData weblog)
+ public HitCountData getHitCountByWeblog(Weblog weblog)
throws RollerException {
Query q = strategy.getNamedQuery("HitCountData.getByWeblog");
q.setParameter(1, weblog);
@@ -1553,7 +1553,7 @@
/**
* @inheritDoc
*/
- public void incrementHitCount(WebsiteData weblog, int amount)
+ public void incrementHitCount(Weblog weblog, int amount)
throws RollerException {
if(amount == 0) {
@@ -1596,7 +1596,7 @@
/**
* @inheritDoc
*/
- public void resetHitCount(WebsiteData weblog) throws RollerException {
+ public void resetHitCount(Weblog weblog) throws RollerException {
Query q = strategy.getNamedQuery("HitCountData.getByWeblog");
q.setParameter(1, weblog);
HitCountData hitCount = null;
@@ -1624,7 +1624,7 @@
/**
* @inheritDoc
*/
- public long getCommentCount(WebsiteData website) throws RollerException {
+ public long getCommentCount(Weblog website) throws RollerException {
Query q = strategy.getNamedQuery(
"CommentData.getCountDistinctByWebsite&Status");
q.setParameter(1, website);
@@ -1647,7 +1647,7 @@
/**
* @inheritDoc
*/
- public long getEntryCount(WebsiteData website) throws RollerException {
+ public long getEntryCount(Weblog website) throws RollerException {
Query q = strategy.getNamedQuery(
"WeblogEntryData.getCountDistinctByStatus&Website");
q.setParameter(1, "PUBLISHED");
Modified: roller/trunk/src/org/apache/roller/business/pings/AutoPingManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/business/pings/AutoPingManager.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/business/pings/AutoPingManager.java (original)
+++ roller/trunk/src/org/apache/roller/business/pings/AutoPingManager.java Tue May 29 14:22:19 2007
@@ -24,7 +24,7 @@
import org.apache.roller.pojos.AutoPingData;
import org.apache.roller.pojos.PingTargetData;
import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
/**
@@ -59,7 +59,7 @@
* @param website the website
* @throws RollerException
*/
- public void removeAutoPing(PingTargetData pingTarget, WebsiteData website) throws RollerException;
+ public void removeAutoPing(PingTargetData pingTarget, Weblog website) throws RollerException;
/**
@@ -95,7 +95,7 @@
* @param website
* @return a list of auto ping configurations for the given website as <code>AutoPingData</code> objects.
*/
- public List getAutoPingsByWebsite(WebsiteData website) throws RollerException;
+ public List getAutoPingsByWebsite(Weblog website) throws RollerException;
/**
Modified: roller/trunk/src/org/apache/roller/business/pings/PingQueueProcessor.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/business/pings/PingQueueProcessor.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/business/pings/PingQueueProcessor.java (original)
+++ roller/trunk/src/org/apache/roller/business/pings/PingQueueProcessor.java Tue May 29 14:22:19 2007
@@ -28,7 +28,7 @@
import org.apache.roller.config.RollerRuntimeConfig;
import org.apache.roller.pojos.PingQueueEntryData;
import org.apache.roller.pojos.PingTargetData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
/**
@@ -120,7 +120,7 @@
if (logger.isDebugEnabled()) logger.debug("Processing ping queue entry: " + pingQueueEntry);
PingTargetData pingTarget = pingQueueEntry.getPingTarget();
- WebsiteData website = pingQueueEntry.getWebsite();
+ Weblog website = pingQueueEntry.getWebsite();
boolean pingSucceeded = false;
if (PingConfig.getLogPingsOnly()) {
// Just log the ping and pretend it succeeded.
Modified: roller/trunk/src/org/apache/roller/business/pings/PingTargetManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/business/pings/PingTargetManager.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/business/pings/PingTargetManager.java (original)
+++ roller/trunk/src/org/apache/roller/business/pings/PingTargetManager.java Tue May 29 14:22:19 2007
@@ -21,7 +21,7 @@
import java.util.List;
import org.apache.roller.RollerException;
import org.apache.roller.pojos.PingTargetData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
/**
@@ -83,7 +83,7 @@
* objects
* @throws RollerException
*/
- public List getCustomPingTargets(WebsiteData website) throws RollerException;
+ public List getCustomPingTargets(Weblog website) throws RollerException;
/**
Modified: roller/trunk/src/org/apache/roller/business/pings/WeblogUpdatePinger.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/business/pings/WeblogUpdatePinger.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/business/pings/WeblogUpdatePinger.java (original)
+++ roller/trunk/src/org/apache/roller/business/pings/WeblogUpdatePinger.java Tue May 29 14:22:19 2007
@@ -21,7 +21,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.config.PingConfig;
import org.apache.roller.pojos.PingTargetData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
import org.apache.xmlrpc.XmlRpcException;
import org.apache.xmlrpc.client.XmlRpcClient;
import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
@@ -97,7 +97,7 @@
* @throws IOException
* @throws XmlRpcException
*/
- public static PingResult sendPing(PingTargetData pingTarget, WebsiteData website) throws IOException, XmlRpcException {
+ public static PingResult sendPing(PingTargetData pingTarget, Weblog website) throws IOException, XmlRpcException {
String websiteUrl = website.getAbsoluteURL();
String pingTargetUrl = pingTarget.getPingUrl();
Set variantOptions = PingConfig.getVariantOptions(pingTargetUrl);
Modified: roller/trunk/src/org/apache/roller/business/referrers/RefererManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/business/referrers/RefererManager.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/business/referrers/RefererManager.java (original)
+++ roller/trunk/src/org/apache/roller/business/referrers/RefererManager.java Tue May 29 14:22:19 2007
@@ -21,7 +21,7 @@
import java.util.List;
import org.apache.roller.RollerException;
import org.apache.roller.pojos.RefererData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
/**
* Interface to Referer management.
@@ -46,7 +46,7 @@
/**
* Clear referrer dayhits and remove referrers without excerpts.
*/
- public void clearReferrers(WebsiteData website) throws RollerException;
+ public void clearReferrers(Weblog website) throws RollerException;
/**
* Retrieve referer by id.
@@ -58,14 +58,14 @@
* @param weblog
* @return List of type RefererData
*/
- public List getReferers(WebsiteData weblog) throws RollerException;
+ public List getReferers(Weblog weblog) throws RollerException;
/**
* Get all referers for specified user that were made today.
* @param userName Name of user.
* @return List of type RefererData
*/
- public List getTodaysReferers(WebsiteData website) throws RollerException;
+ public List getTodaysReferers(Weblog website) throws RollerException;
/**
* Get referers for a specified date.
@@ -74,7 +74,7 @@
* @return List of type RefererData.
* @throws RollerException
*/
- public List getReferersToDate(WebsiteData website, String date)
+ public List getReferersToDate(Weblog website, String date)
throws RollerException;
/**
@@ -98,12 +98,12 @@
/**
* Get user's day hits
*/
- public int getDayHits(WebsiteData website) throws RollerException;
+ public int getDayHits(Weblog website) throws RollerException;
/**
* Get user's all-time total hits
*/
- public int getTotalHits(WebsiteData website) throws RollerException;
+ public int getTotalHits(Weblog website) throws RollerException;
/**
* Apply ignoreWord/spam filters to all referers in system.
@@ -113,7 +113,7 @@
/**
* Apply ignoreWord/spam filters to all referers in website.
*/
- public void applyRefererFilters(WebsiteData website) throws RollerException;
+ public void applyRefererFilters(Weblog website) throws RollerException;
/**
* Process an incoming referer.
Modified: roller/trunk/src/org/apache/roller/business/runnable/HitCountProcessingJob.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/business/runnable/HitCountProcessingJob.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/business/runnable/HitCountProcessingJob.java (original)
+++ roller/trunk/src/org/apache/roller/business/runnable/HitCountProcessingJob.java Tue May 29 14:22:19 2007
@@ -29,7 +29,7 @@
import org.apache.roller.business.RollerFactory;
import org.apache.roller.business.UserManager;
import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
/**
@@ -82,7 +82,7 @@
try {
long startTime = System.currentTimeMillis();
- WebsiteData weblog = null;
+ Weblog weblog = null;
String key = null;
Iterator it = hitsTally.keySet().iterator();
while(it.hasNext()) {
Modified: roller/trunk/src/org/apache/roller/business/search/IndexManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/business/search/IndexManager.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/business/search/IndexManager.java (original)
+++ roller/trunk/src/org/apache/roller/business/search/IndexManager.java Tue May 29 14:22:19 2007
@@ -21,7 +21,7 @@
import org.apache.roller.business.search.operations.IndexOperation;
import org.apache.roller.pojos.UserData;
import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
/**
* Interface to Roller's Lucene-based search facility.
@@ -33,7 +33,7 @@
public abstract boolean isInconsistentAtStartup();
/** Remove user from index, returns immediately and operates in background */
- public void removeWebsiteIndex(WebsiteData website) throws RollerException;
+ public void removeWebsiteIndex(Weblog website) throws RollerException;
/** Remove entry from index, returns immediately and operates in background */
public void removeEntryIndexOperation(WeblogEntryData entry) throws RollerException;
@@ -55,7 +55,7 @@
/** Shutdown to be called on application shutdown */
public abstract void shutdown();
- public abstract void rebuildWebsiteIndex(WebsiteData website) throws RollerException;
+ public abstract void rebuildWebsiteIndex(Weblog website) throws RollerException;
public abstract void rebuildWebsiteIndex() throws RollerException;
}
Modified: roller/trunk/src/org/apache/roller/business/search/IndexManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/business/search/IndexManagerImpl.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/business/search/IndexManagerImpl.java (original)
+++ roller/trunk/src/org/apache/roller/business/search/IndexManagerImpl.java Tue May 29 14:22:19 2007
@@ -40,7 +40,7 @@
import org.apache.roller.business.search.operations.RemoveWebsiteIndexOperation;
import org.apache.roller.business.search.operations.WriteToIndexOperation;
import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
import EDU.oswego.cs.dl.util.concurrent.ReadWriteLock;
import EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock;
@@ -174,12 +174,12 @@
new RebuildWebsiteIndexOperation(this, null));
}
- public void rebuildWebsiteIndex(WebsiteData website) throws RollerException {
+ public void rebuildWebsiteIndex(Weblog website) throws RollerException {
scheduleIndexOperation(
new RebuildWebsiteIndexOperation(this, website));
}
- public void removeWebsiteIndex(WebsiteData website) throws RollerException {
+ public void removeWebsiteIndex(Weblog website) throws RollerException {
scheduleIndexOperation(
new RemoveWebsiteIndexOperation(this, website));
}
Modified: roller/trunk/src/org/apache/roller/business/search/operations/RebuildWebsiteIndexOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/business/search/operations/RebuildWebsiteIndexOperation.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/business/search/operations/RebuildWebsiteIndexOperation.java (original)
+++ roller/trunk/src/org/apache/roller/business/search/operations/RebuildWebsiteIndexOperation.java Tue May 29 14:22:19 2007
@@ -38,7 +38,7 @@
import org.apache.roller.business.UserManager;
import org.apache.roller.business.WeblogManager;
import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
/**
* An index operation that rebuilds a given users index (or all indexes).
@@ -53,7 +53,7 @@
//~ Instance fields ========================================================
- private WebsiteData website;
+ private Weblog website;
//~ Constructors ===========================================================
@@ -62,7 +62,7 @@
*
* @param website The website to rebuild the index for, or null for all users.
*/
- public RebuildWebsiteIndexOperation(IndexManagerImpl mgr, WebsiteData website) {
+ public RebuildWebsiteIndexOperation(IndexManagerImpl mgr, Weblog website) {
super(mgr);
this.website = website;
}
Modified: roller/trunk/src/org/apache/roller/business/search/operations/RemoveWebsiteIndexOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/business/search/operations/RemoveWebsiteIndexOperation.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/business/search/operations/RemoveWebsiteIndexOperation.java (original)
+++ roller/trunk/src/org/apache/roller/business/search/operations/RemoveWebsiteIndexOperation.java Tue May 29 14:22:19 2007
@@ -31,7 +31,7 @@
import org.apache.roller.business.search.IndexManagerImpl;
import org.apache.roller.business.search.FieldConstants;
import org.apache.roller.business.search.IndexUtil;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
/**
@@ -47,7 +47,7 @@
//~ Instance fields ========================================================
- private WebsiteData website;
+ private Weblog website;
//~ Constructors ===========================================================
@@ -55,7 +55,7 @@
* Create a new operation that will recreate an index.
* @param website The website to rebuild the index for, or null for all sites.
*/
- public RemoveWebsiteIndexOperation(IndexManagerImpl mgr, WebsiteData website) {
+ public RemoveWebsiteIndexOperation(IndexManagerImpl mgr, Weblog website) {
super(mgr);
this.website = website;
}
Modified: roller/trunk/src/org/apache/roller/business/themes/ThemeManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/business/themes/ThemeManager.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/business/themes/ThemeManager.java (original)
+++ roller/trunk/src/org/apache/roller/business/themes/ThemeManager.java Tue May 29 14:22:19 2007
@@ -22,7 +22,7 @@
import org.apache.roller.RollerException;
import org.apache.roller.pojos.Theme;
import org.apache.roller.pojos.WeblogTheme;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
/**
@@ -48,7 +48,7 @@
* @return WeblogTheme The theme to be used for the given weblog.
* @throws RollerException If there is some kind of fatal backend error.
*/
- public WeblogTheme getTheme(WebsiteData weblog)
+ public WeblogTheme getTheme(Weblog weblog)
throws RollerException;
@@ -69,7 +69,7 @@
*
* @throws RollerException If there is some kind of error in saving.
*/
- public void importTheme(WebsiteData website, SharedTheme theme)
+ public void importTheme(Weblog website, SharedTheme theme)
throws RollerException;
}
Modified: roller/trunk/src/org/apache/roller/business/themes/ThemeManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/business/themes/ThemeManagerImpl.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/business/themes/ThemeManagerImpl.java (original)
+++ roller/trunk/src/org/apache/roller/business/themes/ThemeManagerImpl.java Tue May 29 14:22:19 2007
@@ -42,7 +42,7 @@
import org.apache.roller.pojos.ThemeTemplate;
import org.apache.roller.pojos.WeblogTemplate;
import org.apache.roller.pojos.WeblogTheme;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
/**
@@ -114,7 +114,7 @@
/**
* @see org.apache.roller.model.ThemeManager#getTheme(weblog)
*/
- public WeblogTheme getTheme(WebsiteData weblog) throws RollerException {
+ public WeblogTheme getTheme(Weblog weblog) throws RollerException {
if(weblog == null)
return null;
@@ -162,7 +162,7 @@
/**
* @see org.apache.roller.model.ThemeManager#importTheme(website, theme)
*/
- public void importTheme(WebsiteData website, SharedTheme theme)
+ public void importTheme(Weblog website, SharedTheme theme)
throws RollerException {
log.debug("Importing theme ["+theme.getName()+"] to weblog ["+website.getName()+"]");
Modified: roller/trunk/src/org/apache/roller/business/themes/WeblogCustomTheme.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/business/themes/WeblogCustomTheme.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/business/themes/WeblogCustomTheme.java (original)
+++ roller/trunk/src/org/apache/roller/business/themes/WeblogCustomTheme.java Tue May 29 14:22:19 2007
@@ -29,7 +29,7 @@
import org.apache.roller.pojos.ThemeResource;
import org.apache.roller.pojos.ThemeTemplate;
import org.apache.roller.pojos.WeblogTheme;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
/**
@@ -38,7 +38,7 @@
public class WeblogCustomTheme extends WeblogTheme {
- public WeblogCustomTheme(WebsiteData weblog) {
+ public WeblogCustomTheme(Weblog weblog) {
super(weblog);
}
Modified: roller/trunk/src/org/apache/roller/business/themes/WeblogSharedTheme.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/business/themes/WeblogSharedTheme.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/business/themes/WeblogSharedTheme.java (original)
+++ roller/trunk/src/org/apache/roller/business/themes/WeblogSharedTheme.java Tue May 29 14:22:19 2007
@@ -35,7 +35,7 @@
import org.apache.roller.pojos.ThemeResource;
import org.apache.roller.pojos.ThemeTemplate;
import org.apache.roller.pojos.WeblogTheme;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
/**
@@ -48,7 +48,7 @@
private SharedTheme theme = null;
- public WeblogSharedTheme(WebsiteData weblog, SharedTheme theme) {
+ public WeblogSharedTheme(Weblog weblog, SharedTheme theme) {
super(weblog);
this.theme = theme;
}
Modified: roller/trunk/src/org/apache/roller/business/utils/UpgradeDatabase.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/business/utils/UpgradeDatabase.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/business/utils/UpgradeDatabase.java (original)
+++ roller/trunk/src/org/apache/roller/business/utils/UpgradeDatabase.java Tue May 29 14:22:19 2007
@@ -27,7 +27,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
-import org.apache.roller.pojos.PermissionsData;
+import org.apache.roller.pojos.WeblogPermission;
/**
@@ -244,7 +244,7 @@
permsInsert.setString( 1, websiteid+"p");
permsInsert.setString( 2, websiteid);
permsInsert.setString( 3, userid);
- permsInsert.setShort( 4, PermissionsData.ADMIN);
+ permsInsert.setShort( 4,WeblogPermission.ADMIN);
permsInsert.setBoolean(5, false);
permsInsert.executeUpdate();
}
Modified: roller/trunk/src/org/apache/roller/planet/business/RollerRomeFeedFetcher.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/planet/business/RollerRomeFeedFetcher.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/planet/business/RollerRomeFeedFetcher.java (original)
+++ roller/trunk/src/org/apache/roller/planet/business/RollerRomeFeedFetcher.java Tue May 29 14:22:19 2007
@@ -39,7 +39,7 @@
import org.apache.roller.planet.pojos.PlanetEntryData;
import org.apache.roller.planet.pojos.PlanetSubscriptionData;
import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
/**
* Extends Roller Planet's feed fetcher to fetch local feeds directly from Roller.
@@ -78,7 +78,7 @@
// get corresponding website object
UserManager usermgr = RollerFactory.getRoller().getUserManager();
- WebsiteData website = usermgr.getWebsiteByHandle(sub.getAuthor());
+ Weblog website = usermgr.getWebsiteByHandle(sub.getAuthor());
if (website == null)
return newEntries;
Modified: roller/trunk/src/org/apache/roller/planet/tasks/SyncWebsitesTask.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/planet/tasks/SyncWebsitesTask.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/planet/tasks/SyncWebsitesTask.java (original)
+++ roller/trunk/src/org/apache/roller/planet/tasks/SyncWebsitesTask.java Tue May 29 14:22:19 2007
@@ -35,7 +35,7 @@
import org.apache.roller.planet.pojos.PlanetData;
import org.apache.roller.planet.pojos.PlanetGroupData;
import org.apache.roller.planet.pojos.PlanetSubscriptionData;
-import org.apache.roller.pojos.WebsiteData;
+import org.apache.roller.pojos.Weblog;
import org.apache.roller.util.URLUtilities;
@@ -155,7 +155,7 @@
Iterator websites =
userManager.getWebsites(null, Boolean.TRUE, Boolean.TRUE, null, null, 0, -1).iterator();
while(websites.hasNext()) {
- WebsiteData weblog = (WebsiteData) websites.next();
+ Weblog weblog = (Weblog) websites.next();
String siteUrl = URLUtilities.getWeblogURL(weblog, null, true);
String feedUrl = URLUtilities.getWeblogFeedURL(weblog, null, "entries", "rss", null, null, null, false, true);
Modified: roller/trunk/src/org/apache/roller/pojos/AutoPingData.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/pojos/AutoPingData.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/pojos/AutoPingData.java (original)
+++ roller/trunk/src/org/apache/roller/pojos/AutoPingData.java Tue May 29 14:22:19 2007
@@ -38,7 +38,7 @@
public class AutoPingData implements Serializable {
private String id = UUIDGenerator.generateUUID();
private PingTargetData pingTarget = null;
- private WebsiteData website = null;
+ private Weblog website = null;
public static final long serialVersionUID = -9105985454111986435L;
@@ -55,7 +55,7 @@
* @param pingtarget ping target that should be pinged
* @param website website to which this configuration applies
*/
- public AutoPingData(String id, PingTargetData pingtarget, WebsiteData website) {
+ public AutoPingData(String id, PingTargetData pingtarget, Weblog website) {
//this.id = id;
this.website = website;
this.pingTarget = pingtarget;
@@ -101,7 +101,7 @@
* @ejb:persistent-field
* @hibernate.many-to-one column="websiteid" cascade="none" not-null="false"
*/
- public WebsiteData getWebsite() {
+ public Weblog getWebsite() {
return website;
}
@@ -112,7 +112,7 @@
* @param website the website.
* @ejb:persistent-field
*/
- public void setWebsite(WebsiteData website) {
+ public void setWebsite(Weblog website) {
this.website = website;
}
Modified: roller/trunk/src/org/apache/roller/pojos/AutoPingData.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/pojos/AutoPingData.orm.xml?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/pojos/AutoPingData.orm.xml (original)
+++ roller/trunk/src/org/apache/roller/pojos/AutoPingData.orm.xml Tue May 29 14:22:19 2007
@@ -34,7 +34,7 @@
<id name="id">
<column name="id"/>
</id>
- <many-to-one name="website" target-entity="org.apache.roller.pojos.WebsiteData">
+ <many-to-one name="website" target-entity="org.apache.roller.pojos.Weblog">
<join-column name="websiteid" insertable="true" updatable="true" nullable="true"/>
</many-to-one>
<many-to-one name="pingTarget" target-entity="org.apache.roller.pojos.PingTargetData">
Modified: roller/trunk/src/org/apache/roller/pojos/BookmarkComparator.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/pojos/BookmarkComparator.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/pojos/BookmarkComparator.java (original)
+++ roller/trunk/src/org/apache/roller/pojos/BookmarkComparator.java Tue May 29 14:22:19 2007
@@ -27,8 +27,8 @@
public int compare(Object val1, Object val2)
throws ClassCastException
{
- BookmarkData bd1 = (BookmarkData)val1;
- BookmarkData bd2 = (BookmarkData)val2;
+ WeblogBookmark bd1 = (WeblogBookmark)val1;
+ WeblogBookmark bd2 = (WeblogBookmark)val2;
int priority1 = bd1.getPriority().intValue();
int priority2 = bd2.getPriority().intValue();
Modified: roller/trunk/src/org/apache/roller/pojos/HitCountData.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/pojos/HitCountData.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/pojos/HitCountData.java (original)
+++ roller/trunk/src/org/apache/roller/pojos/HitCountData.java Tue May 29 14:22:19 2007
@@ -32,7 +32,7 @@
public class HitCountData implements Serializable {
private String id = UUIDGenerator.generateUUID();
- private WebsiteData weblog = null;
+ private Weblog weblog = null;
private int dailyHits = 0;
@@ -94,11 +94,11 @@
* @ejb:persistent-field
* @hibernate.many-to-one column="websiteid" cascade="none" non-null="true"
*/
- public WebsiteData getWeblog() {
+ public Weblog getWeblog() {
return weblog;
}
- public void setWeblog(WebsiteData weblog) {
+ public void setWeblog(Weblog weblog) {
this.weblog = weblog;
}
Modified: roller/trunk/src/org/apache/roller/pojos/HitCountData.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/pojos/HitCountData.orm.xml?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/pojos/HitCountData.orm.xml (original)
+++ roller/trunk/src/org/apache/roller/pojos/HitCountData.orm.xml Tue May 29 14:22:19 2007
@@ -27,7 +27,7 @@
<basic name="dailyHits">
<column name="dailyhits" insertable="true" updatable="true" unique="false"/>
</basic>
- <many-to-one name="weblog" target-entity="org.apache.roller.pojos.WebsiteData">
+ <many-to-one name="weblog" target-entity="org.apache.roller.pojos.Weblog">
<join-column name="websiteid" insertable="true" updatable="true" nullable="false"/>
</many-to-one>
</attributes>
Modified: roller/trunk/src/org/apache/roller/pojos/PingQueueEntryData.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/pojos/PingQueueEntryData.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/pojos/PingQueueEntryData.java (original)
+++ roller/trunk/src/org/apache/roller/pojos/PingQueueEntryData.java Tue May 29 14:22:19 2007
@@ -38,7 +38,7 @@
private String id = UUIDGenerator.generateUUID();
private Timestamp entryTime = null;
private PingTargetData pingTarget = null;
- private WebsiteData website = null;
+ private Weblog website = null;
private int attempts = 0;
public static final long serialVersionUID = -1468021030819538243L;
@@ -58,7 +58,7 @@
* @param website website originating the ping
* @param attempts number of prior ping attempts
*/
- public PingQueueEntryData(String id, Timestamp entryTime, PingTargetData pingTarget, WebsiteData website, int attempts) {
+ public PingQueueEntryData(String id, Timestamp entryTime, PingTargetData pingTarget, Weblog website, int attempts) {
//this.id = id;
this.entryTime = entryTime;
this.pingTarget = pingTarget;
@@ -149,7 +149,7 @@
* @ejb:persistent-field
* @hibernate.many-to-one column="websiteid" cascade="none" not-null="true"
*/
- public WebsiteData getWebsite() {
+ public Weblog getWebsite() {
return website;
}
@@ -159,7 +159,7 @@
* @param website the website originating the ping.
* @ejb:persistent-field
*/
- public void setWebsite(WebsiteData website) {
+ public void setWebsite(Weblog website) {
this.website = website;
}
Modified: roller/trunk/src/org/apache/roller/pojos/PingQueueEntryData.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/pojos/PingQueueEntryData.orm.xml?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/pojos/PingQueueEntryData.orm.xml (original)
+++ roller/trunk/src/org/apache/roller/pojos/PingQueueEntryData.orm.xml Tue May 29 14:22:19 2007
@@ -39,7 +39,7 @@
<join-column name="pingtargetid" insertable="true" updatable="true"
nullable="false"/>
</many-to-one>
- <many-to-one name="website" target-entity="org.apache.roller.pojos.WebsiteData">
+ <many-to-one name="website" target-entity="org.apache.roller.pojos.Weblog">
<join-column name="websiteid" insertable="true" updatable="true" nullable="false"/>
</many-to-one>
</attributes>
Modified: roller/trunk/src/org/apache/roller/pojos/PingTargetData.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/pojos/PingTargetData.java?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/pojos/PingTargetData.java (original)
+++ roller/trunk/src/org/apache/roller/pojos/PingTargetData.java Tue May 29 14:22:19 2007
@@ -46,7 +46,7 @@
private String id = UUIDGenerator.generateUUID();
private String name = null;
private String pingUrl = null;
- private WebsiteData website = null;
+ private Weblog website = null;
private int conditionCode = -1;
private Timestamp lastSuccess = null;
private boolean autoEnabled = false;
@@ -67,7 +67,7 @@
* @param pingUrl the URL to which to send the ping
* @param website the website (on this server) for which this is a custom ping target (may be null)
*/
- public PingTargetData(String id, String name, String pingUrl, WebsiteData website, boolean autoEnable) {
+ public PingTargetData(String id, String name, String pingUrl, Weblog website, boolean autoEnable) {
//this.id = id;
this.name = name;
this.pingUrl = pingUrl;
@@ -175,7 +175,7 @@
* @ejb:persistent-field
* @hibernate.many-to-one column="websiteid" cascade="none" not-null="false"
*/
- public WebsiteData getWebsite() {
+ public Weblog getWebsite() {
return website;
}
@@ -187,7 +187,7 @@
* custom target
* @ejb:persistent-field
*/
- public void setWebsite(WebsiteData website) {
+ public void setWebsite(Weblog website) {
this.website = website;
}
Modified: roller/trunk/src/org/apache/roller/pojos/PingTargetData.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/pojos/PingTargetData.orm.xml?view=diff&rev=542656&r1=542655&r2=542656
==============================================================================
--- roller/trunk/src/org/apache/roller/pojos/PingTargetData.orm.xml (original)
+++ roller/trunk/src/org/apache/roller/pojos/PingTargetData.orm.xml Tue May 29 14:22:19 2007
@@ -43,7 +43,7 @@
<basic name="autoEnabled">
<column name="autoenabled" insertable="true" updatable="true" unique="false"/>
</basic>
- <many-to-one name="website" target-entity="org.apache.roller.pojos.WebsiteData">
+ <many-to-one name="website" target-entity="org.apache.roller.pojos.Weblog">
<join-column name="websiteid" insertable="true" updatable="true" nullable="true"/>
</many-to-one>
</attributes>