Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java?view=diff&rev=543951&r1=543950&r2=543951 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java Sun Jun 3 11:16:02 2007 @@ -35,7 +35,7 @@ import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; import org.apache.commons.lang.StringUtils; -import org.apache.roller.RollerException; +import org.apache.roller.weblogger.WebloggerException; import org.apache.roller.weblogger.business.MailProvider; import org.apache.roller.weblogger.business.RollerFactory; import org.apache.roller.weblogger.business.UserManager; @@ -66,11 +66,11 @@ * Send an email notice that a new pending entry has been submitted. */ public static void sendPendingEntryNotice(WeblogEntry entry) - throws RollerException { + throws WebloggerException { Session mailSession = MailProvider.getMailProvider().getSession(); if(mailSession == null) { - throw new RollerException("Couldn't get mail Session"); + throw new WebloggerException("Couldn't get mail Session"); } try { @@ -136,11 +136,11 @@ */ public static void sendWeblogInvitation(Weblog website, User user) - throws RollerException { + throws WebloggerException { Session mailSession = MailProvider.getMailProvider().getSession(); if(mailSession == null) { - throw new RollerException("ERROR: Notification email(s) not sent, " + throw new WebloggerException("ERROR: Notification email(s) not sent, " + "Roller's mail session not properly configured"); } @@ -183,7 +183,7 @@ MailUtil.sendTextMessage( from, to, cc, bcc, subject, content); } catch (MessagingException e) { - throw new RollerException("ERROR: Notification email(s) not sent, " + throw new WebloggerException("ERROR: Notification email(s) not sent, " + "due to Roller configuration or mail server problem.", e); } } @@ -193,11 +193,11 @@ * Send a weblog invitation email. */ public static void sendUserActivationEmail(User user) - throws RollerException { + throws WebloggerException { Session mailSession = MailProvider.getMailProvider().getSession(); if(mailSession == null) { - throw new RollerException("ERROR: Notification email(s) not sent, " + throw new WebloggerException("ERROR: Notification email(s) not sent, " + "Roller's mail session not properly configured"); } @@ -231,7 +231,7 @@ sendHTMLMessage(from, to, cc, bcc, subject, content); } catch (MessagingException e) { - throw new RollerException("ERROR: Problem sending activation email.", e); + throw new WebloggerException("ERROR: Problem sending activation email.", e); } } @@ -265,7 +265,7 @@ Session session = null; try { mailProvider = MailProvider.getMailProvider(); - } catch (RollerException ex) { + } catch (WebloggerException ex) { // The MailProvider should have been constructed long before // we get to this point, so this should never ever happen throw new RuntimeException("ERROR getting mail provider", ex);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/MediacastException.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/MediacastException.java?view=diff&rev=543951&r1=543950&r2=543951 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/MediacastException.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/MediacastException.java Sun Jun 3 11:16:02 2007 @@ -9,13 +9,13 @@ package org.apache.roller.weblogger.util; -import org.apache.roller.RollerException; +import org.apache.roller.weblogger.WebloggerException; /** * An exception thrown when dealing with Mediacast files. */ -public class MediacastException extends RollerException { +public class MediacastException extends WebloggerException { private int errorCode = 0; private String errorKey = null; Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/TimeZoneComparator.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/TimeZoneComparator.java?view=diff&rev=543951&r1=543950&r2=543951 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/TimeZoneComparator.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/TimeZoneComparator.java Sun Jun 3 11:16:02 2007 @@ -48,4 +48,5 @@ return false; } */ -} \ No newline at end of file + +} Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/Trackback.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/Trackback.java?view=diff&rev=543951&r1=543950&r2=543951 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/Trackback.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/Trackback.java Sun Jun 3 11:16:02 2007 @@ -34,7 +34,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.pojos.WeblogEntry; import org.jdom.Document; @@ -97,7 +97,7 @@ * Sends trackback from entry to remote URL. * See Trackback spec for details: http://www.sixapart.com/pronet/docs/trackback_spec */ - public RollerMessages send() throws RollerException { + public RollerMessages send() throws WebloggerException { RollerMessages messages = new RollerMessages(); Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/TrackbackNotAllowedException.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/TrackbackNotAllowedException.java?view=diff&rev=543951&r1=543950&r2=543951 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/TrackbackNotAllowedException.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/TrackbackNotAllowedException.java Sun Jun 3 11:16:02 2007 @@ -18,14 +18,14 @@ package org.apache.roller.weblogger.util; -import org.apache.roller.RollerException; +import org.apache.roller.weblogger.WebloggerException; /** * An exception thrown when a Trackback is formed for a url which is disallowed * by the system administrator. */ -public class TrackbackNotAllowedException extends RollerException { +public class TrackbackNotAllowedException extends WebloggerException { public TrackbackNotAllowedException(String url) { super(url); Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/cache/CacheManager.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/cache/CacheManager.java?view=diff&rev=543951&r1=543950&r2=543951 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/cache/CacheManager.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/cache/CacheManager.java Sun Jun 3 11:16:02 2007 @@ -26,7 +26,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.runnable.ContinuousWorkerThread; import org.apache.roller.weblogger.business.runnable.Job; import org.apache.roller.weblogger.config.RollerConfig; Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/Authenticator.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/Authenticator.java?view=diff&rev=543951&r1=543950&r2=543951 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/Authenticator.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/Authenticator.java Sun Jun 3 11:16:02 2007 @@ -16,7 +16,7 @@ package org.apache.roller.weblogger.webservices.adminprotocol; import javax.servlet.http.HttpServletRequest; -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; @@ -99,7 +99,7 @@ } return ud; - } catch (RollerException re) { + } catch (WebloggerException re) { throw new InternalException("ERROR: Could not get user: " + name, re); } } Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/BasicAuthenticator.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/BasicAuthenticator.java?view=diff&rev=543951&r1=543950&r2=543951 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/BasicAuthenticator.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/BasicAuthenticator.java Sun Jun 3 11:16:02 2007 @@ -20,7 +20,7 @@ import org.apache.commons.codec.binary.Base64; 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.User; /** Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java?view=diff&rev=543951&r1=543950&r2=543951 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java Sun Jun 3 11:16:02 2007 @@ -28,7 +28,7 @@ import org.apache.roller.weblogger.webservices.adminprotocol.sdk.EntrySet; import java.util.regex.Pattern; import java.util.regex.Matcher; -import org.apache.roller.RollerException; +import org.apache.roller.weblogger.WebloggerException; import org.apache.roller.weblogger.config.RollerRuntimeConfig; import org.apache.roller.weblogger.business.UserManager; import org.apache.roller.weblogger.pojos.User; @@ -208,7 +208,7 @@ } return wd; - } catch (RollerException re) { + } catch (WebloggerException re) { throw new InternalException("ERROR: Could not get weblog: " + handle, re); } } @@ -225,7 +225,7 @@ } return ud; - } catch (RollerException re) { + } catch (WebloggerException re) { throw new InternalException("ERROR: Could not get user: " + name, re); } } Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java?view=diff&rev=543951&r1=543950&r2=543951 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java Sun Jun 3 11:16:02 2007 @@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletRequest; import org.jdom.Document; import org.jdom.JDOMException; -import org.apache.roller.RollerException; +import org.apache.roller.weblogger.WebloggerException; import org.apache.roller.weblogger.business.UserManager; import org.apache.roller.weblogger.pojos.WeblogPermission; import org.apache.roller.weblogger.pojos.User; @@ -151,7 +151,7 @@ } EntrySet es = toMemberEntrySet((WeblogPermission[])perms.toArray(new WeblogPermission[0])); return es; - } catch (RollerException re) { + } catch (WebloggerException re) { throw new InternalException("ERROR: Could not get member collection", re); } } @@ -189,7 +189,7 @@ EntrySet es = toMemberEntrySet((WeblogPermission[])perms.toArray(new WeblogPermission[0])); return es; - } catch (RollerException re) { + } catch (WebloggerException re) { throw new InternalException("ERROR: Could not get entry for handle: " + handle + ", username: " + username, re); } } @@ -273,7 +273,7 @@ permissionsDatas.add(pd); } return toMemberEntrySet((WeblogPermission[])permissionsDatas.toArray(new WeblogPermission[0])); - } catch (RollerException re) { + } catch (WebloggerException re) { throw new InternalException("ERROR: Could not create members", re); } } @@ -301,7 +301,7 @@ WeblogPermission pd = getRoller().getUserManager().getPermissions(wd, ud); return pd; - } catch (RollerException re) { + } catch (WebloggerException re) { throw new InternalException("ERROR: Could not get permissions data for weblog handle: " + handle + ", user name: " + username, re); } } @@ -337,7 +337,7 @@ getRoller().flush(); CacheManager.invalidate(ud); CacheManager.invalidate(wd); - } catch (RollerException re) { + } catch (WebloggerException re) { throw new InternalException("ERROR: Could not update permissions data", re); } } @@ -371,7 +371,7 @@ EntrySet es = toMemberEntrySet(pds); return es; - } catch (RollerException re) { + } catch (WebloggerException re) { throw new InternalException("ERROR: Could not delete entry", re); } } Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerUserHandler.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerUserHandler.java?view=diff&rev=543951&r1=543950&r2=543951 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerUserHandler.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerUserHandler.java Sun Jun 3 11:16:02 2007 @@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletRequest; import org.jdom.Document; import org.jdom.JDOMException; -import org.apache.roller.RollerException; +import org.apache.roller.weblogger.WebloggerException; import org.apache.roller.weblogger.business.UserManager; import org.apache.roller.weblogger.pojos.User; import org.apache.roller.weblogger.util.cache.CacheManager; @@ -94,7 +94,7 @@ EntrySet es = toUserEntrySet((User[])users.toArray(new User[0])); return es; - } catch (RollerException re) { + } catch (WebloggerException re) { throw new InternalException("ERROR: Could not get user collection", re); } } @@ -164,7 +164,7 @@ userDatas.add(ud); } return toUserEntrySet((User[])userDatas.toArray(new User[0])); - } catch (RollerException re) { + } catch (WebloggerException re) { throw new InternalException("ERROR: Could not create users: " + c, re); } } @@ -210,7 +210,7 @@ mgr.saveUser(ud); getRoller().flush(); CacheManager.invalidate(ud); - } catch (RollerException re) { + } catch (WebloggerException re) { throw new InternalException("ERROR: could not update user data", re); } } @@ -229,7 +229,7 @@ getRoller().getUserManager().removeUser(ud); getRoller().flush(); CacheManager.invalidate(ud); - } catch (RollerException re) { + } catch (WebloggerException re) { throw new InternalException("ERROR: could not delete user data", re); } Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java?view=diff&rev=543951&r1=543950&r2=543951 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java Sun Jun 3 11:16:02 2007 @@ -30,7 +30,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdom.Document; -import org.apache.roller.RollerException; +import org.apache.roller.weblogger.WebloggerException; import org.apache.roller.weblogger.config.RollerRuntimeConfig; import org.apache.roller.weblogger.business.UserManager; import org.apache.roller.weblogger.pojos.WeblogPermission; @@ -107,7 +107,7 @@ EntrySet c = toWeblogEntrySet((User[])users.toArray(new User[0])); return c; - } catch (RollerException re) { + } catch (WebloggerException re) { throw new InternalException("ERROR: Could not get weblog collection", re); } } @@ -206,7 +206,7 @@ } return toWeblogEntrySet((Weblog[])websiteDatas.toArray(new Weblog[0])); - } catch (RollerException re) { + } catch (WebloggerException re) { throw new InternalException("ERROR: Could not create weblogs: " + c, re); } } @@ -253,7 +253,7 @@ mgr.saveWebsite(wd); getRoller().flush(); CacheManager.invalidate(wd); - } catch (RollerException re) { + } catch (WebloggerException re) { throw new InternalException("ERROR: Could not update website data", re); } } @@ -273,7 +273,7 @@ CacheManager.invalidate(wd); return es; - } catch (RollerException re) { + } catch (WebloggerException re) { throw new InternalException("ERROR: Could not delete entry: " + handle, re); } } Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomException.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomException.java?view=diff&rev=543951&r1=543950&r2=543951 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomException.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomException.java Sun Jun 3 11:16:02 2007 @@ -18,7 +18,7 @@ package org.apache.roller.weblogger.webservices.atomprotocol; import javax.servlet.http.HttpServletResponse; -import org.apache.roller.RollerException; +import org.apache.roller.weblogger.WebloggerException; /** * Exception thrown by AtomHandler. Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java?view=diff&rev=543951&r1=543950&r2=543951 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java Sun Jun 3 11:16:02 2007 @@ -57,7 +57,7 @@ import java.util.TreeSet; import javax.activation.FileTypeMap; import org.apache.commons.lang.StringUtils; -import org.apache.roller.RollerException; +import org.apache.roller.weblogger.WebloggerException; import org.apache.roller.weblogger.business.FileIOException; import org.apache.roller.weblogger.business.UserManager; import org.apache.roller.weblogger.config.RollerConfig; @@ -162,13 +162,13 @@ List perms = null; try { perms = roller.getUserManager().getAllPermissions(user); - } catch (RollerException re) { + } catch (WebloggerException re) { throw new AtomException("Getting user's weblogs", re); } String accept = null; try { accept = getAcceptedContentTypeRange(); - } catch (RollerException re) { + } catch (WebloggerException re) { throw new AtomException("Getting site's accept range", re); } if (perms != null) { @@ -245,7 +245,7 @@ * Build accept range by taking things that appear to be content-type rules * from site's file-upload allowed extensions. */ - private String getAcceptedContentTypeRange() throws RollerException { + private String getAcceptedContentTypeRange() throws WebloggerException { StringBuffer sb = new StringBuffer(); Roller roller = RollerFactory.getRoller(); Map config = roller.getPropertiesManager().getProperties(); @@ -369,7 +369,7 @@ log.debug("Exiting"); return feed; - } catch (RollerException re) { + } catch (WebloggerException re) { throw new AtomException("Getting entry collection"); } } @@ -476,7 +476,7 @@ log.debug("Existing"); return feed; - } catch (RollerException re) { + } catch (WebloggerException re) { throw new AtomException("Getting resource collection"); } } @@ -517,7 +517,7 @@ log.debug("Exiting"); return createAtomEntry(rollerEntry); - } catch (RollerException re) { + } catch (WebloggerException re) { throw new AtomException("Posting entry", re); } } @@ -555,7 +555,7 @@ } } throw new AtomNotFoundException("Cannot find specified entry/resource"); - } catch (RollerException re) { + } catch (WebloggerException re) { throw new AtomException("Getting entry"); } } @@ -589,7 +589,7 @@ } throw new AtomNotFoundException("Cannot find specified entry/resource"); - } catch (RollerException re) { + } catch (WebloggerException re) { throw new AtomException("Updating entry"); } } @@ -641,7 +641,7 @@ } throw new AtomNotFoundException("cannot find specified entry/resource"); - } catch (RollerException re) { + } catch (WebloggerException re) { throw new AtomException("deleting entry"); } } @@ -707,7 +707,7 @@ } throw new AtomException("Incorrect path information"); - } catch (RollerException re) { + } catch (WebloggerException re) { throw new AtomException("Posting media"); } } @@ -1091,7 +1091,7 @@ /** * Copy fields from ROME entry to Roller entry. */ - private void copyToRollerEntry(Entry entry,WeblogEntry rollerEntry) throws RollerException { + private void copyToRollerEntry(Entry entry,WeblogEntry rollerEntry) throws WebloggerException { Timestamp current = new Timestamp(System.currentTimeMillis()); Timestamp pubTime = current; @@ -1181,7 +1181,7 @@ return path; } - private void reindexEntry(WeblogEntry entry) throws RollerException { + private void reindexEntry(WeblogEntry entry) throws WebloggerException { IndexManager manager = roller.getIndexManager(); // TODO: figure out what's up here and at WeblogEntryFormAction line 696 Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/json/TagStatsServlet.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/json/TagStatsServlet.java?view=diff&rev=543951&r1=543950&r2=543951 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/json/TagStatsServlet.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/json/TagStatsServlet.java Sun Jun 3 11:16:02 2007 @@ -26,7 +26,7 @@ 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; @@ -112,8 +112,8 @@ UserManager umgr = RollerFactory.getRoller().getUserManager(); website = umgr.getWebsiteByHandle(handle, Boolean.TRUE); if (website == null) - throw new RollerException(); - } catch (RollerException ex) { + throw new WebloggerException(); + } catch (WebloggerException ex) { response.sendError(HttpServletResponse.SC_NOT_FOUND, "Weblog handle not found."); return; } @@ -143,7 +143,7 @@ response.getWriter().println("\n ]\n}"); response.flushBuffer(); - } catch (RollerException e) { + } catch (WebloggerException e) { throw new ServletException(e.getMessage()); } } Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java?view=diff&rev=543951&r1=543950&r2=543951 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java Sun Jun 3 11:16:02 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.config.RollerRuntimeConfig; import org.apache.roller.weblogger.business.Roller; import org.apache.roller.weblogger.business.RollerFactory; @@ -151,7 +151,7 @@ flushPageCache(page.getWebsite()); return true; - } catch (RollerException e) { + } catch (WebloggerException e) { String msg = "ERROR in BlooggerAPIHander.setTemplate"; mLogger.error(msg,e); throw new XmlRpcException(UNKNOWN_EXCEPTION,msg); @@ -248,7 +248,7 @@ result.put("firstname", firstname); return result; - } catch (RollerException e) { + } catch (WebloggerException e) { String msg = "ERROR in BlooggerAPIHander.getInfo"; mLogger.error(msg,e); throw new XmlRpcException(UNKNOWN_EXCEPTION,msg); Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java?view=diff&rev=543951&r1=543950&r2=543951 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java Sun Jun 3 11:16:02 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.config.RollerRuntimeConfig; import org.apache.roller.weblogger.business.FileManager; import org.apache.roller.weblogger.business.Roller; @@ -363,7 +363,7 @@ returnStruct.put("url", fileLink); return returnStruct; - } catch (RollerException e) { + } catch (WebloggerException e) { String msg = "ERROR in MetaWeblogAPIHandler.newMediaObject"; mLogger.error(msg,e); throw new XmlRpcException(UNKNOWN_EXCEPTION, msg); Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/TestUtils.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/TestUtils.java?view=diff&rev=543951&r1=543950&r2=543951 ============================================================================== --- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/TestUtils.java (original) +++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/TestUtils.java Sun Jun 3 11:16:02 2007 @@ -39,7 +39,7 @@ import org.apache.roller.weblogger.pojos.WeblogCategory; import org.apache.roller.weblogger.pojos.WeblogEntry; import org.apache.roller.weblogger.pojos.Weblog; -import org.apache.roller.RollerException; +import org.apache.roller.weblogger.WebloggerException; /** @@ -93,7 +93,7 @@ User user = mgr.getUserByUserName(username); if(user == null) - throw new RollerException("error inserting new user"); + throw new WebloggerException("error inserting new user"); return user; } @@ -146,7 +146,7 @@ Weblog weblog = mgr.getWebsiteByHandle(handle); if(weblog == null) - throw new RollerException("error setting up weblog"); + throw new WebloggerException("error setting up weblog"); return weblog; } @@ -211,7 +211,7 @@ WeblogCategory cat = mgr.getWeblogCategory(testCat.getId()); if(cat == null) - throw new RollerException("error setting up weblog category"); + throw new WebloggerException("error setting up weblog category"); return cat; } @@ -266,7 +266,7 @@ WeblogEntry entry = mgr.getWeblogEntry(testEntry.getId()); if(entry == null) - throw new RollerException("error setting up weblog entry"); + throw new WebloggerException("error setting up weblog entry"); return entry; } @@ -316,7 +316,7 @@ WeblogEntryComment comment = mgr.getComment(testComment.getId()); if(comment == null) - throw new RollerException("error setting up comment"); + throw new WebloggerException("error setting up comment"); return comment; } @@ -360,7 +360,7 @@ PingTarget ping = pingMgr.getPingTarget(testPing.getId()); if(ping == null) - throw new RollerException("error setting up ping target"); + throw new WebloggerException("error setting up ping target"); return ping; } @@ -402,7 +402,7 @@ autoPing = mgr.getAutoPing(autoPing.getId()); if(autoPing == null) - throw new RollerException("error setting up auto ping"); + throw new WebloggerException("error setting up auto ping"); return autoPing; } @@ -446,7 +446,7 @@ testCount = mgr.getHitCount(testCount.getId()); if(testCount == null) - throw new RollerException("error setting up hit count"); + throw new WebloggerException("error setting up hit count"); return testCount; } @@ -494,7 +494,7 @@ WeblogBookmarkFolder cat = mgr.getFolder(testFolder.getId()); if(testFolder == null) - throw new RollerException("error setting up weblog folder"); + throw new WebloggerException("error setting up weblog folder"); return testFolder; } @@ -520,7 +520,7 @@ /** * Convenience method that returns managed copy of given user. */ - public static User getManagedUser(User user) throws RollerException { + public static User getManagedUser(User user) throws WebloggerException { UserManager mgr = RollerFactory.getRoller().getUserManager(); return mgr.getUser(user.getId()); } @@ -528,7 +528,7 @@ /** * Convenience method that returns managed copy of given website. */ - public static Weblog getManagedWebsite(Weblog website) throws RollerException { + public static Weblog getManagedWebsite(Weblog website) throws WebloggerException { UserManager mgr = RollerFactory.getRoller().getUserManager(); return mgr.getWebsite(website.getId()); } @@ -536,7 +536,7 @@ /** * Convenience method that returns managed copy of given WeblogEntry. */ - public static WeblogEntry getManagedWeblogEntry(WeblogEntry weblogEntry) throws RollerException { + public static WeblogEntry getManagedWeblogEntry(WeblogEntry weblogEntry) throws WebloggerException { WeblogManager mgr = RollerFactory.getRoller().getWeblogManager(); return mgr.getWeblogEntry(weblogEntry.getId()); } Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/BookmarkTest.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/BookmarkTest.java?view=diff&rev=543951&r1=543950&r2=543951 ============================================================================== --- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/BookmarkTest.java (original) +++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/BookmarkTest.java Sun Jun 3 11:16:02 2007 @@ -27,7 +27,7 @@ import junit.framework.TestSuite; 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.TestUtils; import org.apache.roller.weblogger.business.BookmarkManager; import org.apache.roller.weblogger.business.Roller; @@ -288,7 +288,7 @@ // Move folder into one of it's children bmgr.moveFolder(f1, f3); TestUtils.endSession(true); - } catch (RollerException e) { + } catch (WebloggerException e) { safe = true; } assertTrue(safe); Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/CommentTest.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/CommentTest.java?view=diff&rev=543951&r1=543950&r2=543951 ============================================================================== --- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/CommentTest.java (original) +++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/CommentTest.java Sun Jun 3 11:16:02 2007 @@ -26,7 +26,7 @@ import junit.framework.TestSuite; 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.TestUtils; import org.apache.roller.weblogger.pojos.WeblogEntryComment; import org.apache.roller.weblogger.pojos.User; @@ -230,7 +230,7 @@ try { wmgr.removeWeblogEntry(TestUtils.getManagedWeblogEntry(entry)); TestUtils.endSession(true); - } catch (RollerException e) { + } catch (WebloggerException e) { ex = e; } assertNull(ex); @@ -254,7 +254,7 @@ weblog = TestUtils.getManagedWebsite(weblog); umgr.removeWebsite(weblog); TestUtils.endSession(true); - } catch (RollerException e) { + } catch (WebloggerException e) { StringWriter sw = new StringWriter(); PrintWriter pw = new PrintWriter(sw); e.printStackTrace(pw); Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java?view=diff&rev=543951&r1=543950&r2=543951 ============================================================================== --- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java (original) +++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java Sun Jun 3 11:16:02 2007 @@ -160,7 +160,7 @@ /** - * Ensure that duplicate folder name will throw RollerException + * Ensure that duplicate folder name will throw WebloggerException */ public void testUniquenessOfFolderNames() throws Exception { Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderParentDeletesTest.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderParentDeletesTest.java?view=diff&rev=543951&r1=543950&r2=543951 ============================================================================== --- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderParentDeletesTest.java (original) +++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderParentDeletesTest.java Sun Jun 3 11:16:02 2007 @@ -24,7 +24,7 @@ import junit.framework.TestCase; 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.TestUtils; import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder; import org.apache.roller.weblogger.pojos.User; @@ -103,7 +103,7 @@ UserManager umgr = RollerFactory.getRoller().getUserManager(); umgr.removeWebsite(TestUtils.getManagedWebsite(testWeblog)); TestUtils.endSession(true); - } catch (RollerException e) { + } catch (WebloggerException e) { ex = e; } assertNull(ex); Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/RefererTest.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/RefererTest.java?view=diff&rev=543951&r1=543950&r2=543951 ============================================================================== --- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/RefererTest.java (original) +++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/RefererTest.java Sun Jun 3 11:16:02 2007 @@ -26,7 +26,7 @@ import junit.framework.TestSuite; 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.TestUtils; import org.apache.roller.weblogger.business.PropertiesManager; import org.apache.roller.weblogger.business.referrers.RefererManager; @@ -194,7 +194,7 @@ } - public void testRefererProcessing() throws RollerException { + public void testRefererProcessing() throws WebloggerException { RefererManager rmgr = RollerFactory.getRoller().getRefererManager(); Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryCRUDTest.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryCRUDTest.java?view=diff&rev=543951&r1=543950&r2=543951 ============================================================================== --- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryCRUDTest.java (original) +++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryCRUDTest.java Sun Jun 3 11:16:02 2007 @@ -22,7 +22,7 @@ import junit.framework.TestCase; 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.TestUtils; import org.apache.roller.weblogger.pojos.User; import org.apache.roller.weblogger.pojos.WeblogCategory; Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryParentDeletesTest.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryParentDeletesTest.java?view=diff&rev=543951&r1=543950&r2=543951 ============================================================================== --- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryParentDeletesTest.java (original) +++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryParentDeletesTest.java Sun Jun 3 11:16:02 2007 @@ -21,7 +21,7 @@ import junit.framework.TestCase; 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.TestUtils; import org.apache.roller.weblogger.pojos.User; import org.apache.roller.weblogger.pojos.WeblogCategory; @@ -99,7 +99,7 @@ UserManager umgr = RollerFactory.getRoller().getUserManager(); umgr.removeWebsite(TestUtils.getManagedWebsite(testWeblog)); TestUtils.endSession(true); - } catch (RollerException e) { + } catch (WebloggerException e) { ex = e; } assertNull(ex); Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/xmlrpc/RollerXmlRpcServerTest.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/xmlrpc/RollerXmlRpcServerTest.java?view=diff&rev=543951&r1=543950&r2=543951 ============================================================================== --- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/xmlrpc/RollerXmlRpcServerTest.java (original) +++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/xmlrpc/RollerXmlRpcServerTest.java Sun Jun 3 11:16:02 2007 @@ -46,7 +46,6 @@ import org.apache.roller.weblogger.pojos.WeblogEntry; import org.apache.roller.weblogger.pojos.Weblog; import org.apache.roller.weblogger.ui.MockRollerContext; -import org.apache.roller.weblogger.ui.core.RollerRequest; import org.apache.roller.weblogger.util.RegexUtil; import org.apache.xmlrpc.webserver.XmlRpcServlet; @@ -158,8 +157,6 @@ mockRequest = mockFactory.getMockRequest(); mockRequest.setContextPath("/roller"); - RollerRequest.getRollerRequest( - mockRequest, mockFactory.getMockServletContext()); servletTestModule = new ServletTestModule(mockFactory); servletTestModule.createServlet(XmlRpcServlet.class);
