You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2007/06/03 22:18:33 UTC
svn commit: r543978 [8/8] - in /roller/branches/roller_guice/apps/weblogger:
src/java/org/apache/roller/weblogger/
src/java/org/apache/roller/weblogger/business/
src/java/org/apache/roller/weblogger/business/hibernate/
src/java/org/apache/roller/weblog...
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java Sun Jun 3 13:18:24 2007
@@ -25,7 +25,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java Sun Jun 3 13:18:24 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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargets.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargets.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargets.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargets.java Sun Jun 3 13:18:24 2007
@@ -20,7 +20,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.pings.PingTargetManager;
import org.apache.roller.weblogger.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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java Sun Jun 3 13:18:24 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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java Sun Jun 3 13:18:24 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;
@@ -180,8 +179,6 @@
return SUCCESS;
- } catch (RollerPermissionsException e) {
- addError("error.permissions.deniedSave");
} catch (Exception e) {
log.error("Error saving new entry", e);
// TODO: i18n
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java Sun Jun 3 13:18:24 2007
@@ -24,7 +24,7 @@
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java Sun Jun 3 13:18:24 2007
@@ -28,7 +28,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java Sun Jun 3 13:18:24 2007
@@ -25,7 +25,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java Sun Jun 3 13:18:24 2007
@@ -20,7 +20,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java Sun Jun 3 13:18:24 2007
@@ -21,7 +21,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderBean.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderBean.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderBean.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderBean.java Sun Jun 3 13:18:24 2007
@@ -18,7 +18,7 @@
package org.apache.roller.weblogger.ui.struts2.editor;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java Sun Jun 3 13:18:24 2007
@@ -21,7 +21,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java Sun Jun 3 13:18:24 2007
@@ -20,7 +20,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java Sun Jun 3 13:18:24 2007
@@ -20,7 +20,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java Sun Jun 3 13:18:24 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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java Sun Jun 3 13:18:24 2007
@@ -24,7 +24,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.config.RollerConfig;
@@ -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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java Sun Jun 3 13:18:24 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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java Sun Jun 3 13:18:24 2007
@@ -20,7 +20,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java Sun Jun 3 13:18:24 2007
@@ -25,7 +25,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java Sun Jun 3 13:18:24 2007
@@ -23,7 +23,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfigBean.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfigBean.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfigBean.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfigBean.java Sun Jun 3 13:18:24 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;
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java Sun Jun 3 13:18:24 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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/MediacastException.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/MediacastException.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/MediacastException.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/MediacastException.java Sun Jun 3 13:18:24 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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/TimeZoneComparator.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/TimeZoneComparator.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/TimeZoneComparator.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/TimeZoneComparator.java Sun Jun 3 13:18:24 2007
@@ -48,4 +48,5 @@
return false;
}
*/
-}
\ No newline at end of file
+
+}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/Trackback.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/Trackback.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/Trackback.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/Trackback.java Sun Jun 3 13:18:24 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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/TrackbackNotAllowedException.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/TrackbackNotAllowedException.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/TrackbackNotAllowedException.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/TrackbackNotAllowedException.java Sun Jun 3 13:18:24 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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/cache/CacheManager.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/cache/CacheManager.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/cache/CacheManager.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/cache/CacheManager.java Sun Jun 3 13:18:24 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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/Authenticator.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/Authenticator.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/Authenticator.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/Authenticator.java Sun Jun 3 13:18:24 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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/BasicAuthenticator.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/BasicAuthenticator.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/BasicAuthenticator.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/BasicAuthenticator.java Sun Jun 3 13:18:24 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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java Sun Jun 3 13:18:24 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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java Sun Jun 3 13:18:24 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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerUserHandler.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerUserHandler.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerUserHandler.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerUserHandler.java Sun Jun 3 13:18:24 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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java Sun Jun 3 13:18:24 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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomException.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomException.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomException.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomException.java Sun Jun 3 13:18:24 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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java Sun Jun 3 13:18:24 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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/json/TagStatsServlet.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/json/TagStatsServlet.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/json/TagStatsServlet.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/json/TagStatsServlet.java Sun Jun 3 13:18:24 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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java Sun Jun 3 13:18:24 2007
@@ -33,7 +33,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.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/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java Sun Jun 3 13:18:24 2007
@@ -28,7 +28,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.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/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/TestUtils.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/TestUtils.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/TestUtils.java (original)
+++ roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/TestUtils.java Sun Jun 3 13:18:24 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/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/BookmarkTest.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/BookmarkTest.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/BookmarkTest.java (original)
+++ roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/BookmarkTest.java Sun Jun 3 13:18:24 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/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/CommentTest.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/CommentTest.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/CommentTest.java (original)
+++ roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/CommentTest.java Sun Jun 3 13:18:24 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/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java (original)
+++ roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java Sun Jun 3 13:18:24 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/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderParentDeletesTest.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderParentDeletesTest.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderParentDeletesTest.java (original)
+++ roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderParentDeletesTest.java Sun Jun 3 13:18:24 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/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/RefererTest.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/RefererTest.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/RefererTest.java (original)
+++ roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/RefererTest.java Sun Jun 3 13:18:24 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/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryCRUDTest.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryCRUDTest.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryCRUDTest.java (original)
+++ roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryCRUDTest.java Sun Jun 3 13:18:24 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/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryParentDeletesTest.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryParentDeletesTest.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryParentDeletesTest.java (original)
+++ roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryParentDeletesTest.java Sun Jun 3 13:18:24 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/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/xmlrpc/RollerXmlRpcServerTest.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/xmlrpc/RollerXmlRpcServerTest.java?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/xmlrpc/RollerXmlRpcServerTest.java (original)
+++ roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/xmlrpc/RollerXmlRpcServerTest.java Sun Jun 3 13:18:24 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);
Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/roller.properties
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/roller.properties?view=diff&rev=543978&r1=543977&r2=543978
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/roller.properties (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/roller.properties Sun Jun 3 13:18:24 2007
@@ -70,7 +70,7 @@
mail.password
#---------------------------------
-guice.backend.module=org.apache.roller.business.hibernate.HibernateModule
+guice.backend.module=org.apache.roller.weblogger.business.hibernate.HibernateModule
# Hibernate dialect: You MUST override this to use a database other than MySQL4
hibernate.dialect=org.hibernate.dialect.MySQLDialect