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 [5/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/core/tags/calendar/WeblogCalendarModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java Sun Jun 3 11:16:02 2007
@@ -27,7 +27,7 @@
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogEntry;
@@ -62,7 +62,7 @@
try {
this.weblog = pageRequest.getWeblog();
if(weblog == null) {
- throw new RollerException("unable to lookup weblog: "+
+ throw new WebloggerException("unable to lookup weblog: "+
pageRequest.getWeblogHandle());
}
pageLink = pageRequest.getWeblogPageName();
@@ -118,7 +118,7 @@
WeblogEntry prevEntry = (WeblogEntry)prevEntries.get(0);
prevMonth = DateUtil.getStartOfMonth(new Date(prevEntry.getPubTime().getTime()));
}
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("ERROR determining previous non-empty month");
}
@@ -144,7 +144,7 @@
WeblogEntry nextEntry = (WeblogEntry)nextEntries.get(0);
nextMonth = DateUtil.getStartOfMonth(new Date(nextEntry.getPubTime().getTime()));
}
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("ERROR determining next non-empty month");
}
@@ -167,7 +167,7 @@
null,WeblogEntry.PUBLISHED, // status
locale,
0, -1);
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error(e);
monthMap = new HashMap();
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/RenderingException.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/RenderingException.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/RenderingException.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/RenderingException.java Sun Jun 3 11:16:02 2007
@@ -18,13 +18,13 @@
package org.apache.roller.weblogger.ui.rendering;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
/**
* A generic Roller rendering exception.
*/
-public class RenderingException extends RollerException {
+public class RenderingException extends WebloggerException {
public RenderingException(String s) {
super(s);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java Sun Jun 3 11:16:02 2007
@@ -22,7 +22,7 @@
import javax.servlet.jsp.PageContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.wrapper.WebsiteDataWrapper;
import org.apache.roller.weblogger.ui.core.tags.calendar.BigWeblogCalendarModel;
import org.apache.roller.weblogger.ui.core.tags.calendar.CalendarTag;
@@ -51,7 +51,7 @@
/** Init page model based on request */
- public void init(Map initData) throws RollerException {
+ public void init(Map initData) throws WebloggerException {
// extract page context
this.pageContext = (PageContext) initData.get("pageContext");
@@ -59,7 +59,7 @@
// we expect the init data to contain a weblogRequest object
WeblogRequest weblogRequest = (WeblogRequest) initData.get("weblogRequest");
if(weblogRequest == null) {
- throw new RollerException("expected weblogRequest from init data");
+ throw new WebloggerException("expected weblogRequest from init data");
}
// CalendarModel only works on page requests, so cast weblogRequest
@@ -67,7 +67,7 @@
if(weblogRequest instanceof WeblogPageRequest) {
this.pageRequest = (WeblogPageRequest) weblogRequest;
} else {
- throw new RollerException("weblogRequest is not a WeblogPageRequest."+
+ throw new WebloggerException("weblogRequest is not a WeblogPageRequest."+
" CalendarModel only supports page requests.");
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/ConfigModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/ConfigModel.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/ConfigModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/ConfigModel.java Sun Jun 3 11:16:02 2007
@@ -21,7 +21,7 @@
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
@@ -41,7 +41,7 @@
/** Init model */
- public void init(Map map) throws RollerException {
+ public void init(Map map) throws WebloggerException {
// no-op
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java Sun Jun 3 11:16:02 2007
@@ -23,7 +23,7 @@
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.pojos.wrapper.WebsiteDataWrapper;
@@ -48,12 +48,12 @@
private Weblog weblog = null;
- public void init(Map initData) throws RollerException {
+ public void init(Map initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
WeblogRequest weblogRequest = (WeblogRequest) initData.get("weblogRequest");
if(weblogRequest == null) {
- throw new RollerException("expected weblogRequest from init data");
+ throw new WebloggerException("expected weblogRequest from init data");
}
// PageModel only works on page requests, so cast weblogRequest
@@ -61,7 +61,7 @@
if(weblogRequest instanceof WeblogFeedRequest) {
this.feedRequest = (WeblogFeedRequest) weblogRequest;
} else {
- throw new RollerException("weblogRequest is not a WeblogFeedRequest."+
+ throw new WebloggerException("weblogRequest is not a WeblogFeedRequest."+
" FeedModel only supports feed requests.");
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/MenuModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/MenuModel.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/MenuModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/MenuModel.java Sun Jun 3 11:16:02 2007
@@ -21,7 +21,7 @@
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.ui.core.util.menu.Menu;
import org.apache.roller.weblogger.ui.core.util.menu.MenuHelper;
import org.apache.roller.weblogger.ui.rendering.util.WeblogPageRequest;
@@ -47,12 +47,12 @@
/** Init page model based on request */
- public void init(Map initData) throws RollerException {
+ public void init(Map initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
WeblogRequest weblogRequest = (WeblogRequest) initData.get("weblogRequest");
if(weblogRequest == null) {
- throw new RollerException("expected weblogRequest from init data");
+ throw new WebloggerException("expected weblogRequest from init data");
}
// MenuModel only works on page requests, so cast weblogRequest
@@ -60,7 +60,7 @@
if(weblogRequest instanceof WeblogPageRequest) {
this.pageRequest = (WeblogPageRequest) weblogRequest;
} else {
- throw new RollerException("weblogRequest is not a WeblogPageRequest."+
+ throw new WebloggerException("weblogRequest is not a WeblogPageRequest."+
" MenuModel only supports page requests.");
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/MessageModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/MessageModel.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/MessageModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/MessageModel.java Sun Jun 3 11:16:02 2007
@@ -20,7 +20,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.ui.rendering.util.WeblogRequest;
import org.apache.roller.weblogger.util.I18nMessages;
@@ -41,12 +41,12 @@
/** Init page model based on request */
- public void init(Map initData) throws RollerException {
+ public void init(Map initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
WeblogRequest weblogRequest = (WeblogRequest) initData.get("weblogRequest");
if(weblogRequest == null) {
- throw new RollerException("expected weblogRequest from init data");
+ throw new WebloggerException("expected weblogRequest from init data");
}
// get messages util based on desired locale
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/Model.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/Model.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/Model.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/Model.java Sun Jun 3 11:16:02 2007
@@ -19,7 +19,7 @@
package org.apache.roller.weblogger.ui.rendering.model;
import java.util.Map;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
/**
@@ -36,6 +36,6 @@
/**
* Initialize.
*/
- public void init(Map params) throws RollerException;
+ public void init(Map params) throws WebloggerException;
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/ModelLoader.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/ModelLoader.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/ModelLoader.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/ModelLoader.java Sun Jun 3 11:16:02 2007
@@ -24,7 +24,7 @@
import javax.servlet.jsp.PageContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.RollerConfig;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.ui.rendering.util.WeblogPageRequest;
@@ -48,7 +48,7 @@
HttpServletRequest request,
HttpServletResponse response,
PageContext pageContext,
- WeblogPageRequest pageRequest) throws RollerException {
+ WeblogPageRequest pageRequest) throws WebloggerException {
// Only load old models if it's enabled
if (RollerConfig.getBooleanProperty("rendering.legacyModels.enabled")) {
@@ -67,7 +67,7 @@
if (weblog.getPageModels() != null) {
try {
loadModels(weblog.getPageModels(), model, initData, false);
- } catch(RollerException ex) {
+ } catch(WebloggerException ex) {
// shouldn't happen, but log it just in case
log.error("Error loading weblog custom models", ex);
}
@@ -83,7 +83,7 @@
*/
public static void loadModels(String modelsString, Map model,
Map initData, boolean fail)
- throws RollerException {
+ throws WebloggerException {
String[] models = Utilities.stringToStringArray(modelsString, ",");
for(int i=0; i < models.length; i++) {
@@ -92,7 +92,7 @@
Model pageModel = (Model) modelClass.newInstance();
pageModel.init(initData);
model.put(pageModel.getModelName(), pageModel);
- } catch (RollerException re) {
+ } catch (WebloggerException re) {
if(fail) {
throw re;
} else {
@@ -100,19 +100,19 @@
}
} catch (ClassNotFoundException cnfe) {
if(fail) {
- throw new RollerException("Error finding model: " + models[i], cnfe);
+ throw new WebloggerException("Error finding model: " + models[i], cnfe);
} else {
log.warn("Error finding model: " + models[i]);
}
} catch (InstantiationException ie) {
if(fail) {
- throw new RollerException("Error insantiating model: " + models[i], ie);
+ throw new WebloggerException("Error insantiating model: " + models[i], ie);
} else {
log.warn("Error insantiating model: " + models[i]);
}
} catch (IllegalAccessException iae) {
if(fail) {
- throw new RollerException("Error accessing model: " + models[i], iae);
+ throw new WebloggerException("Error accessing model: " + models[i], iae);
} else {
log.warn("Error accessing model: " + models[i]);
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.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.Roller;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
@@ -74,12 +74,12 @@
/**
* Init page model based on request.
*/
- public void init(Map initData) throws RollerException {
+ public void init(Map initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
WeblogRequest weblogRequest = (WeblogRequest) initData.get("weblogRequest");
if(weblogRequest == null) {
- throw new RollerException("expected weblogRequest from init data");
+ throw new WebloggerException("expected weblogRequest from init data");
}
// PageModel only works on page requests, so cast weblogRequest
@@ -87,7 +87,7 @@
if(weblogRequest instanceof WeblogPageRequest) {
this.pageRequest = (WeblogPageRequest) weblogRequest;
} else {
- throw new RollerException("weblogRequest is not a WeblogPageRequest."+
+ throw new WebloggerException("weblogRequest is not a WeblogPageRequest."+
" PageModel only supports page requests.");
}
@@ -155,7 +155,7 @@
} else {
try {
return TemplateWrapper.wrap(weblog.getDefaultPage());
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error getting default page", ex);
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PlanetModel.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.planet.business.PlanetFactory;
import org.apache.roller.planet.business.PlanetManager;
import org.apache.roller.planet.pojos.PlanetData;
@@ -56,12 +56,12 @@
return "planet";
}
- public void init(Map initData) throws RollerException {
+ public void init(Map initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
this.weblogRequest = (WeblogRequest) initData.get("weblogRequest");
if(this.weblogRequest == null) {
- throw new RollerException("expected weblogRequest from init data");
+ throw new WebloggerException("expected weblogRequest from init data");
}
if (weblogRequest instanceof WeblogPageRequest) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewPageModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewPageModel.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewPageModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewPageModel.java Sun Jun 3 11:16:02 2007
@@ -19,7 +19,7 @@
package org.apache.roller.weblogger.ui.rendering.model;
import java.util.Map;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryDataWrapper;
import org.apache.roller.weblogger.ui.rendering.pagers.WeblogEntriesLatestPager;
import org.apache.roller.weblogger.ui.rendering.pagers.WeblogEntriesPager;
@@ -39,12 +39,12 @@
/**
* Init model.
*/
- public void init(Map initData) throws RollerException {
+ public void init(Map initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
WeblogRequest weblogRequest = (WeblogRequest) initData.get("weblogRequest");
if(weblogRequest == null) {
- throw new RollerException("expected weblogRequest from init data");
+ throw new WebloggerException("expected weblogRequest from init data");
}
// PreviewPageModel only works on preview requests, so cast weblogRequest
@@ -52,7 +52,7 @@
if(weblogRequest instanceof WeblogPreviewRequest) {
this.previewRequest = (WeblogPreviewRequest) weblogRequest;
} else {
- throw new RollerException("weblogRequest is not a WeblogPreviewRequest."+
+ throw new WebloggerException("weblogRequest is not a WeblogPreviewRequest."+
" PreviewPageModel only supports preview requests.");
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewURLModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewURLModel.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewURLModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewURLModel.java Sun Jun 3 11:16:02 2007
@@ -19,7 +19,7 @@
package org.apache.roller.weblogger.ui.rendering.model;
import java.util.Map;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.ui.rendering.util.WeblogPreviewRequest;
import org.apache.roller.weblogger.ui.rendering.util.WeblogRequest;
@@ -37,12 +37,12 @@
private String locale = null;
- public void init(Map initData) throws RollerException {
+ public void init(Map initData) throws WebloggerException {
// need a weblog request so that we can know the weblog and locale
WeblogRequest weblogRequest = (WeblogRequest) initData.get("weblogRequest");
if(weblogRequest == null) {
- throw new RollerException("Expected 'weblogRequest' init param!");
+ throw new WebloggerException("Expected 'weblogRequest' init param!");
}
// PreviewURLModel only works on preview requests, so cast weblogRequest
@@ -50,7 +50,7 @@
if(weblogRequest instanceof WeblogPreviewRequest) {
this.previewRequest = (WeblogPreviewRequest) weblogRequest;
} else {
- throw new RollerException("weblogRequest is not a WeblogPreviewRequest."+
+ throw new WebloggerException("weblogRequest is not a WeblogPreviewRequest."+
" PreviewURLModel only supports preview requests.");
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java Sun Jun 3 11:16:02 2007
@@ -32,7 +32,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.lucene.document.Document;
import org.apache.lucene.search.Hits;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.Roller;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
@@ -86,18 +86,18 @@
}
- public void init(Map initData) throws RollerException {
+ public void init(Map initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
WeblogRequest weblogRequest = (WeblogRequest) initData.get("weblogRequest");
if(weblogRequest == null) {
- throw new RollerException("expected weblogRequest from init data");
+ throw new WebloggerException("expected weblogRequest from init data");
}
if(weblogRequest instanceof WeblogFeedRequest) {
this.feedRequest = (WeblogFeedRequest) weblogRequest;
} else {
- throw new RollerException("weblogRequest is not a WeblogFeedRequest."+
+ throw new WebloggerException("weblogRequest is not a WeblogFeedRequest."+
" FeedModel only supports feed requests.");
}
@@ -154,7 +154,7 @@
return pager;
}
- private void convertHitsToEntries(Hits hits) throws RollerException {
+ private void convertHitsToEntries(Hits hits) throws WebloggerException {
// determine offset
this.offset = feedRequest.getPage() * this.entryCount;
@@ -212,7 +212,7 @@
this.categories = categories;
}
} catch(IOException e) {
- throw new RollerException(e);
+ throw new WebloggerException(e);
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java Sun Jun 3 11:16:02 2007
@@ -29,7 +29,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.lucene.document.Document;
import org.apache.lucene.search.Hits;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.search.FieldConstants;
import org.apache.roller.weblogger.business.search.operations.SearchOperation;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
@@ -75,12 +75,12 @@
private String errorMessage = null;
- public void init(Map initData) throws RollerException {
+ public void init(Map initData) throws WebloggerException {
// we expect the init data to contain a searchRequest object
searchRequest = (WeblogSearchRequest) initData.get("searchRequest");
if(searchRequest == null) {
- throw new RollerException("expected searchRequest from init data");
+ throw new WebloggerException("expected searchRequest from init data");
}
// let parent initialize
@@ -143,7 +143,7 @@
return pager;
}
- private void convertHitsToEntries(Hits hits) throws RollerException {
+ private void convertHitsToEntries(Hits hits) throws WebloggerException {
// determine offset
this.offset = searchRequest.getPageNum() * RESULTS_PER_PAGE;
@@ -201,7 +201,7 @@
this.categories = categories;
}
} catch(IOException e) {
- throw new RollerException(e);
+ throw new WebloggerException(e);
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.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.Roller;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.UserManager;
@@ -73,12 +73,12 @@
return "site";
}
- public void init(Map initData) throws RollerException {
+ public void init(Map initData) throws WebloggerException {
// we expect the init data to contain a weblogRequest object
this.weblogRequest = (WeblogRequest) initData.get("weblogRequest");
if(this.weblogRequest == null) {
- throw new RollerException("expected weblogRequest from init data");
+ throw new WebloggerException("expected weblogRequest from init data");
}
if (weblogRequest instanceof WeblogPageRequest) {
@@ -562,7 +562,7 @@
Roller roller = RollerFactory.getRoller();
WeblogManager mgr = roller.getWeblogManager();
count = mgr.getCommentCount();
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("Error getting comment count for site ", e);
}
return count;
@@ -575,7 +575,7 @@
Roller roller = RollerFactory.getRoller();
WeblogManager mgr = roller.getWeblogManager();
count = mgr.getEntryCount();
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("Error getting entry count for site", e);
}
return count;
@@ -588,7 +588,7 @@
Roller roller = RollerFactory.getRoller();
UserManager mgr = roller.getUserManager();
count = mgr.getWeblogCount();
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("Error getting weblog count for site", e);
}
return count;
@@ -601,7 +601,7 @@
Roller roller = RollerFactory.getRoller();
UserManager mgr = roller.getUserManager();
count = mgr.getUserCount();
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("Error getting user count for site", e);
}
return count;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/URLModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/URLModel.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/URLModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/URLModel.java Sun Jun 3 11:16:02 2007
@@ -24,7 +24,7 @@
import javax.servlet.jsp.PageContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
@@ -63,12 +63,12 @@
return "url";
}
- public void init(Map initData) throws RollerException {
+ public void init(Map initData) throws WebloggerException {
// need a weblog request so that we can know the weblog and locale
WeblogRequest weblogRequest = (WeblogRequest) initData.get("weblogRequest");
if(weblogRequest == null) {
- throw new RollerException("Expected 'weblogRequest' init param!");
+ throw new WebloggerException("Expected 'weblogRequest' init param!");
}
this.weblog = weblogRequest.getWeblog();
@@ -275,7 +275,7 @@
if(entry != null) {
return URLUtilities.getEntryEditURL(weblog.getHandle(), entry.getId(), false);
}
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error looking up entry by anchor - "+anchor, ex);
}
return null;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java Sun Jun 3 11:16:02 2007
@@ -32,7 +32,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryDataWrapper;
import org.apache.roller.weblogger.pojos.wrapper.WebsiteDataWrapper;
import org.apache.roller.weblogger.ui.core.RollerSession;
@@ -102,7 +102,7 @@
/** Init page model based on request */
- public void init(Map initData) throws RollerException {
+ public void init(Map initData) throws WebloggerException {
// extract request object
this.request = (HttpServletRequest) initData.get("request");
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPermalinkPager.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPermalinkPager.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPermalinkPager.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPermalinkPager.java Sun Jun 3 11:16:02 2007
@@ -26,7 +26,7 @@
import java.util.TreeMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.Roller;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
@@ -141,7 +141,7 @@
&& nextEntry.getStatus().equals(WeblogEntry.PUBLISHED)) {
nextEntry = null;
}
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("ERROR: getting next entry", e);
}
@@ -159,7 +159,7 @@
&& prevEntry.getStatus().equals(WeblogEntry.PUBLISHED)) {
prevEntry = null;
}
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("ERROR: getting prev entry", e);
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/AcronymsPlugin.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/AcronymsPlugin.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/AcronymsPlugin.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/AcronymsPlugin.java Sun Jun 3 11:16:02 2007
@@ -26,7 +26,7 @@
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogEntryPlugin;
@@ -72,7 +72,7 @@
}
- public void init(Weblog website) throws RollerException {}
+ public void init(Weblog website) throws WebloggerException {}
public String render(WeblogEntry entry, String str) {
@@ -123,7 +123,7 @@
* Look for any _acronyms Page and parse it into Properties.
* @param website
* @return
- * @throws RollerException
+ * @throws WebloggerException
*/
private Properties loadAcronyms(Weblog website) {
Properties acronyms = new Properties();
@@ -134,7 +134,7 @@
if (acronymsPage != null) {
acronyms = parseAcronymPage(acronymsPage, acronyms);
}
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
// not much we can do about it
mLogger.warn(e);
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/BookmarkPlugin.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/BookmarkPlugin.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/BookmarkPlugin.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/BookmarkPlugin.java Sun Jun 3 11:16:02 2007
@@ -27,7 +27,7 @@
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.BookmarkManager;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogEntryPlugin;
@@ -65,7 +65,7 @@
}
- public void init(Weblog website) throws RollerException {}
+ public void init(Weblog website) throws WebloggerException {}
public String render(WeblogEntry entry, String str) {
@@ -75,9 +75,9 @@
WeblogBookmarkFolder rootFolder = bMgr.getRootFolder(entry.getWebsite());
text = matchBookmarks(text, rootFolder);
text = lookInFolders(text, rootFolder.getFolders());
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
// nothing much I can do, go with default "Weblog" value
- // could be RollerException or NullPointerException
+ // could be WebloggerException or NullPointerException
mLogger.warn(e);
}
return text;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/ConvertLineBreaksPlugin.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/ConvertLineBreaksPlugin.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/ConvertLineBreaksPlugin.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/ConvertLineBreaksPlugin.java Sun Jun 3 11:16:02 2007
@@ -23,7 +23,7 @@
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.business.WeblogEntryPlugin;
@@ -67,7 +67,7 @@
}
- public void init(Weblog website) throws RollerException {
+ public void init(Weblog website) throws WebloggerException {
// we don't need to do any init.
mLogger.debug("initing");
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/ObfuscateEmailPlugin.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/ObfuscateEmailPlugin.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/ObfuscateEmailPlugin.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/ObfuscateEmailPlugin.java Sun Jun 3 11:16:02 2007
@@ -22,7 +22,7 @@
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.WeblogEntryPlugin;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
@@ -57,7 +57,7 @@
}
- public void init(Weblog website) throws RollerException {}
+ public void init(Weblog website) throws WebloggerException {}
public String render(WeblogEntry entry, String str) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/SearchPluginBase.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/SearchPluginBase.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/SearchPluginBase.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/SearchPluginBase.java Sun Jun 3 11:16:02 2007
@@ -19,7 +19,7 @@
package org.apache.roller.weblogger.ui.rendering.plugins;
import org.apache.commons.logging.Log;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
@@ -53,7 +53,7 @@
*
* @see org.apache.roller.weblogger.model.PagePlugin#init(WebsiteData, Object, String baseUrl, org.apache.velocity.context.Context)
*/
- public void init(Weblog website) throws RollerException {
+ public void init(Weblog website) throws WebloggerException {
if (mLogger.isDebugEnabled()) {
mLogger.debug(getClass().getName() + "; version: " + getVersion() + "; base version " + baseVersion);
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/SmileysPlugin.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/SmileysPlugin.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/SmileysPlugin.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/SmileysPlugin.java Sun Jun 3 11:16:02 2007
@@ -26,7 +26,7 @@
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.business.WeblogEntryPlugin;
import org.apache.roller.weblogger.pojos.WeblogEntry;
@@ -77,7 +77,7 @@
* later use. Need an HttpServletRequest though so that we can
* get the ServletContext Path. But only do it once.
*/
- public synchronized void init(Weblog website) throws RollerException {
+ public synchronized void init(Weblog website) throws WebloggerException {
// don't do this work if Smileys already loaded
if (SmileysPlugin.smileyPatterns.length < 1) {
String baseURL = RollerRuntimeConfig.getAbsoluteContextURL();
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/TopicTagPlugin.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/TopicTagPlugin.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/TopicTagPlugin.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/TopicTagPlugin.java Sun Jun 3 11:16:02 2007
@@ -21,7 +21,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.velocity.context.Context;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.RollerConfig;
import org.apache.roller.weblogger.business.BookmarkManager;
import org.apache.roller.weblogger.business.RollerFactory;
@@ -132,7 +132,7 @@
* @param ctx Plugins may place objects into the Velocity Context.
* @see PagWeblogEntryPluginit(org.apache.roller.weblogger.presentation.RollerRequest, org.apache.velocity.context.Context)
*/
- public void init(Weblog website) throws RollerException
+ public void init(Weblog website) throws WebloggerException
{
if (mLogger.isDebugEnabled())
{
@@ -162,13 +162,13 @@
}
catch (PatternSyntaxException e)
{
- throw new RollerException("Invalid regular expression for topic tags with bookmark '" +
+ throw new WebloggerException("Invalid regular expression for topic tags with bookmark '" +
tagRegexWithBookmark + "': " + e.getMessage());
}
int groupCount = tagPatternWithBookmark.matcher("").groupCount();
if (groupCount != 2)
{
- throw new RollerException("Regular expression for topic tags with bookmark '" + tagRegexWithBookmark +
+ throw new WebloggerException("Regular expression for topic tags with bookmark '" + tagRegexWithBookmark +
"' contains wrong number of capture groups. Must have exactly 2. Contains " + groupCount);
}
@@ -178,13 +178,13 @@
}
catch (PatternSyntaxException e)
{
- throw new RollerException("Invalid regular expression for topic tags without bookmark '" +
+ throw new WebloggerException("Invalid regular expression for topic tags without bookmark '" +
tagRegexWithoutBookmark + "': " + e.getMessage());
}
groupCount = tagPatternWithoutBookmark.matcher("").groupCount();
if (groupCount != 1)
{
- throw new RollerException("Regular expression for topic tags without bookmark '" + tagRegexWithoutBookmark +
+ throw new WebloggerException("Regular expression for topic tags without bookmark '" + tagRegexWithoutBookmark +
"' contains wrong number of capture groups. Must have exactly 1. Contains " + groupCount);
}
@@ -304,7 +304,7 @@
* If ignoreBookmarks property is set, an empty map is returned.
* @return map of the user's bookmarks (type BookmarkData), keyed by name (type String).
*/
- protected Map buildBookmarkMap(Weblog website) throws RollerException
+ protected Map buildBookmarkMap(Weblog website) throws WebloggerException
{
Map bookmarkMap = new HashMap();
if (RollerConfig.getBooleanProperty("plugins.topictag.ignoreBookmarks")) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java Sun Jun 3 11:16:02 2007
@@ -38,7 +38,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.RollerConfig;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.business.search.IndexManager;
@@ -211,14 +211,14 @@
weblog = uMgr.getWebsiteByHandle(commentRequest.getWeblogHandle());
if(weblog == null) {
- throw new RollerException("unable to lookup weblog: "+
+ throw new WebloggerException("unable to lookup weblog: "+
commentRequest.getWeblogHandle());
}
// lookup entry specified by comment request
entry = commentRequest.getWeblogEntry();
if(entry == null) {
- throw new RollerException("unable to lookup entry: "+
+ throw new WebloggerException("unable to lookup entry: "+
commentRequest.getWeblogAnchor());
}
@@ -324,7 +324,7 @@
cf = new WeblogEntryCommentForm();
}
- } catch (RollerException re) {
+ } catch (WebloggerException re) {
log.error("Error saving comment", re);
error = re.getMessage();
}
@@ -351,7 +351,7 @@
* Re-index the WeblogEntry so that the new comment gets indexed.
*/
private void reindexEntry(WeblogEntry entry)
- throws RollerException {
+ throws WebloggerException {
IndexManager manager = RollerFactory.getRoller().getIndexManager();
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java Sun Jun 3 11:16:02 2007
@@ -28,7 +28,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.config.RollerConfig;
@@ -96,7 +96,7 @@
weblog = feedRequest.getWeblog();
if(weblog == null) {
- throw new RollerException("unable to lookup weblog: "+
+ throw new WebloggerException("unable to lookup weblog: "+
feedRequest.getWeblogHandle());
}
@@ -194,7 +194,7 @@
// tags specified. make sure they exist.
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
invalid = !wmgr.getTagComboExists(feedRequest.getTags(), (isSiteWide) ? null : weblog);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
invalid = true;
}
}
@@ -241,7 +241,7 @@
ModelLoader.loadModels(SearchResultsFeedModel.class.getName(), model, initData, true);
}
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("ERROR loading model for page", ex);
if(!response.isCommitted()) response.reset();
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java Sun Jun 3 11:16:02 2007
@@ -33,7 +33,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.HitCountQueue;
import org.apache.roller.weblogger.business.referrers.IncomingReferrer;
import org.apache.roller.weblogger.business.referrers.ReferrerQueueManager;
@@ -149,7 +149,7 @@
weblog = pageRequest.getWeblog();
if(weblog == null) {
- throw new RollerException("unable to lookup weblog: "+
+ throw new WebloggerException("unable to lookup weblog: "+
pageRequest.getWeblogHandle());
}
@@ -333,7 +333,7 @@
// tags specified. make sure they exist.
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
invalid = !wmgr.getTagComboExists(pageRequest.getTags(), (isSiteWide) ? null : weblog);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
invalid = true;
}
}
@@ -406,7 +406,7 @@
// ick, gotta load pre-3.0 model stuff as well :(
ModelLoader.loadOldModels(model, request, response, pageContext, pageRequest);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error loading model objects for page", ex);
if(!response.isCommitted()) response.reset();
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java Sun Jun 3 11:16:02 2007
@@ -28,7 +28,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.planet.business.PlanetFactory;
import org.apache.roller.planet.business.PlanetManager;
@@ -155,7 +155,7 @@
}
model.put("entryCount", new Integer(entryCount));
- } catch (RollerException ex) {
+ } catch (Exception ex) {
log.error("Error loading model objects for page", ex);
if(!response.isCommitted()) response.reset();
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java Sun Jun 3 11:16:02 2007
@@ -29,7 +29,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.FileManager;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.pojos.Theme;
@@ -84,7 +84,7 @@
weblog = resourceRequest.getWeblog();
if(weblog == null) {
- throw new RollerException("unable to lookup weblog: "+
+ throw new WebloggerException("unable to lookup weblog: "+
resourceRequest.getWeblogHandle());
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java Sun Jun 3 11:16:02 2007
@@ -30,7 +30,7 @@
import javax.servlet.jsp.PageContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.RollerConfig;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.pojos.Template;
@@ -88,7 +88,7 @@
// lookup weblog specified by preview request
weblog = previewRequest.getWeblog();
if(weblog == null) {
- throw new RollerException("unable to lookup weblog: "+
+ throw new WebloggerException("unable to lookup weblog: "+
previewRequest.getWeblogHandle());
}
} catch (Exception e) {
@@ -123,9 +123,9 @@
page = tmpWebsite.getDefaultPage();
if(page == null) {
- throw new RollerException("No default page for weblog: "+tmpWebsite.getHandle());
+ throw new WebloggerException("No default page for weblog: "+tmpWebsite.getHandle());
}
- } catch(RollerException re) {
+ } catch(WebloggerException re) {
// couldn't get page
response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
log.error("Error getting default page for preview", re);
@@ -177,7 +177,7 @@
// ick, gotta load pre-3.0 model stuff as well :(
ModelLoader.loadOldModels(model, request, response, pageContext, previewRequest);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("ERROR loading model for page", ex);
if(!response.isCommitted()) response.reset();
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java Sun Jun 3 11:16:02 2007
@@ -27,7 +27,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.pojos.StaticTemplate;
import org.apache.roller.weblogger.pojos.Template;
@@ -81,7 +81,7 @@
// now make sure the specified weblog really exists
weblog = weblogRequest.getWeblog();
if(weblog == null) {
- throw new RollerException("Unable to lookup weblog: "+
+ throw new WebloggerException("Unable to lookup weblog: "+
weblogRequest.getWeblogHandle());
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServlet.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServlet.java Sun Jun 3 11:16:02 2007
@@ -31,7 +31,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.FileManager;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.pojos.ThemeResource;
@@ -86,7 +86,7 @@
weblog = resourceRequest.getWeblog();
if(weblog == null) {
- throw new RollerException("unable to lookup weblog: "+
+ throw new WebloggerException("unable to lookup weblog: "+
resourceRequest.getWeblogHandle());
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java Sun Jun 3 11:16:02 2007
@@ -30,7 +30,7 @@
import javax.servlet.jsp.PageContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.RollerConfig;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.business.RollerFactory;
@@ -108,7 +108,7 @@
// if still null then that's a problem
if(page == null) {
- throw new RollerException("Could not lookup default page "+
+ throw new WebloggerException("Could not lookup default page "+
"for weblog "+weblog.getHandle());
}
} catch(Exception e) {
@@ -162,7 +162,7 @@
searchModel.init(initData);
model.put("searchResults", searchModel);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error loading model objects for page", ex);
if(!response.isCommitted()) response.reset();
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java Sun Jun 3 11:16:02 2007
@@ -29,7 +29,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.UserManager;
@@ -121,7 +121,7 @@
weblog = uMgr.getWebsiteByHandle(trackbackRequest.getWeblogHandle());
if (weblog == null) {
- throw new RollerException("unable to lookup weblog: "+
+ throw new WebloggerException("unable to lookup weblog: "+
trackbackRequest.getWeblogHandle());
}
@@ -130,7 +130,7 @@
entry = weblogMgr.getWeblogEntryByAnchor(weblog, trackbackRequest.getWeblogAnchor());
if (entry == null) {
- throw new RollerException("unable to lookup entry: "+
+ throw new WebloggerException("unable to lookup entry: "+
trackbackRequest.getWeblogAnchor());
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/InvalidRequestException.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/InvalidRequestException.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/InvalidRequestException.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/InvalidRequestException.java Sun Jun 3 11:16:02 2007
@@ -18,14 +18,14 @@
package org.apache.roller.weblogger.ui.rendering.util;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
/**
* An InvalidRequestException is thrown by the ParsedRequest class or any of
* its subclasses when the request being parsed is invalid in any way.
*/
-public class InvalidRequestException extends RollerException {
+public class InvalidRequestException extends WebloggerException {
public InvalidRequestException(String msg) {
super(msg);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/ParsedRequest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/ParsedRequest.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/ParsedRequest.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/ParsedRequest.java Sun Jun 3 11:16:02 2007
@@ -21,7 +21,7 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.pojos.User;
@@ -90,7 +90,7 @@
try {
UserManager umgr = RollerFactory.getRoller().getUserManager();
user = umgr.getUserByUserName(authenticUser);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error looking up user "+authenticUser, ex);
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogCommentRequest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogCommentRequest.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogCommentRequest.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogCommentRequest.java Sun Jun 3 11:16:02 2007
@@ -23,7 +23,7 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogEntry;
@@ -205,7 +205,7 @@
try {
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
weblogEntry = wmgr.getWeblogEntryByAnchor(getWeblog(), weblogAnchor);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error getting weblog entry "+weblogAnchor, ex);
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.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.config.RollerConfig;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
@@ -217,7 +217,7 @@
try {
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
weblogCategory = wmgr.getWeblogCategoryByPath(getWeblog(), weblogCategoryName);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error getting weblog category "+weblogCategoryName, ex);
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.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.config.RollerConfig;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.UserManager;
@@ -333,7 +333,7 @@
try {
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
weblogEntry = wmgr.getWeblogEntryByAnchor(getWeblog(), weblogAnchor);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error getting weblog entry "+weblogAnchor, ex);
}
}
@@ -351,7 +351,7 @@
try {
UserManager umgr = RollerFactory.getRoller().getUserManager();
weblogPage = getWeblog().getPageByLink(weblogPageName);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error getting weblog page "+weblogPageName, ex);
}
}
@@ -369,7 +369,7 @@
try {
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
weblogCategory = wmgr.getWeblogCategoryByPath(getWeblog(), weblogCategoryName);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error getting weblog category "+weblogCategoryName, ex);
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewRequest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewRequest.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewRequest.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewRequest.java Sun Jun 3 11:16:02 2007
@@ -21,7 +21,7 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.themes.ThemeNotFoundException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.themes.ThemeManager;
@@ -101,7 +101,7 @@
theme = themeMgr.getTheme(themeName);
} catch(ThemeNotFoundException tnfe) {
// bogus theme specified ... don't worry about it
- } catch(RollerException re) {
+ } catch(WebloggerException re) {
log.error("Error looking up theme "+themeName, re);
}
}
@@ -135,7 +135,7 @@
try {
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
weblogEntry = wmgr.getWeblogEntryByAnchor(getWeblog(), anchor);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error getting weblog entry "+anchor, ex);
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewResourceRequest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewResourceRequest.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewResourceRequest.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewResourceRequest.java Sun Jun 3 11:16:02 2007
@@ -21,7 +21,7 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.themes.ThemeNotFoundException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.themes.ThemeManager;
@@ -88,7 +88,7 @@
theme = themeMgr.getTheme(themeName);
} catch(ThemeNotFoundException tnfe) {
// bogus theme specified ... don't worry about it
- } catch(RollerException re) {
+ } catch(WebloggerException re) {
log.error("Error looking up theme "+themeName, re);
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogRequest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogRequest.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogRequest.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogRequest.java Sun Jun 3 11:16:02 2007
@@ -22,7 +22,7 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.pojos.Weblog;
@@ -188,7 +188,7 @@
try {
UserManager umgr = RollerFactory.getRoller().getUserManager();
weblog = umgr.getWebsiteByHandle(weblogHandle, Boolean.TRUE);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error looking up weblog "+weblogHandle, ex);
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogSearchRequest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogSearchRequest.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogSearchRequest.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogSearchRequest.java Sun Jun 3 11:16:02 2007
@@ -21,7 +21,7 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogCategory;
@@ -137,7 +137,7 @@
try {
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
weblogCategory = wmgr.getWeblogCategoryByPath(getWeblog(), weblogCategoryName);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error getting weblog category "+weblogCategoryName, ex);
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogTrackbackRequest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogTrackbackRequest.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogTrackbackRequest.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogTrackbackRequest.java Sun Jun 3 11:16:02 2007
@@ -23,7 +23,7 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogEntry;
@@ -197,7 +197,7 @@
try {
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
weblogEntry = wmgr.getWeblogEntryByAnchor(getWeblog(), weblogAnchor);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error getting weblog entry "+weblogAnchor, ex);
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.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.config.RollerConfig;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.planet.business.Planet;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.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.runnable.Job;
import org.apache.roller.weblogger.config.RollerConfig;
import org.apache.roller.weblogger.business.RollerFactory;