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 2007/06/03 22:18:33 UTC
svn commit: r543978 [6/8] - in /roller/branches/roller_guice/apps/weblogger:
src/java/org/apache/roller/weblogger/
src/java/org/apache/roller/weblogger/business/
src/java/org/apache/roller/weblogger/business/hibernate/
src/java/org/apache/roller/weblog...
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java Sun Jun 3 13:18:24 2007
@@ -33,7 +33,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.referrers.RefererManager;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.commons.logging.Log;
@@ -193,7 +193,7 @@
// let the ThemeManager handle it
ThemeManager themeMgr = RollerFactory.getRoller().getThemeManager();
return themeMgr.getTheme(this);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error getting theme for weblog - "+getHandle(), ex);
}
@@ -205,7 +205,7 @@
/**
* Lookup the default page for this website.
*/
- public ThemeTemplate getDefaultPage() throws RollerException {
+ public ThemeTemplate getDefaultPage() throws WebloggerException {
// look for the page in our Theme
Theme weblogTheme = getTheme();
@@ -222,7 +222,7 @@
*
* @roller.wrapPojoMethod type="pojo"
*/
- public ThemeTemplate getPageByAction(String action) throws RollerException {
+ public ThemeTemplate getPageByAction(String action) throws WebloggerException {
if(action == null)
return null;
@@ -241,7 +241,7 @@
* Lookup a Template for this website by name.
* @roller.wrapPojoMethod type="pojo"
*/
- public ThemeTemplate getPageByName(String name) throws RollerException {
+ public ThemeTemplate getPageByName(String name) throws WebloggerException {
if(name == null)
return null;
@@ -260,7 +260,7 @@
* Lookup a template for this website by link.
* @roller.wrapPojoMethod type="pojo"
*/
- public ThemeTemplate getPageByLink(String link) throws RollerException {
+ public ThemeTemplate getPageByLink(String link) throws WebloggerException {
if(link == null)
return null;
@@ -279,7 +279,7 @@
* Get a list of all pages that are part of this website.
* @roller.wrapPojoMethod type="pojo-collection" class="org.apache.roller.weblogger.pojos.Template"
*/
- public List getPages() throws RollerException {
+ public List getPages() throws WebloggerException {
// look for the pages in our Theme
Theme weblogTheme = getTheme();
@@ -1020,7 +1020,7 @@
Roller roller = RollerFactory.getRoller();
WeblogManager wmgr = roller.getWeblogManager();
entry = wmgr.getWeblogEntryByAnchor(this, anchor);
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
this.log.error("ERROR: getting entry by anchor");
}
return entry;
@@ -1036,7 +1036,7 @@
// try {
WeblogCategory category = this.getDefaultCategory();
ret = category.getWeblogCategories();
-// } catch (RollerException e) {
+// } catch (WebloggerException e) {
// log.error("ERROR: fetching categories", e);
// }
return ret;
@@ -1060,7 +1060,7 @@
category = this.getDefaultCategory();
}
ret = category.getWeblogCategories();
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("ERROR: fetching categories for path: " + categoryPath, e);
}
return ret;
@@ -1082,7 +1082,7 @@
} else {
category = this.getDefaultCategory();
}
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("ERROR: fetching category at path: " + categoryPath, e);
}
return category;
@@ -1118,7 +1118,7 @@
null,
0,
length);
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("ERROR: getting recent entries", e);
}
return recentEntries;
@@ -1157,7 +1157,7 @@
null,
0,
length);
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("ERROR: getting recent entries", e);
}
return recentEntries;
@@ -1186,7 +1186,7 @@
true, // we want reverse chrono order
0, // offset
length); // length
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("ERROR: getting recent comments", e);
}
return recentComments;
@@ -1210,7 +1210,7 @@
} else {
return bmgr.getFolder(this, folderName);
}
- } catch (RollerException re) {
+ } catch (WebloggerException re) {
log.error("ERROR: fetching folder for weblog", re);
}
return ret;
@@ -1228,7 +1228,7 @@
RefererManager rmgr = roller.getRefererManager();
return rmgr.getTodaysReferers(this);
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("PageModel getTodaysReferers()", e);
}
return (referers == null ? Collections.EMPTY_LIST : referers);
@@ -1249,7 +1249,7 @@
return (hitCount != null) ? hitCount.getDailyHits() : 0;
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("Error getting weblog hit count", e);
}
return 0;
@@ -1296,7 +1296,7 @@
Roller roller = RollerFactory.getRoller();
WeblogManager mgr = roller.getWeblogManager();
count = mgr.getCommentCount(this);
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("Error getting comment count for weblog " + this.getName(), e);
}
return count;
@@ -1314,7 +1314,7 @@
Roller roller = RollerFactory.getRoller();
WeblogManager mgr = roller.getWeblogManager();
count = mgr.getEntryCount(this);
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("Error getting entry count for weblog " + this.getName(), e);
}
return count;
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java Sun Jun 3 13:18:24 2007
@@ -28,7 +28,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.BookmarkManager;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.util.UUIDGenerator;
@@ -313,7 +313,7 @@
/**
* Add a bookmark to this folder.
*/
- public void addBookmark(WeblogBookmark bookmark) throws RollerException {
+ public void addBookmark(WeblogBookmark bookmark) throws WebloggerException {
bookmark.setFolder(this);
getBookmarks().add(bookmark);
}
@@ -324,7 +324,7 @@
*
* @param subfolders
*/
- public List retrieveBookmarks(boolean subfolders) throws RollerException {
+ public List retrieveBookmarks(boolean subfolders) throws WebloggerException {
BookmarkManager bmgr = RollerFactory.getRoller().getBookmarkManager();
return bmgr.getBookmarks(this, subfolders);
}
@@ -367,7 +367,7 @@
// convenience method for updating the folder name, which triggers a path tree rebuild
- public void updateName(String newName) throws RollerException {
+ public void updateName(String newName) throws WebloggerException {
// update name
setName(newName);
@@ -388,7 +388,7 @@
// update the path tree for a given folder
public static void updatePathTree(WeblogBookmarkFolder folder)
- throws RollerException {
+ throws WebloggerException {
log.debug("Updating path tree for folder "+folder.getPath());
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogCategory.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogCategory.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogCategory.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogCategory.java Sun Jun 3 13:18:24 2007
@@ -28,7 +28,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.util.UUIDGenerator;
@@ -283,9 +283,9 @@
*
* @param subcats True if entries from sub-categories are to be returned.
* @return List of WeblogEntryData objects.
- * @throws RollerException
+ * @throws WebloggerException
*/
- public List retrieveWeblogEntries(boolean subcats) throws RollerException {
+ public List retrieveWeblogEntries(boolean subcats) throws WebloggerException {
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
return wmgr.getWeblogEntries(this, subcats);
}
@@ -359,7 +359,7 @@
public boolean isInUse() {
try {
return RollerFactory.getRoller().getWeblogManager().isWeblogCategoryInUse(this);
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
throw new RuntimeException(e);
}
}
@@ -368,7 +368,7 @@
// convenience method for updating the category name, which triggers a path tree rebuild
- public void updateName(String newName) throws RollerException {
+ public void updateName(String newName) throws WebloggerException {
// update name
setName(newName);
@@ -389,7 +389,7 @@
// updates the paths of all descendents of the given category
public static void updatePathTree(WeblogCategory cat)
- throws RollerException {
+ throws WebloggerException {
log.debug("Updating path tree for category "+cat.getPath());
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java Sun Jun 3 13:18:24 2007
@@ -44,7 +44,7 @@
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogEntryPlugin;
@@ -429,7 +429,7 @@
att.setValue(value);
}
}
- public void onRemoveEntryAttribute(WeblogEntryAttribute att) throws RollerException {
+ public void onRemoveEntryAttribute(WeblogEntryAttribute att) throws WebloggerException {
attMap.remove(att.getName());
}
//-------------------------------------------------------------------------
@@ -637,7 +637,7 @@
return tagSet;
}
- private void setTags(Set tagSet) throws RollerException
+ private void setTags(Set tagSet) throws WebloggerException
{
this.tagSet = tagSet;
this.removedTags = new HashSet();
@@ -648,9 +648,9 @@
* Roller lowercases all tags based on locale because there's not a 1:1 mapping
* between uppercase/lowercase characters across all languages.
* @param name
- * @throws RollerException
+ * @throws WebloggerException
*/
- public void addTag(String name) throws RollerException {
+ public void addTag(String name) throws WebloggerException {
Locale locale = getWebsite() != null ? getWebsite().getLocaleInstance() : Locale.getDefault();
name = Utilities.normalizeTag(name, locale);
if(name.length() == 0)
@@ -673,7 +673,7 @@
addedTags.add(name);
}
- public void onRemoveTag(String name) throws RollerException {
+ public void onRemoveTag(String name) throws WebloggerException {
removedTags.add(name);
}
@@ -685,7 +685,7 @@
return removedTags;
}
- public void updateTags(List tags) throws RollerException {
+ public void updateTags(List tags) throws WebloggerException {
if(tags == null)
return;
@@ -735,7 +735,7 @@
return sb.toString();
}
- public void setTagsAsString(String tags) throws RollerException {
+ public void setTagsAsString(String tags) throws WebloggerException {
if (tags == null) {
tagSet.clear();
return;
@@ -864,7 +864,7 @@
false, // we want chrono order
0, // offset
-1); // no limit
- } catch (RollerException alreadyLogged) {}
+ } catch (WebloggerException alreadyLogged) {}
return list;
}
@@ -890,7 +890,7 @@
List referers = null;
try {
referers = RollerFactory.getRoller().getRefererManager().getReferersToEntry(getId());
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
mLogger.error("Unexpected exception", e);
}
return referers;
@@ -975,7 +975,7 @@
}
/** Create anchor for weblog entry, based on title or text */
- protected String createAnchor() throws RollerException {
+ protected String createAnchor() throws WebloggerException {
return RollerFactory.getRoller().getWeblogManager().createAnchor(this);
}
@@ -1110,7 +1110,7 @@
/**
* Determine if the specified user has permissions to edit this entry.
*/
- public boolean hasWritePermissions(User user) throws RollerException {
+ public boolean hasWritePermissions(User user) throws WebloggerException {
// global admins can hack whatever they want
if(user.hasRole("admin")) {
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java Sun Jun 3 13:18:24 2007
@@ -26,7 +26,7 @@
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.util.UUIDGenerator;
@@ -86,7 +86,7 @@
if(decoratorName != null && !id.equals(decoratorName)) {
try {
return weblog.getPageByName(decoratorName);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error getting decorator["+decoratorName+"] "+
"for template "+id);
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/FolderDataWrapper.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/FolderDataWrapper.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/FolderDataWrapper.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/FolderDataWrapper.java Sun Jun 3 13:18:24 2007
@@ -22,7 +22,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.WeblogBookmark;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
@@ -117,7 +117,7 @@
public List retrieveBookmarks(boolean subfolders)
- throws RollerException {
+ throws WebloggerException {
List initialCollection = this.pojo.retrieveBookmarks(subfolders);
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogCategoryDataWrapper.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogCategoryDataWrapper.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogCategoryDataWrapper.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogCategoryDataWrapper.java Sun Jun 3 13:18:24 2007
@@ -22,7 +22,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.WeblogCategory;
import org.apache.roller.weblogger.pojos.WeblogEntry;
@@ -104,7 +104,7 @@
public List retrieveWeblogEntries(boolean subcats)
- throws RollerException {
+ throws WebloggerException {
List initialCollection = this.pojo.retrieveWeblogEntries(subcats);
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WebsiteDataWrapper.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WebsiteDataWrapper.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WebsiteDataWrapper.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WebsiteDataWrapper.java Sun Jun 3 13:18:24 2007
@@ -25,7 +25,7 @@
import java.util.Locale;
import java.util.Set;
import java.util.TimeZone;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.ThemeTemplate;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.pojos.WeblogCategory;
@@ -59,24 +59,24 @@
public TemplateWrapper getPageByAction(String action)
- throws RollerException {
+ throws WebloggerException {
return TemplateWrapper.wrap(this.pojo.getPageByAction(action));
}
public TemplateWrapper getPageByName(String name)
- throws RollerException {
+ throws WebloggerException {
return TemplateWrapper.wrap(this.pojo.getPageByName(name));
}
public TemplateWrapper getPageByLink(String link)
- throws RollerException {
+ throws WebloggerException {
return TemplateWrapper.wrap(this.pojo.getPageByLink(link));
}
- public List getPages() throws RollerException {
+ public List getPages() throws WebloggerException {
List initialCollection = this.pojo.getPages();
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerContext.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerContext.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerContext.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerContext.java Sun Jun 3 13:18:24 2007
@@ -36,7 +36,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.DatabaseProvider;
import org.apache.roller.weblogger.business.runnable.RollerTask;
import org.apache.roller.weblogger.business.utils.UpgradeDatabase;
@@ -168,6 +168,11 @@
* Trigger any database upgrade work that needs to be done.
*/
private void upgradeDatabaseIfNeeded() throws Exception {
+
+ // TODO_GUICE: elimiate the need for RollerFactory.getInjector()
+ // This should cause injection of DatabaseProvider singleton
+ RollerFactory.getInjector().getInstance(DatabaseProvider.class);
+
Connection con = DatabaseProvider.getDatabaseProvider().getConnection();
UpgradeDatabase.upgradeDatabase(con, RollerFactory.getRoller().getVersion());
con.close();
@@ -203,7 +208,7 @@
RuntimeSingleton.init(velocityProps);
} catch (Exception e) {
- throw new RollerException(e);
+ throw new WebloggerException(e);
}
}
@@ -211,7 +216,7 @@
/**
* Setup Acegi security features.
*/
- protected void initializeSecurityFeatures(ServletContext context) throws RollerException {
+ protected void initializeSecurityFeatures(ServletContext context) throws WebloggerException {
ApplicationContext ctx =
WebApplicationContextUtils.getRequiredWebApplicationContext(context);
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java Sun Jun 3 13:18:24 2007
@@ -28,7 +28,7 @@
import javax.servlet.http.HttpSessionListener;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.RollerConfig;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.UserManager;
@@ -95,7 +95,7 @@
if(user != null && user.getEnabled().booleanValue()) {
rollerSession.setAuthenticatedUser(user);
}
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("ERROR: getting user object",e);
}
}
@@ -143,7 +143,7 @@
try {
UserManager mgr = RollerFactory.getRoller().getUserManager();
authenticUser = mgr.getUser(userId);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.warn("Error looking up authenticated user "+userId, ex);
}
}
@@ -163,7 +163,7 @@
/**
* Does our authenticated user have the global admin role?
*/
- public boolean isGlobalAdminUser() throws RollerException {
+ public boolean isGlobalAdminUser() throws WebloggerException {
User user = getAuthenticatedUser();
if (user != null && user.hasRole("admin")
@@ -176,7 +176,7 @@
* Is session's authenticated user authorized to work in current website?
*/
public boolean isUserAuthorized(Weblog website)
- throws RollerException {
+ throws WebloggerException {
User user = getAuthenticatedUser();
if (user != null && user.getEnabled().booleanValue())
@@ -189,7 +189,7 @@
* Is session's authenticated user authorized to post in current weblog?
*/
public boolean isUserAuthorizedToAuthor(Weblog website)
- throws RollerException {
+ throws WebloggerException {
User user = getAuthenticatedUser();
if (user != null && user.getEnabled().booleanValue())
@@ -202,7 +202,7 @@
* Is session's authenticated user authorized to admin current weblog?
*/
public boolean isUserAuthorizedToAdmin(Weblog website)
- throws RollerException {
+ throws WebloggerException {
User user = getAuthenticatedUser();
if (user != null && user.getEnabled().booleanValue())
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/BasicUserAutoProvision.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/BasicUserAutoProvision.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/BasicUserAutoProvision.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/BasicUserAutoProvision.java Sun Jun 3 13:18:24 2007
@@ -19,7 +19,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.pojos.User;
@@ -46,7 +46,7 @@
mgr = RollerFactory.getRoller().getUserManager();
mgr.addUser(ud);
RollerFactory.getRoller().flush();
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.warn("Error while auto-provisioning user from SSO.", e);
}
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java Sun Jun 3 13:18:24 2007
@@ -6,7 +6,7 @@
import org.acegisecurity.userdetails.UserDetails;
import org.acegisecurity.userdetails.UserDetailsService;
import org.acegisecurity.userdetails.UsernameNotFoundException;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.Roller;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.UserManager;
@@ -28,7 +28,7 @@
Roller roller = RollerFactory.getRoller();
UserManager umgr = roller.getUserManager();
userData = umgr.getUserByUserName(userName, Boolean.TRUE);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
throw new DataRetrievalFailureException("ERROR in user lookup", ex);
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java Sun Jun 3 13:18:24 2007
@@ -24,7 +24,7 @@
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogEntry;
@@ -64,7 +64,7 @@
null,WeblogEntry.PUBLISHED, // status
locale,
0, -1);
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
mLogger.error(e);
monthMap = new HashMap();
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java Sun Jun 3 13:18:24 2007
@@ -27,7 +27,7 @@
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogEntry;
@@ -62,7 +62,7 @@
try {
this.weblog = pageRequest.getWeblog();
if(weblog == null) {
- throw new RollerException("unable to lookup weblog: "+
+ throw new WebloggerException("unable to lookup weblog: "+
pageRequest.getWeblogHandle());
}
pageLink = pageRequest.getWeblogPageName();
@@ -118,7 +118,7 @@
WeblogEntry prevEntry = (WeblogEntry)prevEntries.get(0);
prevMonth = DateUtil.getStartOfMonth(new Date(prevEntry.getPubTime().getTime()));
}
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("ERROR determining previous non-empty month");
}
@@ -144,7 +144,7 @@
WeblogEntry nextEntry = (WeblogEntry)nextEntries.get(0);
nextMonth = DateUtil.getStartOfMonth(new Date(nextEntry.getPubTime().getTime()));
}
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("ERROR determining next non-empty month");
}
@@ -167,7 +167,7 @@
null,WeblogEntry.PUBLISHED, // status
locale,
0, -1);
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error(e);
monthMap = new HashMap();
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/RenderingException.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/RenderingException.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/RenderingException.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/RenderingException.java Sun Jun 3 13:18:24 2007
@@ -18,13 +18,13 @@
package org.apache.roller.weblogger.ui.rendering;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
/**
* A generic Roller rendering exception.
*/
-public class RenderingException extends RollerException {
+public class RenderingException extends WebloggerException {
public RenderingException(String s) {
super(s);
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java Sun Jun 3 13:18:24 2007
@@ -22,7 +22,7 @@
import javax.servlet.jsp.PageContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.wrapper.WebsiteDataWrapper;
import org.apache.roller.weblogger.ui.core.tags.calendar.BigWeblogCalendarModel;
import org.apache.roller.weblogger.ui.core.tags.calendar.CalendarTag;
@@ -51,7 +51,7 @@
/** Init page model based on request */
- public void init(Map initData) throws RollerException {
+ public void init(Map initData) throws WebloggerException {
// extract page context
this.pageContext = (PageContext) initData.get("pageContext");
@@ -59,7 +59,7 @@
// we expect the init data to contain a weblogRequest object
WeblogRequest weblogRequest = (WeblogRequest) initData.get("weblogRequest");
if(weblogRequest == null) {
- throw new RollerException("expected weblogRequest from init data");
+ throw new WebloggerException("expected weblogRequest from init data");
}
// CalendarModel only works on page requests, so cast weblogRequest
@@ -67,7 +67,7 @@
if(weblogRequest instanceof WeblogPageRequest) {
this.pageRequest = (WeblogPageRequest) weblogRequest;
} else {
- throw new RollerException("weblogRequest is not a WeblogPageRequest."+
+ throw new WebloggerException("weblogRequest is not a WeblogPageRequest."+
" CalendarModel only supports page requests.");
}
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/ConfigModel.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/ConfigModel.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/ConfigModel.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/ConfigModel.java Sun Jun 3 13:18:24 2007
@@ -21,7 +21,7 @@
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
@@ -41,7 +41,7 @@
/** Init model */
- public void init(Map map) throws RollerException {
+ public void init(Map map) throws WebloggerException {
// no-op
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java Sun Jun 3 13:18:24 2007
@@ -23,7 +23,7 @@
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.pojos.wrapper.WebsiteDataWrapper;
@@ -48,12 +48,12 @@
private Weblog weblog = null;
- public void init(Map initData) throws RollerException {
+ public void init(Map initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
WeblogRequest weblogRequest = (WeblogRequest) initData.get("weblogRequest");
if(weblogRequest == null) {
- throw new RollerException("expected weblogRequest from init data");
+ throw new WebloggerException("expected weblogRequest from init data");
}
// PageModel only works on page requests, so cast weblogRequest
@@ -61,7 +61,7 @@
if(weblogRequest instanceof WeblogFeedRequest) {
this.feedRequest = (WeblogFeedRequest) weblogRequest;
} else {
- throw new RollerException("weblogRequest is not a WeblogFeedRequest."+
+ throw new WebloggerException("weblogRequest is not a WeblogFeedRequest."+
" FeedModel only supports feed requests.");
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/MenuModel.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/MenuModel.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/MenuModel.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/MenuModel.java Sun Jun 3 13:18:24 2007
@@ -21,7 +21,7 @@
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.ui.core.util.menu.Menu;
import org.apache.roller.weblogger.ui.core.util.menu.MenuHelper;
import org.apache.roller.weblogger.ui.rendering.util.WeblogPageRequest;
@@ -47,12 +47,12 @@
/** Init page model based on request */
- public void init(Map initData) throws RollerException {
+ public void init(Map initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
WeblogRequest weblogRequest = (WeblogRequest) initData.get("weblogRequest");
if(weblogRequest == null) {
- throw new RollerException("expected weblogRequest from init data");
+ throw new WebloggerException("expected weblogRequest from init data");
}
// MenuModel only works on page requests, so cast weblogRequest
@@ -60,7 +60,7 @@
if(weblogRequest instanceof WeblogPageRequest) {
this.pageRequest = (WeblogPageRequest) weblogRequest;
} else {
- throw new RollerException("weblogRequest is not a WeblogPageRequest."+
+ throw new WebloggerException("weblogRequest is not a WeblogPageRequest."+
" MenuModel only supports page requests.");
}
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/MessageModel.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/MessageModel.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/MessageModel.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/MessageModel.java Sun Jun 3 13:18:24 2007
@@ -20,7 +20,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.ui.rendering.util.WeblogRequest;
import org.apache.roller.weblogger.util.I18nMessages;
@@ -41,12 +41,12 @@
/** Init page model based on request */
- public void init(Map initData) throws RollerException {
+ public void init(Map initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
WeblogRequest weblogRequest = (WeblogRequest) initData.get("weblogRequest");
if(weblogRequest == null) {
- throw new RollerException("expected weblogRequest from init data");
+ throw new WebloggerException("expected weblogRequest from init data");
}
// get messages util based on desired locale
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/Model.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/Model.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/Model.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/Model.java Sun Jun 3 13:18:24 2007
@@ -19,7 +19,7 @@
package org.apache.roller.weblogger.ui.rendering.model;
import java.util.Map;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
/**
@@ -36,6 +36,6 @@
/**
* Initialize.
*/
- public void init(Map params) throws RollerException;
+ public void init(Map params) throws WebloggerException;
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/ModelLoader.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/ModelLoader.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/ModelLoader.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/ModelLoader.java Sun Jun 3 13:18:24 2007
@@ -24,7 +24,7 @@
import javax.servlet.jsp.PageContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.RollerConfig;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.ui.rendering.util.WeblogPageRequest;
@@ -48,7 +48,7 @@
HttpServletRequest request,
HttpServletResponse response,
PageContext pageContext,
- WeblogPageRequest pageRequest) throws RollerException {
+ WeblogPageRequest pageRequest) throws WebloggerException {
// Only load old models if it's enabled
if (RollerConfig.getBooleanProperty("rendering.legacyModels.enabled")) {
@@ -67,7 +67,7 @@
if (weblog.getPageModels() != null) {
try {
loadModels(weblog.getPageModels(), model, initData, false);
- } catch(RollerException ex) {
+ } catch(WebloggerException ex) {
// shouldn't happen, but log it just in case
log.error("Error loading weblog custom models", ex);
}
@@ -83,7 +83,7 @@
*/
public static void loadModels(String modelsString, Map model,
Map initData, boolean fail)
- throws RollerException {
+ throws WebloggerException {
String[] models = Utilities.stringToStringArray(modelsString, ",");
for(int i=0; i < models.length; i++) {
@@ -92,7 +92,7 @@
Model pageModel = (Model) modelClass.newInstance();
pageModel.init(initData);
model.put(pageModel.getModelName(), pageModel);
- } catch (RollerException re) {
+ } catch (WebloggerException re) {
if(fail) {
throw re;
} else {
@@ -100,19 +100,19 @@
}
} catch (ClassNotFoundException cnfe) {
if(fail) {
- throw new RollerException("Error finding model: " + models[i], cnfe);
+ throw new WebloggerException("Error finding model: " + models[i], cnfe);
} else {
log.warn("Error finding model: " + models[i]);
}
} catch (InstantiationException ie) {
if(fail) {
- throw new RollerException("Error insantiating model: " + models[i], ie);
+ throw new WebloggerException("Error insantiating model: " + models[i], ie);
} else {
log.warn("Error insantiating model: " + models[i]);
}
} catch (IllegalAccessException iae) {
if(fail) {
- throw new RollerException("Error accessing model: " + models[i], iae);
+ throw new WebloggerException("Error accessing model: " + models[i], iae);
} else {
log.warn("Error accessing model: " + models[i]);
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java Sun Jun 3 13:18:24 2007
@@ -24,7 +24,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.Roller;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
@@ -74,12 +74,12 @@
/**
* Init page model based on request.
*/
- public void init(Map initData) throws RollerException {
+ public void init(Map initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
WeblogRequest weblogRequest = (WeblogRequest) initData.get("weblogRequest");
if(weblogRequest == null) {
- throw new RollerException("expected weblogRequest from init data");
+ throw new WebloggerException("expected weblogRequest from init data");
}
// PageModel only works on page requests, so cast weblogRequest
@@ -87,7 +87,7 @@
if(weblogRequest instanceof WeblogPageRequest) {
this.pageRequest = (WeblogPageRequest) weblogRequest;
} else {
- throw new RollerException("weblogRequest is not a WeblogPageRequest."+
+ throw new WebloggerException("weblogRequest is not a WeblogPageRequest."+
" PageModel only supports page requests.");
}
@@ -155,7 +155,7 @@
} else {
try {
return TemplateWrapper.wrap(weblog.getDefaultPage());
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error getting default page", ex);
}
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java Sun Jun 3 13:18:24 2007
@@ -24,7 +24,7 @@
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.planet.business.PlanetFactory;
import org.apache.roller.planet.business.PlanetManager;
import org.apache.roller.planet.pojos.PlanetData;
@@ -56,12 +56,12 @@
return "planet";
}
- public void init(Map initData) throws RollerException {
+ public void init(Map initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
this.weblogRequest = (WeblogRequest) initData.get("weblogRequest");
if(this.weblogRequest == null) {
- throw new RollerException("expected weblogRequest from init data");
+ throw new WebloggerException("expected weblogRequest from init data");
}
if (weblogRequest instanceof WeblogPageRequest) {
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewPageModel.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewPageModel.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewPageModel.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewPageModel.java Sun Jun 3 13:18:24 2007
@@ -19,7 +19,7 @@
package org.apache.roller.weblogger.ui.rendering.model;
import java.util.Map;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryDataWrapper;
import org.apache.roller.weblogger.ui.rendering.pagers.WeblogEntriesLatestPager;
import org.apache.roller.weblogger.ui.rendering.pagers.WeblogEntriesPager;
@@ -39,12 +39,12 @@
/**
* Init model.
*/
- public void init(Map initData) throws RollerException {
+ public void init(Map initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
WeblogRequest weblogRequest = (WeblogRequest) initData.get("weblogRequest");
if(weblogRequest == null) {
- throw new RollerException("expected weblogRequest from init data");
+ throw new WebloggerException("expected weblogRequest from init data");
}
// PreviewPageModel only works on preview requests, so cast weblogRequest
@@ -52,7 +52,7 @@
if(weblogRequest instanceof WeblogPreviewRequest) {
this.previewRequest = (WeblogPreviewRequest) weblogRequest;
} else {
- throw new RollerException("weblogRequest is not a WeblogPreviewRequest."+
+ throw new WebloggerException("weblogRequest is not a WeblogPreviewRequest."+
" PreviewPageModel only supports preview requests.");
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewURLModel.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewURLModel.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewURLModel.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewURLModel.java Sun Jun 3 13:18:24 2007
@@ -19,7 +19,7 @@
package org.apache.roller.weblogger.ui.rendering.model;
import java.util.Map;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.ui.rendering.util.WeblogPreviewRequest;
import org.apache.roller.weblogger.ui.rendering.util.WeblogRequest;
@@ -37,12 +37,12 @@
private String locale = null;
- public void init(Map initData) throws RollerException {
+ public void init(Map initData) throws WebloggerException {
// need a weblog request so that we can know the weblog and locale
WeblogRequest weblogRequest = (WeblogRequest) initData.get("weblogRequest");
if(weblogRequest == null) {
- throw new RollerException("Expected 'weblogRequest' init param!");
+ throw new WebloggerException("Expected 'weblogRequest' init param!");
}
// PreviewURLModel only works on preview requests, so cast weblogRequest
@@ -50,7 +50,7 @@
if(weblogRequest instanceof WeblogPreviewRequest) {
this.previewRequest = (WeblogPreviewRequest) weblogRequest;
} else {
- throw new RollerException("weblogRequest is not a WeblogPreviewRequest."+
+ throw new WebloggerException("weblogRequest is not a WeblogPreviewRequest."+
" PreviewURLModel only supports preview requests.");
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java Sun Jun 3 13:18:24 2007
@@ -32,7 +32,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.lucene.document.Document;
import org.apache.lucene.search.Hits;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.Roller;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
@@ -86,18 +86,18 @@
}
- public void init(Map initData) throws RollerException {
+ public void init(Map initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
WeblogRequest weblogRequest = (WeblogRequest) initData.get("weblogRequest");
if(weblogRequest == null) {
- throw new RollerException("expected weblogRequest from init data");
+ throw new WebloggerException("expected weblogRequest from init data");
}
if(weblogRequest instanceof WeblogFeedRequest) {
this.feedRequest = (WeblogFeedRequest) weblogRequest;
} else {
- throw new RollerException("weblogRequest is not a WeblogFeedRequest."+
+ throw new WebloggerException("weblogRequest is not a WeblogFeedRequest."+
" FeedModel only supports feed requests.");
}
@@ -154,7 +154,7 @@
return pager;
}
- private void convertHitsToEntries(Hits hits) throws RollerException {
+ private void convertHitsToEntries(Hits hits) throws WebloggerException {
// determine offset
this.offset = feedRequest.getPage() * this.entryCount;
@@ -212,7 +212,7 @@
this.categories = categories;
}
} catch(IOException e) {
- throw new RollerException(e);
+ throw new WebloggerException(e);
}
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java Sun Jun 3 13:18:24 2007
@@ -29,7 +29,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.lucene.document.Document;
import org.apache.lucene.search.Hits;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.search.FieldConstants;
import org.apache.roller.weblogger.business.search.operations.SearchOperation;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
@@ -75,12 +75,12 @@
private String errorMessage = null;
- public void init(Map initData) throws RollerException {
+ public void init(Map initData) throws WebloggerException {
// we expect the init data to contain a searchRequest object
searchRequest = (WeblogSearchRequest) initData.get("searchRequest");
if(searchRequest == null) {
- throw new RollerException("expected searchRequest from init data");
+ throw new WebloggerException("expected searchRequest from init data");
}
// let parent initialize
@@ -143,7 +143,7 @@
return pager;
}
- private void convertHitsToEntries(Hits hits) throws RollerException {
+ private void convertHitsToEntries(Hits hits) throws WebloggerException {
// determine offset
this.offset = searchRequest.getPageNum() * RESULTS_PER_PAGE;
@@ -201,7 +201,7 @@
this.categories = categories;
}
} catch(IOException e) {
- throw new RollerException(e);
+ throw new WebloggerException(e);
}
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java Sun Jun 3 13:18:24 2007
@@ -28,7 +28,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.Roller;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.UserManager;
@@ -73,12 +73,12 @@
return "site";
}
- public void init(Map initData) throws RollerException {
+ public void init(Map initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
this.weblogRequest = (WeblogRequest) initData.get("weblogRequest");
if(this.weblogRequest == null) {
- throw new RollerException("expected weblogRequest from init data");
+ throw new WebloggerException("expected weblogRequest from init data");
}
if (weblogRequest instanceof WeblogPageRequest) {
@@ -562,7 +562,7 @@
Roller roller = RollerFactory.getRoller();
WeblogManager mgr = roller.getWeblogManager();
count = mgr.getCommentCount();
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("Error getting comment count for site ", e);
}
return count;
@@ -575,7 +575,7 @@
Roller roller = RollerFactory.getRoller();
WeblogManager mgr = roller.getWeblogManager();
count = mgr.getEntryCount();
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("Error getting entry count for site", e);
}
return count;
@@ -588,7 +588,7 @@
Roller roller = RollerFactory.getRoller();
UserManager mgr = roller.getUserManager();
count = mgr.getWeblogCount();
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("Error getting weblog count for site", e);
}
return count;
@@ -601,7 +601,7 @@
Roller roller = RollerFactory.getRoller();
UserManager mgr = roller.getUserManager();
count = mgr.getUserCount();
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("Error getting user count for site", e);
}
return count;
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/URLModel.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/URLModel.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/URLModel.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/URLModel.java Sun Jun 3 13:18:24 2007
@@ -24,7 +24,7 @@
import javax.servlet.jsp.PageContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
@@ -63,12 +63,12 @@
return "url";
}
- public void init(Map initData) throws RollerException {
+ public void init(Map initData) throws WebloggerException {
// need a weblog request so that we can know the weblog and locale
WeblogRequest weblogRequest = (WeblogRequest) initData.get("weblogRequest");
if(weblogRequest == null) {
- throw new RollerException("Expected 'weblogRequest' init param!");
+ throw new WebloggerException("Expected 'weblogRequest' init param!");
}
this.weblog = weblogRequest.getWeblog();
@@ -275,7 +275,7 @@
if(entry != null) {
return URLUtilities.getEntryEditURL(weblog.getHandle(), entry.getId(), false);
}
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error looking up entry by anchor - "+anchor, ex);
}
return null;
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java Sun Jun 3 13:18:24 2007
@@ -32,7 +32,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryDataWrapper;
import org.apache.roller.weblogger.pojos.wrapper.WebsiteDataWrapper;
import org.apache.roller.weblogger.ui.core.RollerSession;
@@ -102,7 +102,7 @@
/** Init page model based on request */
- public void init(Map initData) throws RollerException {
+ public void init(Map initData) throws WebloggerException {
// extract request object
this.request = (HttpServletRequest) initData.get("request");
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPermalinkPager.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPermalinkPager.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPermalinkPager.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPermalinkPager.java Sun Jun 3 13:18:24 2007
@@ -26,7 +26,7 @@
import java.util.TreeMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.Roller;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
@@ -141,7 +141,7 @@
&& nextEntry.getStatus().equals(WeblogEntry.PUBLISHED)) {
nextEntry = null;
}
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("ERROR: getting next entry", e);
}
@@ -159,7 +159,7 @@
&& prevEntry.getStatus().equals(WeblogEntry.PUBLISHED)) {
prevEntry = null;
}
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("ERROR: getting prev entry", e);
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/AcronymsPlugin.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/AcronymsPlugin.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/AcronymsPlugin.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/AcronymsPlugin.java Sun Jun 3 13:18:24 2007
@@ -26,7 +26,7 @@
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogEntryPlugin;
@@ -72,7 +72,7 @@
}
- public void init(Weblog website) throws RollerException {}
+ public void init(Weblog website) throws WebloggerException {}
public String render(WeblogEntry entry, String str) {
@@ -123,7 +123,7 @@
* Look for any _acronyms Page and parse it into Properties.
* @param website
* @return
- * @throws RollerException
+ * @throws WebloggerException
*/
private Properties loadAcronyms(Weblog website) {
Properties acronyms = new Properties();
@@ -134,7 +134,7 @@
if (acronymsPage != null) {
acronyms = parseAcronymPage(acronymsPage, acronyms);
}
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
// not much we can do about it
mLogger.warn(e);
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/BookmarkPlugin.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/BookmarkPlugin.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/BookmarkPlugin.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/BookmarkPlugin.java Sun Jun 3 13:18:24 2007
@@ -27,7 +27,7 @@
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.BookmarkManager;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogEntryPlugin;
@@ -65,7 +65,7 @@
}
- public void init(Weblog website) throws RollerException {}
+ public void init(Weblog website) throws WebloggerException {}
public String render(WeblogEntry entry, String str) {
@@ -75,9 +75,9 @@
WeblogBookmarkFolder rootFolder = bMgr.getRootFolder(entry.getWebsite());
text = matchBookmarks(text, rootFolder);
text = lookInFolders(text, rootFolder.getFolders());
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
// nothing much I can do, go with default "Weblog" value
- // could be RollerException or NullPointerException
+ // could be WebloggerException or NullPointerException
mLogger.warn(e);
}
return text;
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/ConvertLineBreaksPlugin.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/ConvertLineBreaksPlugin.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/ConvertLineBreaksPlugin.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/ConvertLineBreaksPlugin.java Sun Jun 3 13:18:24 2007
@@ -23,7 +23,7 @@
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.business.WeblogEntryPlugin;
@@ -67,7 +67,7 @@
}
- public void init(Weblog website) throws RollerException {
+ public void init(Weblog website) throws WebloggerException {
// we don't need to do any init.
mLogger.debug("initing");
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/ObfuscateEmailPlugin.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/ObfuscateEmailPlugin.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/ObfuscateEmailPlugin.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/ObfuscateEmailPlugin.java Sun Jun 3 13:18:24 2007
@@ -22,7 +22,7 @@
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.WeblogEntryPlugin;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
@@ -57,7 +57,7 @@
}
- public void init(Weblog website) throws RollerException {}
+ public void init(Weblog website) throws WebloggerException {}
public String render(WeblogEntry entry, String str) {
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/SearchPluginBase.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/SearchPluginBase.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/SearchPluginBase.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/SearchPluginBase.java Sun Jun 3 13:18:24 2007
@@ -19,7 +19,7 @@
package org.apache.roller.weblogger.ui.rendering.plugins;
import org.apache.commons.logging.Log;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
@@ -53,7 +53,7 @@
*
* @see org.apache.roller.weblogger.model.PagePlugin#init(WebsiteData, Object, String baseUrl, org.apache.velocity.context.Context)
*/
- public void init(Weblog website) throws RollerException {
+ public void init(Weblog website) throws WebloggerException {
if (mLogger.isDebugEnabled()) {
mLogger.debug(getClass().getName() + "; version: " + getVersion() + "; base version " + baseVersion);
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/SmileysPlugin.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/SmileysPlugin.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/SmileysPlugin.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/SmileysPlugin.java Sun Jun 3 13:18:24 2007
@@ -26,7 +26,7 @@
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.business.WeblogEntryPlugin;
import org.apache.roller.weblogger.pojos.WeblogEntry;
@@ -77,7 +77,7 @@
* later use. Need an HttpServletRequest though so that we can
* get the ServletContext Path. But only do it once.
*/
- public synchronized void init(Weblog website) throws RollerException {
+ public synchronized void init(Weblog website) throws WebloggerException {
// don't do this work if Smileys already loaded
if (SmileysPlugin.smileyPatterns.length < 1) {
String baseURL = RollerRuntimeConfig.getAbsoluteContextURL();
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/TopicTagPlugin.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/TopicTagPlugin.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/TopicTagPlugin.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/TopicTagPlugin.java Sun Jun 3 13:18:24 2007
@@ -21,7 +21,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.velocity.context.Context;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.RollerConfig;
import org.apache.roller.weblogger.business.BookmarkManager;
import org.apache.roller.weblogger.business.RollerFactory;
@@ -132,7 +132,7 @@
* @param ctx Plugins may place objects into the Velocity Context.
* @see PagWeblogEntryPluginit(org.apache.roller.weblogger.presentation.RollerRequest, org.apache.velocity.context.Context)
*/
- public void init(Weblog website) throws RollerException
+ public void init(Weblog website) throws WebloggerException
{
if (mLogger.isDebugEnabled())
{
@@ -162,13 +162,13 @@
}
catch (PatternSyntaxException e)
{
- throw new RollerException("Invalid regular expression for topic tags with bookmark '" +
+ throw new WebloggerException("Invalid regular expression for topic tags with bookmark '" +
tagRegexWithBookmark + "': " + e.getMessage());
}
int groupCount = tagPatternWithBookmark.matcher("").groupCount();
if (groupCount != 2)
{
- throw new RollerException("Regular expression for topic tags with bookmark '" + tagRegexWithBookmark +
+ throw new WebloggerException("Regular expression for topic tags with bookmark '" + tagRegexWithBookmark +
"' contains wrong number of capture groups. Must have exactly 2. Contains " + groupCount);
}
@@ -178,13 +178,13 @@
}
catch (PatternSyntaxException e)
{
- throw new RollerException("Invalid regular expression for topic tags without bookmark '" +
+ throw new WebloggerException("Invalid regular expression for topic tags without bookmark '" +
tagRegexWithoutBookmark + "': " + e.getMessage());
}
groupCount = tagPatternWithoutBookmark.matcher("").groupCount();
if (groupCount != 1)
{
- throw new RollerException("Regular expression for topic tags without bookmark '" + tagRegexWithoutBookmark +
+ throw new WebloggerException("Regular expression for topic tags without bookmark '" + tagRegexWithoutBookmark +
"' contains wrong number of capture groups. Must have exactly 1. Contains " + groupCount);
}
@@ -304,7 +304,7 @@
* If ignoreBookmarks property is set, an empty map is returned.
* @return map of the user's bookmarks (type BookmarkData), keyed by name (type String).
*/
- protected Map buildBookmarkMap(Weblog website) throws RollerException
+ protected Map buildBookmarkMap(Weblog website) throws WebloggerException
{
Map bookmarkMap = new HashMap();
if (RollerConfig.getBooleanProperty("plugins.topictag.ignoreBookmarks")) {
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java Sun Jun 3 13:18:24 2007
@@ -38,7 +38,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.RollerConfig;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.business.search.IndexManager;
@@ -211,14 +211,14 @@
weblog = uMgr.getWebsiteByHandle(commentRequest.getWeblogHandle());
if(weblog == null) {
- throw new RollerException("unable to lookup weblog: "+
+ throw new WebloggerException("unable to lookup weblog: "+
commentRequest.getWeblogHandle());
}
// lookup entry specified by comment request
entry = commentRequest.getWeblogEntry();
if(entry == null) {
- throw new RollerException("unable to lookup entry: "+
+ throw new WebloggerException("unable to lookup entry: "+
commentRequest.getWeblogAnchor());
}
@@ -324,7 +324,7 @@
cf = new WeblogEntryCommentForm();
}
- } catch (RollerException re) {
+ } catch (WebloggerException re) {
log.error("Error saving comment", re);
error = re.getMessage();
}
@@ -351,7 +351,7 @@
* Re-index the WeblogEntry so that the new comment gets indexed.
*/
private void reindexEntry(WeblogEntry entry)
- throws RollerException {
+ throws WebloggerException {
IndexManager manager = RollerFactory.getRoller().getIndexManager();