You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2007/06/03 20:16:11 UTC
svn commit: r543951 [6/7] - in /roller/trunk/apps/weblogger:
src/java/org/apache/roller/weblogger/business/
src/java/org/apache/roller/weblogger/business/hibernate/
src/java/org/apache/roller/weblogger/business/jpa/
src/java/org/apache/roller/weblogger...
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java Sun Jun 3 11:16:02 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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/ThemeResourceLoader.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/ThemeResourceLoader.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/ThemeResourceLoader.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/ThemeResourceLoader.java Sun Jun 3 11:16:02 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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java Sun Jun 3 11:16:02 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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldFeedRequest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldFeedRequest.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldFeedRequest.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldFeedRequest.java Sun Jun 3 11:16:02 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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java Sun Jun 3 11:16:02 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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageRequest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageRequest.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageRequest.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageRequest.java Sun Jun 3 11:16:02 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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java Sun Jun 3 11:16:02 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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargets.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargets.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargets.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargets.java Sun Jun 3 11:16:02 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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java Sun Jun 3 11:16:02 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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java Sun Jun 3 11:16:02 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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java Sun Jun 3 11:16:02 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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java Sun Jun 3 11:16:02 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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java Sun Jun 3 11:16:02 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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetAddBase.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetAddBase.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetAddBase.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetAddBase.java Sun Jun 3 11:16:02 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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetEditBase.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetEditBase.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetEditBase.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetEditBase.java Sun Jun 3 11:16:02 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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetsBase.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetsBase.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetsBase.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetsBase.java Sun Jun 3 11:16:02 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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java Sun Jun 3 11:16:02 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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java Sun Jun 3 11:16:02 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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java Sun Jun 3 11:16:02 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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java Sun Jun 3 11:16:02 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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java Sun Jun 3 11:16:02 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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java Sun Jun 3 11:16:02 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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java Sun Jun 3 11:16:02 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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java Sun Jun 3 11:16:02 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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java Sun Jun 3 11:16:02 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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java Sun Jun 3 11:16:02 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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryBean.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryBean.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryBean.java Sun Jun 3 11:16:02 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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java Sun Jun 3 11:16:02 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);
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java Sun Jun 3 11:16:02 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.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogPermission;
@@ -73,7 +73,7 @@
if(!StringUtils.isEmpty(getRemoveId())) {
setCategory(wmgr.getWeblogCategory(getRemoveId()));
}
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error looking up category", ex);
}
}
@@ -96,7 +96,7 @@
allCategories.add(cat);
}
}
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error building categories list", ex);
// TODO: i18n
addError("Error building categories list");
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java Sun Jun 3 11:16:02 2007
@@ -25,7 +25,7 @@
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
@@ -108,7 +108,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");
@@ -156,7 +156,7 @@
setBulkDeleteCount(allMatchingComments.size());
}
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error looking up comments", ex);
// TODO: i18n
addError("Error looking up comments");
@@ -189,7 +189,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/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargets.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargets.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargets.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargets.java Sun Jun 3 11:16:02 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.config.PingConfig;
@@ -63,7 +63,7 @@
if(!PingConfig.getDisallowCustomTargets()) try {
PingTargetManager pingTargetMgr = RollerFactory.getRoller().getPingTargetManager();
setPingTargets(pingTargetMgr.getCustomPingTargets(getActionWeblog()));
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error loading common ping targets", ex);
// TODO: i18n
addError("Error loading common ping targets");
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java Sun Jun 3 11:16:02 2007
@@ -23,7 +23,7 @@
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogCategory;
@@ -106,7 +106,7 @@
setFirstEntry((WeblogEntry)entries.get(0));
setLastEntry((WeblogEntry)entries.get(entries.size()-1));
}
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error looking up entries", ex);
// TODO: i18n
addError("Error looking up entries");
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java Sun Jun 3 11:16:02 2007
@@ -22,7 +22,6 @@
import java.util.Date;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.RollerPermissionsException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogPermission;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java Sun Jun 3 11:16:02 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.PluginManager;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogEntryPlugin;
@@ -56,7 +56,7 @@
if (entry.isPublished()) {
try {
manager.addEntryReIndexOperation(entry);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.warn("Trouble triggering entry indexing", ex);
}
}
@@ -67,7 +67,7 @@
* Get recent weblog entries using request parameters to determine
* username, date, and category name parameters.
* @return List of WeblogEntryData objects.
- * @throws RollerException
+ * @throws WebloggerException
*/
public List<WeblogEntry> getRecentPublishedEntries() {
List<WeblogEntry> entries = Collections.EMPTY_LIST;
@@ -85,7 +85,7 @@
null,
null,
0, 20);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error getting entries list", ex);
}
return entries;
@@ -96,7 +96,7 @@
* Get recent weblog entries using request parameters to determine
* username, date, and category name parameters.
* @return List of WeblogEntryData objects.
- * @throws RollerException
+ * @throws WebloggerException
*/
public List<WeblogEntry> getRecentScheduledEntries() {
List<WeblogEntry> entries = Collections.EMPTY_LIST;
@@ -114,7 +114,7 @@
null,
null,
0, 20);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error getting entries list", ex);
}
return entries;
@@ -124,7 +124,7 @@
* Get recent weblog entries using request parameters to determine
* username, date, and category name parameters.
* @return List of WeblogEntryData objects.
- * @throws RollerException
+ * @throws WebloggerException
*/
public List<WeblogEntry> getRecentDraftEntries() {
List<WeblogEntry> entries = Collections.EMPTY_LIST;
@@ -142,7 +142,7 @@
null,
null,
0, 20); // maxEntries
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error getting entries list", ex);
}
return entries;
@@ -152,7 +152,7 @@
* Get recent weblog entries using request parameters to determine
* username, date, and category name parameters.
* @return List of WeblogEntryData objects.
- * @throws RollerException
+ * @throws WebloggerException
*/
public List<WeblogEntry> getRecentPendingEntries() {
List<WeblogEntry> entries = Collections.EMPTY_LIST;
@@ -170,7 +170,7 @@
null,
null,
0, 20);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error getting entries list", ex);
}
return entries;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.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.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogEntryAttribute;
@@ -253,7 +253,7 @@
}
- public void copyTo(WeblogEntry entry) throws RollerException {
+ public void copyTo(WeblogEntry entry) throws WebloggerException {
entry.setTitle(getTitle());
entry.setStatus(getStatus());
@@ -268,19 +268,19 @@
try {
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
cat = wmgr.getWeblogCategory(getCategoryId());
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error getting category by id", ex);
}
if(cat == null) {
- throw new RollerException("Category could not be found - "+getCategoryId());
+ throw new WebloggerException("Category could not be found - "+getCategoryId());
} else if(!entry.getWebsite().equals(cat.getWebsite())) {
- throw new RollerException("Illegal category, not owned by action weblog");
+ throw new WebloggerException("Illegal category, not owned by action weblog");
} else {
entry.setCategory(cat);
}
} else {
- throw new RollerException("No category specified");
+ throw new WebloggerException("No category specified");
}
// join values from all plugins into a single string
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java Sun Jun 3 11:16:02 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.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogPermission;
@@ -75,7 +75,7 @@
try {
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
setEntry(wmgr.getWeblogEntry(getBean().getId()));
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error looking up entry by id - "+getBean().getId(), ex);
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java Sun Jun 3 11:16:02 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.WeblogManager;
import org.apache.roller.weblogger.business.search.IndexManager;
@@ -55,7 +55,7 @@
try {
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
setRemoveEntry(wmgr.getWeblogEntry(getRemoveId()));
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error looking up entry by id - "+getRemoveId(), ex);
}
}
@@ -79,7 +79,7 @@
entry.setStatus(WeblogEntry.DRAFT);
IndexManager manager = RollerFactory.getRoller().getIndexManager();
manager.addEntryReIndexOperation(entry);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.warn("Trouble triggering entry indexing", ex);
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java Sun Jun 3 11:16:02 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.BookmarkManager;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
@@ -66,7 +66,7 @@
if(!StringUtils.isEmpty(getFolderId())) {
setFolder(bmgr.getFolder(getFolderId()));
}
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error looking up folder - "+getFolderId(), ex);
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderBean.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderBean.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderBean.java Sun Jun 3 11:16:02 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.WeblogBookmarkFolder;
@@ -57,7 +57,7 @@
}
- public void copyTo(WeblogBookmarkFolder dataHolder) throws RollerException {
+ public void copyTo(WeblogBookmarkFolder dataHolder) throws WebloggerException {
if(!dataHolder.getName().equals(this.name)) {
dataHolder.updateName(this.name);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java Sun Jun 3 11:16:02 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.BookmarkManager;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
@@ -65,7 +65,7 @@
if(!StringUtils.isEmpty(getBean().getId())) {
setFolder(bmgr.getFolder(getBean().getId()));
}
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error looking up folder", ex);
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java Sun Jun 3 11:16:02 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.config.RollerConfig;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.UserManager;
@@ -97,7 +97,7 @@
if (user == null) {
addError("inviteMember.error.userNotFound");
}
- } catch(RollerException ex) {
+ } catch(WebloggerException ex) {
log.error("Error looking up user by id - "+getUserName(), ex);
// TODO: i18n
addError("Error looking up invitee");
@@ -118,7 +118,7 @@
addError("inviteMember.error.userAlreadyMember");
}
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error looking up permissions for weblog - "+getActionWeblog().getHandle(), ex);
// TODO: i18n
addError("Error checking existing permissions");
@@ -134,7 +134,7 @@
try {
MailUtil.sendWeblogInvitation(getActionWeblog(), user);
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
// TODO: this should be an error except that struts2 misbehaves
// when we chain this action to the next one thinking that an error
// means that validation broke during the chain
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java Sun Jun 3 11:16:02 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.config.PingConfig;
import org.apache.roller.weblogger.business.pings.AutoPingManager;
import org.apache.roller.weblogger.business.pings.PingTargetManager;
@@ -84,7 +84,7 @@
// load selected ping target, if possible
if(getPingTargetId() != null) try {
setPingTarget(pingTargetMgr.getPingTarget(getPingTargetId()));
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error looking up ping target - "+getPingTargetId(), ex);
}
@@ -97,7 +97,7 @@
setCustomPingTargets(pingTargetMgr.getCustomPingTargets(getActionWeblog()));
}
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error loading ping target lists for weblog - "+getActionWeblog().getHandle(), ex);
// TODO: i18n
addError("Error loading ping targets");
@@ -217,7 +217,7 @@
List autopings = Collections.EMPTY_LIST;
try {
autopings = autoPingMgr.getAutoPingsByWebsite(getActionWeblog());
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error looking up auto pings for weblog - "+getActionWeblog().getHandle(), ex);
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java Sun Jun 3 11:16:02 2007
@@ -21,7 +21,7 @@
import java.util.Date;
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;
@@ -86,7 +86,7 @@
mgr.savePage(stylesheet);
RollerFactory.getRoller().flush();
}
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error finding/adding stylesheet tempalate from weblog - "+getActionWeblog().getHandle(), ex);
}
}
@@ -137,7 +137,7 @@
// success message
addMessage("pageForm.save.success", stylesheet.getName());
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error updating stylesheet template for weblog - "+getActionWeblog().getHandle(), ex);
// TODO: i18n
addError("Error saving template");
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java Sun Jun 3 11:16:02 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;
@@ -67,7 +67,7 @@
try {
UserManager mgr = RollerFactory.getRoller().getUserManager();
setTemplate(mgr.getPage(getBean().getId()));
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error looking up template - "+getBean().getId(), ex);
}
}
@@ -139,7 +139,7 @@
// success message
addMessage("pageForm.save.success", template.getName());
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error updating page - "+getBean().getId(), ex);
// TODO: i18n
addError("Error saving template");
@@ -158,7 +158,7 @@
if(umgr.getPageByName(getActionWeblog(), getBean().getName()) != null) {
addError("pagesForm.error.alreadyExists", getBean().getName());
}
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error checking page name uniqueness", ex);
}
}
@@ -171,7 +171,7 @@
if(umgr.getPageByLink(getActionWeblog(), getBean().getLink()) != null) {
addError("pagesForm.error.alreadyExists", getBean().getLink());
}
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error checking page link uniqueness", ex);
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java Sun Jun 3 11:16:02 2007
@@ -19,7 +19,7 @@
package org.apache.roller.weblogger.ui.struts2.editor;
import java.util.Locale;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.WeblogTemplate;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java Sun Jun 3 11:16:02 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.pojos.WeblogPermission;
@@ -60,7 +60,7 @@
if(getRemoveId() != null) try {
UserManager umgr = RollerFactory.getRoller().getUserManager();
setTemplate(umgr.getPage(getRemoveId()));
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error looking up template by id - "+getRemoveId(), ex);
// TODO: i18n
addError("Could not find template to remove - "+getRemoveId());
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java Sun Jun 3 11:16:02 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.business.RollerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.pojos.WeblogPermission;
@@ -92,7 +92,7 @@
}
setAvailableActions(availableActions);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error getting templates for weblog - "+getActionWeblog().getHandle(), ex);
// TODO: i18n
addError("Error getting template list");
@@ -148,7 +148,7 @@
setNewTmplName(null);
setNewTmplAction(null);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error adding new template for weblog - "+getActionWeblog().getHandle(), ex);
// TODO: i18n
addError("Error adding new template");
@@ -180,7 +180,7 @@
if(existingPage != null) {
addError("pagesForm.error.alreadyExists", getNewTmplName());
}
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error checking for existing template", ex);
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java Sun Jun 3 11:16:02 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.RollerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.themes.SharedTheme;
@@ -110,7 +110,7 @@
ThemeManager themeMgr = RollerFactory.getRoller().getThemeManager();
SharedTheme importTheme = themeMgr.getTheme(getImportThemeId());
themeMgr.importTheme(getActionWeblog(), importTheme);
- } catch(RollerException re) {
+ } catch(WebloggerException re) {
log.error("Error customizing theme for weblog - "+getActionWeblog().getHandle(), re);
// TODO: i18n
addError("Error importing theme");
@@ -155,7 +155,7 @@
// TODO: i18n
addMessage("Successfully updated theme");
- } catch(RollerException re) {
+ } catch(WebloggerException re) {
log.error("Error saving weblog - "+getActionWeblog().getHandle(), re);
addError("Error setting theme");
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfigBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfigBean.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfigBean.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfigBean.java Sun Jun 3 11:16:02 2007
@@ -21,7 +21,7 @@
import java.sql.Timestamp;
import java.util.Date;
import org.apache.commons.lang.StringUtils;
-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;