Return-Path: Delivered-To: apmail-roller-commits-archive@www.apache.org Received: (qmail 65128 invoked from network); 3 Jun 2007 20:19:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Jun 2007 20:19:30 -0000 Received: (qmail 61208 invoked by uid 500); 3 Jun 2007 20:19:34 -0000 Delivered-To: apmail-roller-commits-archive@roller.apache.org Received: (qmail 61179 invoked by uid 500); 3 Jun 2007 20:19:34 -0000 Mailing-List: contact commits-help@roller.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@roller.apache.org Delivered-To: mailing list commits@roller.apache.org Received: (qmail 61121 invoked by uid 99); 3 Jun 2007 20:19:34 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Jun 2007 13:19:34 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Jun 2007 13:19:26 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 858AB1A9829; Sun, 3 Jun 2007 13:18:40 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r543978 [7/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... Date: Sun, 03 Jun 2007 20:18:33 -0000 To: commits@roller.apache.org From: snoopdave@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070603201840.858AB1A9829@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java Sun Jun 3 13:18:24 2007 @@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletResponse; 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.RollerConfig; @@ -96,7 +96,7 @@ weblog = feedRequest.getWeblog(); if(weblog == null) { - throw new RollerException("unable to lookup weblog: "+ + throw new WebloggerException("unable to lookup weblog: "+ feedRequest.getWeblogHandle()); } @@ -194,7 +194,7 @@ // tags specified. make sure they exist. WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager(); invalid = !wmgr.getTagComboExists(feedRequest.getTags(), (isSiteWide) ? null : weblog); - } catch (RollerException ex) { + } catch (WebloggerException ex) { invalid = true; } } @@ -241,7 +241,7 @@ ModelLoader.loadModels(SearchResultsFeedModel.class.getName(), model, initData, true); } - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("ERROR loading model for page", ex); if(!response.isCommitted()) response.reset(); Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java Sun Jun 3 13:18:24 2007 @@ -33,7 +33,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.HitCountQueue; import org.apache.roller.weblogger.business.referrers.IncomingReferrer; import org.apache.roller.weblogger.business.referrers.ReferrerQueueManager; @@ -149,7 +149,7 @@ weblog = pageRequest.getWeblog(); if(weblog == null) { - throw new RollerException("unable to lookup weblog: "+ + throw new WebloggerException("unable to lookup weblog: "+ pageRequest.getWeblogHandle()); } @@ -333,7 +333,7 @@ // tags specified. make sure they exist. WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager(); invalid = !wmgr.getTagComboExists(pageRequest.getTags(), (isSiteWide) ? null : weblog); - } catch (RollerException ex) { + } catch (WebloggerException ex) { invalid = true; } } @@ -406,7 +406,7 @@ // ick, gotta load pre-3.0 model stuff as well :( ModelLoader.loadOldModels(model, request, response, pageContext, pageRequest); - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error loading model objects for page", ex); if(!response.isCommitted()) response.reset(); Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java Sun Jun 3 13:18:24 2007 @@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletResponse; 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.planet.business.PlanetFactory; import org.apache.roller.planet.business.PlanetManager; @@ -155,7 +155,7 @@ } model.put("entryCount", new Integer(entryCount)); - } catch (RollerException ex) { + } catch (Exception ex) { log.error("Error loading model objects for page", ex); if(!response.isCommitted()) response.reset(); Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java Sun Jun 3 13:18:24 2007 @@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletResponse; 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.FileManager; import org.apache.roller.weblogger.business.RollerFactory; import org.apache.roller.weblogger.pojos.Theme; @@ -84,7 +84,7 @@ weblog = resourceRequest.getWeblog(); if(weblog == null) { - throw new RollerException("unable to lookup weblog: "+ + throw new WebloggerException("unable to lookup weblog: "+ resourceRequest.getWeblogHandle()); } Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java Sun Jun 3 13:18:24 2007 @@ -30,7 +30,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.config.RollerRuntimeConfig; import org.apache.roller.weblogger.pojos.Template; @@ -88,7 +88,7 @@ // lookup weblog specified by preview request weblog = previewRequest.getWeblog(); if(weblog == null) { - throw new RollerException("unable to lookup weblog: "+ + throw new WebloggerException("unable to lookup weblog: "+ previewRequest.getWeblogHandle()); } } catch (Exception e) { @@ -123,9 +123,9 @@ page = tmpWebsite.getDefaultPage(); if(page == null) { - throw new RollerException("No default page for weblog: "+tmpWebsite.getHandle()); + throw new WebloggerException("No default page for weblog: "+tmpWebsite.getHandle()); } - } catch(RollerException re) { + } catch(WebloggerException re) { // couldn't get page response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); log.error("Error getting default page for preview", re); @@ -177,7 +177,7 @@ // ick, gotta load pre-3.0 model stuff as well :( ModelLoader.loadOldModels(model, request, response, pageContext, previewRequest); - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("ERROR loading model for page", ex); if(!response.isCommitted()) response.reset(); Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java Sun Jun 3 13:18:24 2007 @@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletResponse; 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.StaticTemplate; import org.apache.roller.weblogger.pojos.Template; @@ -81,7 +81,7 @@ // now make sure the specified weblog really exists weblog = weblogRequest.getWeblog(); if(weblog == null) { - throw new RollerException("Unable to lookup weblog: "+ + throw new WebloggerException("Unable to lookup weblog: "+ weblogRequest.getWeblogHandle()); } Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServlet.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServlet.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServlet.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServlet.java Sun Jun 3 13:18:24 2007 @@ -31,7 +31,7 @@ import javax.servlet.http.HttpServletResponse; 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.FileManager; import org.apache.roller.weblogger.business.RollerFactory; import org.apache.roller.weblogger.pojos.ThemeResource; @@ -86,7 +86,7 @@ weblog = resourceRequest.getWeblog(); if(weblog == null) { - throw new RollerException("unable to lookup weblog: "+ + throw new WebloggerException("unable to lookup weblog: "+ resourceRequest.getWeblogHandle()); } Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java Sun Jun 3 13:18:24 2007 @@ -30,7 +30,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.config.RollerRuntimeConfig; import org.apache.roller.weblogger.business.RollerFactory; @@ -108,7 +108,7 @@ // if still null then that's a problem if(page == null) { - throw new RollerException("Could not lookup default page "+ + throw new WebloggerException("Could not lookup default page "+ "for weblog "+weblog.getHandle()); } } catch(Exception e) { @@ -162,7 +162,7 @@ searchModel.init(initData); model.put("searchResults", searchModel); - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error loading model objects for page", ex); if(!response.isCommitted()) response.reset(); Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java Sun Jun 3 13:18:24 2007 @@ -29,7 +29,7 @@ import javax.servlet.http.HttpServletResponse; 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.UserManager; @@ -121,7 +121,7 @@ weblog = uMgr.getWebsiteByHandle(trackbackRequest.getWeblogHandle()); if (weblog == null) { - throw new RollerException("unable to lookup weblog: "+ + throw new WebloggerException("unable to lookup weblog: "+ trackbackRequest.getWeblogHandle()); } @@ -130,7 +130,7 @@ entry = weblogMgr.getWeblogEntryByAnchor(weblog, trackbackRequest.getWeblogAnchor()); if (entry == null) { - throw new RollerException("unable to lookup entry: "+ + throw new WebloggerException("unable to lookup entry: "+ trackbackRequest.getWeblogAnchor()); } Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/InvalidRequestException.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/InvalidRequestException.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/InvalidRequestException.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/InvalidRequestException.java Sun Jun 3 13:18:24 2007 @@ -18,14 +18,14 @@ package org.apache.roller.weblogger.ui.rendering.util; -import org.apache.roller.RollerException; +import org.apache.roller.weblogger.WebloggerException; /** * An InvalidRequestException is thrown by the ParsedRequest class or any of * its subclasses when the request being parsed is invalid in any way. */ -public class InvalidRequestException extends RollerException { +public class InvalidRequestException extends WebloggerException { public InvalidRequestException(String msg) { super(msg); Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/ParsedRequest.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/ParsedRequest.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/ParsedRequest.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/ParsedRequest.java Sun Jun 3 13:18:24 2007 @@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest; 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; @@ -90,7 +90,7 @@ try { UserManager umgr = RollerFactory.getRoller().getUserManager(); user = umgr.getUserByUserName(authenticUser); - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error looking up user "+authenticUser, ex); } } Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogCommentRequest.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogCommentRequest.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogCommentRequest.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogCommentRequest.java Sun Jun 3 13:18:24 2007 @@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletRequest; 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; @@ -205,7 +205,7 @@ try { WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager(); weblogEntry = wmgr.getWeblogEntryByAnchor(getWeblog(), weblogAnchor); - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error getting weblog entry "+weblogAnchor, ex); } } Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java Sun Jun 3 13:18:24 2007 @@ -27,7 +27,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.business.RollerFactory; import org.apache.roller.weblogger.business.WeblogManager; @@ -217,7 +217,7 @@ try { WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager(); weblogCategory = wmgr.getWeblogCategoryByPath(getWeblog(), weblogCategoryName); - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error getting weblog category "+weblogCategoryName, ex); } } Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.java Sun Jun 3 13:18:24 2007 @@ -25,7 +25,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.business.RollerFactory; import org.apache.roller.weblogger.business.UserManager; @@ -333,7 +333,7 @@ try { WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager(); weblogEntry = wmgr.getWeblogEntryByAnchor(getWeblog(), weblogAnchor); - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error getting weblog entry "+weblogAnchor, ex); } } @@ -351,7 +351,7 @@ try { UserManager umgr = RollerFactory.getRoller().getUserManager(); weblogPage = getWeblog().getPageByLink(weblogPageName); - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error getting weblog page "+weblogPageName, ex); } } @@ -369,7 +369,7 @@ try { WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager(); weblogCategory = wmgr.getWeblogCategoryByPath(getWeblog(), weblogCategoryName); - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error getting weblog category "+weblogCategoryName, ex); } } Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewRequest.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewRequest.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewRequest.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewRequest.java Sun Jun 3 13:18:24 2007 @@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest; 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.themes.ThemeNotFoundException; import org.apache.roller.weblogger.business.RollerFactory; import org.apache.roller.weblogger.business.themes.ThemeManager; @@ -101,7 +101,7 @@ theme = themeMgr.getTheme(themeName); } catch(ThemeNotFoundException tnfe) { // bogus theme specified ... don't worry about it - } catch(RollerException re) { + } catch(WebloggerException re) { log.error("Error looking up theme "+themeName, re); } } @@ -135,7 +135,7 @@ try { WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager(); weblogEntry = wmgr.getWeblogEntryByAnchor(getWeblog(), anchor); - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error getting weblog entry "+anchor, ex); } } Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewResourceRequest.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewResourceRequest.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewResourceRequest.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewResourceRequest.java Sun Jun 3 13:18:24 2007 @@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest; 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.themes.ThemeNotFoundException; import org.apache.roller.weblogger.business.RollerFactory; import org.apache.roller.weblogger.business.themes.ThemeManager; @@ -88,7 +88,7 @@ theme = themeMgr.getTheme(themeName); } catch(ThemeNotFoundException tnfe) { // bogus theme specified ... don't worry about it - } catch(RollerException re) { + } catch(WebloggerException re) { log.error("Error looking up theme "+themeName, re); } } Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogRequest.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogRequest.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogRequest.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogRequest.java Sun Jun 3 13:18:24 2007 @@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletRequest; 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.Weblog; @@ -188,7 +188,7 @@ try { UserManager umgr = RollerFactory.getRoller().getUserManager(); weblog = umgr.getWebsiteByHandle(weblogHandle, Boolean.TRUE); - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error looking up weblog "+weblogHandle, ex); } } Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogSearchRequest.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogSearchRequest.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogSearchRequest.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogSearchRequest.java Sun Jun 3 13:18:24 2007 @@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest; 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.WeblogCategory; @@ -137,7 +137,7 @@ try { WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager(); weblogCategory = wmgr.getWeblogCategoryByPath(getWeblog(), weblogCategoryName); - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error getting weblog category "+weblogCategoryName, ex); } } Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogTrackbackRequest.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogTrackbackRequest.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogTrackbackRequest.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogTrackbackRequest.java Sun Jun 3 13:18:24 2007 @@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletRequest; 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; @@ -197,7 +197,7 @@ try { WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager(); weblogEntry = wmgr.getWeblogEntryByAnchor(getWeblog(), weblogAnchor); - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error getting weblog entry "+weblogAnchor, ex); } } Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.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.weblogger.config.RollerConfig; import org.apache.roller.weblogger.business.RollerFactory; import org.apache.roller.planet.business.Planet; Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.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.weblogger.business.runnable.Job; import org.apache.roller.weblogger.config.RollerConfig; import org.apache.roller.weblogger.business.RollerFactory; Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java Sun Jun 3 13:18:24 2007 @@ -26,7 +26,7 @@ import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.runtime.resource.Resource; import org.apache.velocity.runtime.resource.loader.ResourceLoader; -import org.apache.roller.RollerException; +import org.apache.roller.weblogger.WebloggerException; import org.apache.roller.weblogger.business.RollerFactory; import org.apache.roller.weblogger.pojos.WeblogTemplate; @@ -91,7 +91,7 @@ // This rethrows as a Runtime exception after logging. mLogger.error(uex); throw new RuntimeException(uex); - } catch (RollerException re) { + } catch (WebloggerException re) { String msg = "RollerResourceLoader Error: " + "database problem trying to load resource " + name; mLogger.error( msg, re ); @@ -123,7 +123,7 @@ " vs. page=" + page.getLastModified().getTime()); } return page.getLastModified().getTime(); - } catch (RollerException re) { + } catch (WebloggerException re) { mLogger.error( "Error " + i_operation, re ); } return 0; Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/ThemeResourceLoader.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/ThemeResourceLoader.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/ThemeResourceLoader.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/ThemeResourceLoader.java Sun Jun 3 13:18:24 2007 @@ -32,7 +32,7 @@ import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.runtime.resource.Resource; import org.apache.velocity.runtime.resource.loader.ResourceLoader; -import org.apache.roller.RollerException; +import org.apache.roller.weblogger.WebloggerException; import org.apache.roller.weblogger.business.themes.ThemeNotFoundException; import org.apache.roller.weblogger.business.RollerFactory; import org.apache.roller.weblogger.business.themes.ThemeManager; @@ -97,7 +97,7 @@ mLogger.error(msg, tnfe); throw new ResourceNotFoundException(msg); - } catch (RollerException re) { + } catch (WebloggerException re) { String msg = "RollerResourceLoader Error: " + re.getMessage(); mLogger.error( msg, re ); throw new ResourceNotFoundException(msg); @@ -137,7 +137,7 @@ } catch (ThemeNotFoundException tnfe) { // ignore - } catch (RollerException re) { + } catch (WebloggerException re) { // we don't like to see this happen, but oh well } Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java Sun Jun 3 13:18:24 2007 @@ -31,7 +31,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.RollerRuntimeConfig; import org.apache.roller.weblogger.business.Roller; import org.apache.roller.weblogger.business.RollerFactory; @@ -99,7 +99,7 @@ HttpServletRequest request, HttpServletResponse response, PageContext pageContext, - WeblogPageRequest pageRequest) throws RollerException { + WeblogPageRequest pageRequest) throws WebloggerException { mLogger.debug("setupContext( ctx = "+ctx+")"); @@ -169,7 +169,7 @@ ctx.put("pages", pageModel.getPages()); } catch (Exception e) { - throw new RollerException("ERROR creating Page Model",e); + throw new WebloggerException("ERROR creating Page Model",e); } // Add page helper to context @@ -206,7 +206,7 @@ Map ctx, Weblog weblog, Locale locale, - HttpServletRequest request) throws RollerException { + HttpServletRequest request) throws WebloggerException { // weblog cannot be null if(weblog == null) @@ -270,7 +270,7 @@ private static void loadCommentValues( Map ctx, - HttpServletRequest request,WeblogEntry entry) throws RollerException { + HttpServletRequest request,WeblogEntry entry) throws WebloggerException { mLogger.debug("Loading comment values"); @@ -317,7 +317,7 @@ HttpServletRequest request, Weblog website, WeblogCategory category) - throws RollerException { + throws WebloggerException { mLogger.debug("Loading rss values"); @@ -358,7 +358,7 @@ Map ctx, HttpServletRequest request, Weblog website, - ThemeTemplate page) throws RollerException { + ThemeTemplate page) throws WebloggerException { mLogger.debug("Loading utility objects"); @@ -396,7 +396,7 @@ Map ctx, HttpServletRequest request, Weblog website, - String locale) throws RollerException { + String locale) throws WebloggerException { mLogger.debug("Loading path values"); @@ -416,7 +416,7 @@ URL absUrl = new URL(RollerRuntimeConfig.getAbsoluteContextURL()); ctx.put("host", absUrl.getHost()); } catch (MalformedURLException e) { - throw new RollerException(e); + throw new WebloggerException(e); } } Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldFeedRequest.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldFeedRequest.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldFeedRequest.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldFeedRequest.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.pojos.WeblogTemplate; Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java Sun Jun 3 13:18:24 2007 @@ -29,7 +29,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.WeblogEntryPlugin; import org.apache.roller.weblogger.business.PluginManager; import org.apache.roller.weblogger.business.Roller; @@ -76,7 +76,7 @@ Date date,WeblogBookmarkFolder folder, String pageName, PageContext pageContext, - WeblogPageRequest pageRequest) throws RollerException { + WeblogPageRequest pageRequest) throws WebloggerException { // general request objects mRequest = request; Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageRequest.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageRequest.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageRequest.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageRequest.java Sun Jun 3 13:18:24 2007 @@ -26,7 +26,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.WeblogTemplate; import org.apache.roller.weblogger.util.Utilities; Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java Sun Jun 3 13:18:24 2007 @@ -33,7 +33,7 @@ import javax.servlet.http.HttpServletRequest; 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.BookmarkManager; import org.apache.roller.weblogger.business.referrers.RefererManager; @@ -134,7 +134,7 @@ List pages = Collections.EMPTY_LIST; try { pages = mWebsite.getPages(); - } catch (RollerException ex) { + } catch (WebloggerException ex) { mLogger.error("error getting weblog pages", ex); } @@ -182,7 +182,7 @@ tops.add(i,FolderDataWrapper.wrap((WeblogBookmarkFolder) it.next())); i++; } - } catch (RollerException e) { + } catch (WebloggerException e) { tops = new ArrayList(); } return tops; @@ -200,7 +200,7 @@ try { WeblogEntry entry = mWeblogMgr.getWeblogEntry(entryId); return entry.getComments(noSpam, approvedOnly).size(); - } catch (RollerException alreadyLogged) {} + } catch (WebloggerException alreadyLogged) {} return 0; } @@ -233,7 +233,7 @@ return (hitCount != null) ? hitCount.getDailyHits() : 0; - } catch (RollerException e) { + } catch (WebloggerException e) { mLogger.error("PageModel getDayHits()", e); } return 0; @@ -247,7 +247,7 @@ return FolderDataWrapper.wrap( mBookmarkMgr.getFolder( mUserMgr.getWebsiteByHandle(mWebsite.getHandle()), folderPath)); - } catch (RollerException e) { + } catch (WebloggerException e) { mLogger.error("PageModel getFolder()", e); } return null; @@ -269,7 +269,7 @@ page = TemplateWrapper.wrap(website.getPageByName(pageName)); } catch (NullPointerException npe) { mLogger.warn(npe.getMessage()); - } catch (RollerException e) { + } catch (WebloggerException e) { mLogger.error("ERROR getting user's page by name: " + e.getMessage(),e); } return page; @@ -643,7 +643,7 @@ } else { mCategories.put("zzz_null_zzz", ret); } - } catch (RollerException e) { + } catch (WebloggerException e) { mLogger.error(e); } } @@ -686,7 +686,7 @@ mNextEntry.getPubTime().after( new Date() )) { mNextEntry = null; } - } catch (RollerException e) { + } catch (WebloggerException e) { mLogger.error("PageModel.getNextEntry)", e); } } @@ -712,7 +712,7 @@ if(prevEntry != null) mPreviousEntry = WeblogEntryDataWrapper.wrap(prevEntry); - } catch (RollerException e) { + } catch (WebloggerException e) { mLogger.error("PageModel.getPreviousEntry)", e); } } @@ -773,7 +773,7 @@ if(folder != null) return FolderDataWrapper.wrap(folder); - } catch (RollerException e) { + } catch (WebloggerException e) { mLogger.error(e); } @@ -807,7 +807,7 @@ while(it.hasNext()) { recentComments.add(CommentDataWrapper.wrap((WeblogEntryComment) it.next())); } - } catch (RollerException e) { + } catch (WebloggerException e) { mLogger.error(e); } return recentComments; Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargets.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargets.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargets.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargets.java Sun Jun 3 13:18:24 2007 @@ -20,7 +20,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.pings.PingTargetManager; import org.apache.roller.weblogger.ui.struts2.common.PingTargetsBase; @@ -60,7 +60,7 @@ try { PingTargetManager pingTargetMgr = RollerFactory.getRoller().getPingTargetManager(); setPingTargets(pingTargetMgr.getCommonPingTargets()); - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error loading common ping targets", ex); // TODO: i18n addError("Error loading common ping targets"); Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.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.RollerFactory; import org.apache.roller.weblogger.business.UserManager; import org.apache.roller.weblogger.config.RollerConfig; @@ -111,7 +111,7 @@ return INPUT; - } catch (RollerException e) { + } catch (WebloggerException e) { log.error("Error adding new user", e); // TODO: i18n addError("Error creating user"); Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java Sun Jun 3 13:18:24 2007 @@ -26,7 +26,7 @@ import org.apache.commons.collections.ArrayStack; 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.WeblogEntryComment; @@ -113,7 +113,7 @@ setLastComment((WeblogEntryComment)comments.get(comments.size()-1)); loadNextPrevLinks(isMoreResults()); } - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error looking up comments", ex); // TODO: i18n addError("Error looking up comments"); @@ -162,7 +162,7 @@ setBulkDeleteCount(allMatchingComments.size()); } - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error looking up comments", ex); // TODO: i18n addError("Error looking up comments"); @@ -195,7 +195,7 @@ return execute(); - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error doing bulk delete", ex); // TODO: i18n addError("Bulk delete failed due to unexpected error"); Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java Sun Jun 3 13:18:24 2007 @@ -25,7 +25,7 @@ import java.util.Set; 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.PropertiesManager; import org.apache.roller.weblogger.business.RollerFactory; import org.apache.roller.weblogger.config.RollerRuntimeConfig; @@ -77,7 +77,7 @@ // just grab our properties map and make it available to the action PropertiesManager mgr = RollerFactory.getRoller().getPropertiesManager(); setProperties(mgr.getProperties()); - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error getting runtime properties map", ex); // TODO: i18n addError("Unexpected error accessing Roller properties"); @@ -151,7 +151,7 @@ // notify user of our success addMessage("weblogEdit.changesSaved"); - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error saving roller properties", ex); // TODO: i18n addError("error.update.rollerConfig"); Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java Sun Jun 3 13:18:24 2007 @@ -21,7 +21,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.RollerFactory; import org.apache.roller.weblogger.business.UserManager; import org.apache.roller.weblogger.pojos.User; @@ -119,7 +119,7 @@ getUser().resetPassword(RollerFactory.getRoller(), getBean().getPassword(), getBean().getPassword()); - } catch (RollerException e) { + } catch (WebloggerException e) { addMessage("yourProfile.passwordResetError"); } } @@ -145,7 +145,7 @@ return INPUT; - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("ERROR in action", ex); // TODO: i18n addError("unexpected error doing profile save"); Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java Sun Jun 3 13:18:24 2007 @@ -25,7 +25,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -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; @@ -77,7 +77,7 @@ response.getWriter().println(user.getEmailAddress()); } response.flushBuffer(); - } catch (RollerException e) { + } catch (WebloggerException e) { throw new ServletException(e.getMessage()); } } Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetAddBase.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetAddBase.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetAddBase.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetAddBase.java Sun Jun 3 13:18:24 2007 @@ -19,7 +19,7 @@ package org.apache.roller.weblogger.ui.struts2.common; import org.apache.commons.logging.Log; -import org.apache.roller.RollerException; +import org.apache.roller.weblogger.WebloggerException; import org.apache.roller.weblogger.business.RollerFactory; import org.apache.roller.weblogger.business.pings.PingTargetManager; import org.apache.roller.weblogger.pojos.PingTarget; @@ -68,7 +68,7 @@ return SUCCESS; - } catch (RollerException ex) { + } catch (WebloggerException ex) { getLogger().error("Error adding ping target", ex); // TODO: i18n addError("Error adding ping target."); @@ -94,7 +94,7 @@ } else if (!pingTargetMgr.isHostnameKnown(pingTarget)) { addError("pingTarget.unknownHost"); } - } catch (RollerException ex) { + } catch (WebloggerException ex) { getLogger().error("Error validating ping target", ex); // TODO: i18n addError("Error doing ping target validation"); Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetEditBase.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetEditBase.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetEditBase.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetEditBase.java Sun Jun 3 13:18:24 2007 @@ -20,7 +20,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; -import org.apache.roller.RollerException; +import org.apache.roller.weblogger.WebloggerException; import org.apache.roller.weblogger.business.RollerFactory; import org.apache.roller.weblogger.business.pings.PingTargetManager; import org.apache.roller.weblogger.pojos.PingTarget; @@ -53,7 +53,7 @@ try { setPingTarget(pingTargetMgr.getPingTarget(getBean().getId())); - } catch (RollerException ex) { + } catch (WebloggerException ex) { getLogger().error("Error looking up ping target - "+getBean().getId()); } @@ -110,7 +110,7 @@ addMessage("pingTarget.saved"); - } catch (RollerException ex) { + } catch (WebloggerException ex) { getLogger().error("Error saving ping target", ex); // TODO: i18n addError("Error saving ping target."); @@ -136,7 +136,7 @@ } else if (!pingTargetMgr.isHostnameKnown(pingTarget)) { addError("pingTarget.unknownHost"); } - } catch (RollerException ex) { + } catch (WebloggerException ex) { getLogger().error("Error validating ping target", ex); // TODO: i18n addError("Error doing ping target validation"); Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetsBase.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetsBase.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetsBase.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetsBase.java Sun Jun 3 13:18:24 2007 @@ -22,7 +22,7 @@ import java.util.List; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; -import org.apache.roller.RollerException; +import org.apache.roller.weblogger.WebloggerException; import org.apache.roller.weblogger.business.RollerFactory; import org.apache.roller.weblogger.business.pings.PingTargetManager; import org.apache.roller.weblogger.pojos.PingTarget; @@ -63,7 +63,7 @@ try { PingTargetManager pingTargetMgr = RollerFactory.getRoller().getPingTargetManager(); setPingTarget(pingTargetMgr.getPingTarget(getPingTargetId())); - } catch (RollerException ex) { + } catch (WebloggerException ex) { getLogger().error("Error looking up ping target - "+getPingTargetId(), ex); } } @@ -114,7 +114,7 @@ // TODO: i18n addMessage("Successfully deleted ping target: "+getPingTarget().getName()); - } catch (RollerException ex) { + } catch (WebloggerException ex) { getLogger().error("Error deleting ping target - "+getPingTargetId(), ex); // TODO: i18n addError("Error deleting ping target - "+getPingTargetId()); Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java Sun Jun 3 13:18:24 2007 @@ -23,7 +23,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.RollerFactory; @@ -74,7 +74,7 @@ return "menu"; } } - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("error checking for existing weblogs count", ex); } @@ -102,7 +102,7 @@ return "menu"; } } - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("error checking for existing weblogs count", ex); } @@ -137,7 +137,7 @@ return SUCCESS; - } catch (RollerException e) { + } catch (WebloggerException e) { log.error("ERROR adding weblog", e); // TODO: error handling addError(e.getMessage()); @@ -172,7 +172,7 @@ // reset handle getBean().setHandle(null); } - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("error checking for weblog", ex); // TODO: i18n addError("unexpected error"); Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java Sun Jun 3 13:18:24 2007 @@ -22,7 +22,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.UserManager; import org.apache.roller.weblogger.pojos.WeblogPermission; @@ -75,7 +75,7 @@ } else { addError("yourWebsites.permNotFound"); } - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error handling invitation accept - "+getInviteId(), ex); // TODO: i18n addError("invite accept failed."); @@ -100,7 +100,7 @@ } else { addError("yourWebsites.permNotFound"); } - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error handling invitation decline - "+getInviteId(), ex); // TODO: i18n addError("invite decline failed."); @@ -129,7 +129,7 @@ } addMessage("yourWebsites.resigned", perms.getWebsite().getHandle()); - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error doing weblog resign - "+getWebsiteId(), ex); // TODO: i18n addError("resignation failed."); Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java Sun Jun 3 13:18:24 2007 @@ -21,7 +21,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.RollerFactory; import org.apache.roller.weblogger.business.UserManager; import org.apache.roller.weblogger.pojos.User; @@ -89,7 +89,7 @@ existingUser.resetPassword(RollerFactory.getRoller(), getBean().getPasswordText(), getBean().getPasswordConfirm()); - } catch (RollerException e) { + } catch (WebloggerException e) { addMessage("yourProfile.passwordResetError"); } } @@ -105,7 +105,7 @@ return SUCCESS; - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("ERROR in action", ex); // TODO: i18n addError("unexpected error doing profile save"); Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java Sun Jun 3 13:18:24 2007 @@ -26,7 +26,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.RollerFactory; import org.apache.roller.weblogger.business.UserManager; import org.apache.roller.weblogger.config.RollerConfig; @@ -158,7 +158,7 @@ } // In more unlikely event that three retries isn't enough if (activationCode == null){ - throw new RollerException("error.add.user.activationCodeInUse"); + throw new WebloggerException("error.add.user.activationCodeInUse"); } } ud.setActivationCode(activationCode); @@ -173,7 +173,7 @@ try { // send activation mail to the user MailUtil.sendUserActivationEmail(ud); - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error sending activation email to - "+ud.getEmailAddress(), ex); } @@ -190,7 +190,7 @@ return SUCCESS; - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error adding new user", ex); // TODO: i18n addError("Error adding new user"); @@ -224,7 +224,7 @@ } } - } catch (RollerException e) { + } catch (WebloggerException e) { addError(e.getMessage()); log.error("ERROR in activateUser", e); } @@ -284,7 +284,7 @@ // reset user name getBean().setUserName(null); } - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("error checking for user", ex); // TODO: i18n addError("unexpected error"); Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java Sun Jun 3 13:18:24 2007 @@ -20,7 +20,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.ui.struts2.util.UIAction; @@ -60,7 +60,7 @@ UserManager umgr = RollerFactory.getRoller().getUserManager(); setUserCount(umgr.getUserCount()); setBlogCount(umgr.getWeblogCount()); - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error getting user/weblog counts", ex); } Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java Sun Jun 3 13:18:24 2007 @@ -23,7 +23,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.BookmarkManager; import org.apache.roller.weblogger.business.RollerFactory; import org.apache.roller.weblogger.pojos.WeblogBookmark; @@ -69,7 +69,7 @@ if(!StringUtils.isEmpty(getFolderId())) { setFolder(bmgr.getFolder(getFolderId())); } - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error looking up folder", ex); } } Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java Sun Jun 3 13:18:24 2007 @@ -23,7 +23,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.BookmarkManager; import org.apache.roller.weblogger.business.RollerFactory; import org.apache.roller.weblogger.pojos.WeblogBookmark; @@ -65,7 +65,7 @@ if(!StringUtils.isEmpty(getBean().getId())) { setBookmark(bmgr.getBookmark(getBean().getId())); } - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error looking up bookmark - "+getBean().getId(), ex); } } Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java Sun Jun 3 13:18:24 2007 @@ -27,7 +27,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.BookmarkManager; import org.apache.roller.weblogger.business.RollerFactory; import org.apache.roller.weblogger.pojos.WeblogBookmark; @@ -88,7 +88,7 @@ } else { setFolder(bmgr.getRootFolder(getActionWeblog())); } - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error looking up folder", ex); } } @@ -124,7 +124,7 @@ } setFolderPath(folderPath); } - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error building folders list", ex); // TODO: i18n addError("Error building folders list"); @@ -175,7 +175,7 @@ // notify caches CacheManager.invalidate(getActionWeblog()); - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error doing folder/bookmark deletes", ex); // TODO: i18n addError("Error doing folder/bookmark deletes"); @@ -229,7 +229,7 @@ // notify caches CacheManager.invalidate(getActionWeblog()); - } catch (RollerException e) { + } catch (WebloggerException e) { log.error("Error doing folder/bookmark move", e); addError("bookmarksForm.error.move"); } Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java Sun Jun 3 13:18:24 2007 @@ -26,7 +26,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.RollerFactory; import org.apache.roller.weblogger.business.WeblogManager; import org.apache.roller.weblogger.pojos.WeblogPermission; @@ -83,7 +83,7 @@ } else { setCategory(wmgr.getRootWeblogCategory(getActionWeblog())); } - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error looking up category", ex); } } @@ -115,7 +115,7 @@ } setCategoryPath(categoryPath); } - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error building categories list", ex); // TODO: i18n addError("Error building categories list"); @@ -157,7 +157,7 @@ RollerFactory.getRoller().flush(); } - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error moving categories", ex); addError("categoriesForm.error.move"); } Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java Sun Jun 3 13:18:24 2007 @@ -21,7 +21,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.RollerFactory; import org.apache.roller.weblogger.business.WeblogManager; import org.apache.roller.weblogger.pojos.WeblogCategory; @@ -67,7 +67,7 @@ if(!StringUtils.isEmpty(getCategoryId())) { setCategory(wmgr.getWeblogCategory(getCategoryId())); } - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error looking up category", ex); } } Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryBean.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryBean.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryBean.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryBean.java Sun Jun 3 13:18:24 2007 @@ -18,7 +18,7 @@ package org.apache.roller.weblogger.ui.struts2.editor; -import org.apache.roller.RollerException; +import org.apache.roller.weblogger.WebloggerException; import org.apache.roller.weblogger.pojos.WeblogCategory; @@ -66,7 +66,7 @@ } - public void copyTo(WeblogCategory dataHolder) throws RollerException { + public void copyTo(WeblogCategory dataHolder) throws WebloggerException { if(!dataHolder.getName().equals(this.name)) { dataHolder.updateName(this.name); Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java?view=diff&rev=543978&r1=543977&r2=543978 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java Sun Jun 3 13:18:24 2007 @@ -21,7 +21,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.RollerFactory; import org.apache.roller.weblogger.business.WeblogManager; import org.apache.roller.weblogger.pojos.WeblogCategory; @@ -64,7 +64,7 @@ if(!StringUtils.isEmpty(getBean().getId())) { setCategory(wmgr.getWeblogCategory(getBean().getId())); } - } catch (RollerException ex) { + } catch (WebloggerException ex) { log.error("Error looking up category", ex); } }