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 [4/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/business/referrers/ReferrerProcessingJob.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/referrers/ReferrerProcessingJob.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/referrers/ReferrerProcessingJob.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/referrers/ReferrerProcessingJob.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.runnable.Job;
import org.apache.roller.weblogger.business.referrers.RefererManager;
import org.apache.roller.weblogger.business.RollerFactory;
@@ -70,7 +70,7 @@
referrer.getWeblogDateString());
RollerFactory.getRoller().flush();
- } catch(RollerException re) {
+ } catch(WebloggerException re) {
// trouble
mLogger.warn("Trouble processing referrer", re);
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java Sun Jun 3 11:16:02 2007
@@ -30,7 +30,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.runnable.ContinuousWorkerThread;
import org.apache.roller.weblogger.business.runnable.WorkerThread;
import org.apache.roller.weblogger.config.RollerConfig;
@@ -161,7 +161,7 @@
try {
// flush changes
RollerFactory.getRoller().flush();
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
mLogger.error("ERROR commiting referrer", ex);
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/HitCountProcessingJob.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/HitCountProcessingJob.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/HitCountProcessingJob.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/HitCountProcessingJob.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.HitCountQueue;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.UserManager;
@@ -91,7 +91,7 @@
try {
weblog = umgr.getWebsiteByHandle(key);
wmgr.incrementHitCount(weblog, ((Long)hitsTally.get(key)).intValue());
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error(ex);
}
}
@@ -103,7 +103,7 @@
log.debug("Completed: "+ (endTime-startTime)/1000 + " secs");
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error persisting updated hit counts", ex);
} finally {
// release session
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/ResetHitCountsTask.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/ResetHitCountsTask.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/ResetHitCountsTask.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/ResetHitCountsTask.java Sun Jun 3 11:16:02 2007
@@ -22,7 +22,7 @@
import java.util.Properties;
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;
@@ -69,7 +69,7 @@
}
- public void init() throws RollerException {
+ public void init() throws WebloggerException {
// get relevant props
Properties props = this.getTaskProperties();
@@ -122,7 +122,7 @@
log.info("task completed");
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("Error while checking for referer turnover", e);
} catch (Exception ee) {
log.error("unexpected exception", ee);
@@ -143,7 +143,7 @@
task.init();
task.run();
System.exit(0);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
ex.printStackTrace();
System.exit(-1);
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/RollerTask.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/RollerTask.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/RollerTask.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/RollerTask.java Sun Jun 3 11:16:02 2007
@@ -23,7 +23,7 @@
import java.util.Properties;
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.util.DateUtil;
@@ -42,7 +42,7 @@
/**
* Initialization. Run once before the task is started.
*/
- public void init() throws RollerException {
+ public void init() throws WebloggerException {
// no-op by default
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/RollerTaskWithLeasing.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/RollerTaskWithLeasing.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/RollerTaskWithLeasing.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/RollerTaskWithLeasing.java Sun Jun 3 11:16:02 2007
@@ -20,7 +20,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
@@ -36,7 +36,7 @@
/**
* Run the task.
*/
- public abstract void runTask() throws RollerException;
+ public abstract void runTask() throws WebloggerException;
/**
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/ScheduledEntriesTask.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/ScheduledEntriesTask.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/ScheduledEntriesTask.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/ScheduledEntriesTask.java Sun Jun 3 11:16:02 2007
@@ -24,7 +24,7 @@
import java.util.Properties;
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;
@@ -75,7 +75,7 @@
}
- public void init() throws RollerException {
+ public void init() throws WebloggerException {
// get relevant props
Properties props = this.getTaskProperties();
@@ -172,7 +172,7 @@
searchMgr.addEntryReIndexOperation(entry);
}
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("Error getting scheduled entries", e);
} catch(Exception e) {
log.error("Unexpected exception running task", e);
@@ -195,7 +195,7 @@
task.init();
task.run();
System.exit(0);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
ex.printStackTrace();
System.exit(-1);
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.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;
@@ -77,7 +77,7 @@
} catch (ClassCastException ex) {
log.warn("Task does not extend RollerTask class", ex);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error scheduling task", ex);
} catch (Exception ex) {
log.error("Error instantiating task", ex);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/TurnoverReferersTask.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/TurnoverReferersTask.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/TurnoverReferersTask.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/TurnoverReferersTask.java Sun Jun 3 11:16:02 2007
@@ -22,7 +22,7 @@
import java.util.Properties;
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;
@@ -69,7 +69,7 @@
}
- public void init() throws RollerException {
+ public void init() throws WebloggerException {
// get relevant props
Properties props = this.getTaskProperties();
@@ -122,7 +122,7 @@
log.info("task completed");
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("Error while checking for referer turnover", e);
} catch (Exception ee) {
log.error("unexpected exception", ee);
@@ -143,7 +143,7 @@
task.init();
task.run();
System.exit(0);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
ex.printStackTrace();
System.exit(-1);
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/IndexManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/IndexManager.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/IndexManager.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/IndexManager.java Sun Jun 3 11:16:02 2007
@@ -17,7 +17,7 @@
*/
package org.apache.roller.weblogger.business.search;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.search.operations.IndexOperation;
import org.apache.roller.weblogger.pojos.User;
import org.apache.roller.weblogger.pojos.WeblogEntry;
@@ -33,16 +33,16 @@
public abstract boolean isInconsistentAtStartup();
/** Remove user from index, returns immediately and operates in background */
- public void removeWebsiteIndex(Weblog website) throws RollerException;
+ public void removeWebsiteIndex(Weblog website) throws WebloggerException;
/** Remove entry from index, returns immediately and operates in background */
- public void removeEntryIndexOperation(WeblogEntry entry) throws RollerException;
+ public void removeEntryIndexOperation(WeblogEntry entry) throws WebloggerException;
/** Add entry to index, returns immediately and operates in background */
- public void addEntryIndexOperation(WeblogEntry entry) throws RollerException;
+ public void addEntryIndexOperation(WeblogEntry entry) throws WebloggerException;
/** R-index entry, returns immediately and operates in background */
- public void addEntryReIndexOperation(WeblogEntry entry) throws RollerException;
+ public void addEntryReIndexOperation(WeblogEntry entry) throws WebloggerException;
/** Execute operation immediately */
public abstract void executeIndexOperationNow(final IndexOperation op);
@@ -55,8 +55,8 @@
/** Shutdown to be called on application shutdown */
public abstract void shutdown();
- public abstract void rebuildWebsiteIndex(Weblog website) throws RollerException;
+ public abstract void rebuildWebsiteIndex(Weblog website) throws WebloggerException;
- public abstract void rebuildWebsiteIndex() throws RollerException;
+ public abstract void rebuildWebsiteIndex() throws WebloggerException;
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java Sun Jun 3 11:16:02 2007
@@ -30,7 +30,7 @@
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.store.RAMDirectory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.*;
import org.apache.roller.weblogger.business.search.operations.AddEntryOperation;
import org.apache.roller.weblogger.business.search.operations.IndexOperation;
@@ -159,7 +159,7 @@
"Index was inconsistent. Rebuilding index in the background...");
try {
rebuildWebsiteIndex();
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
mLogger.error("ERROR: scheduling re-index operation");
}
}
@@ -169,32 +169,32 @@
//~ Methods
// ================================================================
- public void rebuildWebsiteIndex() throws RollerException {
+ public void rebuildWebsiteIndex() throws WebloggerException {
scheduleIndexOperation(
new RebuildWebsiteIndexOperation(this, null));
}
- public void rebuildWebsiteIndex(Weblog website) throws RollerException {
+ public void rebuildWebsiteIndex(Weblog website) throws WebloggerException {
scheduleIndexOperation(
new RebuildWebsiteIndexOperation(this, website));
}
- public void removeWebsiteIndex(Weblog website) throws RollerException {
+ public void removeWebsiteIndex(Weblog website) throws WebloggerException {
scheduleIndexOperation(
new RemoveWebsiteIndexOperation(this, website));
}
- public void addEntryIndexOperation(WeblogEntry entry) throws RollerException {
+ public void addEntryIndexOperation(WeblogEntry entry) throws WebloggerException {
AddEntryOperation addEntry = new AddEntryOperation(this, entry);
scheduleIndexOperation(addEntry);
}
- public void addEntryReIndexOperation(WeblogEntry entry) throws RollerException {
+ public void addEntryReIndexOperation(WeblogEntry entry) throws WebloggerException {
ReIndexEntryOperation reindex = new ReIndexEntryOperation(this, entry);
scheduleIndexOperation(reindex);
}
- public void removeEntryIndexOperation(WeblogEntry entry) throws RollerException {
+ public void removeEntryIndexOperation(WeblogEntry entry) throws WebloggerException {
RemoveEntryOperation removeOp = new RemoveEntryOperation(this, entry);
executeIndexOperationNow(removeOp);
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/AddEntryOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/AddEntryOperation.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/AddEntryOperation.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/AddEntryOperation.java Sun Jun 3 11:16:02 2007
@@ -23,7 +23,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.lucene.index.IndexWriter;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.search.IndexManagerImpl;
import org.apache.roller.weblogger.business.Roller;
import org.apache.roller.weblogger.business.RollerFactory;
@@ -66,7 +66,7 @@
try {
WeblogManager wMgr = RollerFactory.getRoller().getWeblogManager();
this.data = wMgr.getWeblogEntry(this.data.getId());
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
mLogger.error("Error getting weblogentry object", ex);
return;
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/ReIndexEntryOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/ReIndexEntryOperation.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/ReIndexEntryOperation.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/ReIndexEntryOperation.java Sun Jun 3 11:16:02 2007
@@ -25,7 +25,7 @@
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.search.IndexManagerImpl;
import org.apache.roller.weblogger.business.search.FieldConstants;
import org.apache.roller.weblogger.business.Roller;
@@ -68,7 +68,7 @@
try {
WeblogManager wMgr = RollerFactory.getRoller().getWeblogManager();
this.data = wMgr.getWeblogEntry(this.data.getId());
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
mLogger.error("Error getting weblogentry object", ex);
return;
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RebuildWebsiteIndexOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RebuildWebsiteIndexOperation.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RebuildWebsiteIndexOperation.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RebuildWebsiteIndexOperation.java Sun Jun 3 11:16:02 2007
@@ -29,7 +29,7 @@
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.search.IndexManagerImpl;
import org.apache.roller.weblogger.business.search.FieldConstants;
import org.apache.roller.weblogger.business.search.IndexUtil;
@@ -79,7 +79,7 @@
try {
UserManager uMgr = RollerFactory.getRoller().getUserManager();
this.website = uMgr.getWebsite(this.website.getId());
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
mLogger.error("Error getting website object", ex);
return;
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RemoveEntryOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RemoveEntryOperation.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RemoveEntryOperation.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RemoveEntryOperation.java Sun Jun 3 11:16:02 2007
@@ -24,7 +24,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
-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.IndexManagerImpl;
@@ -64,7 +64,7 @@
try {
WeblogManager wMgr = RollerFactory.getRoller().getWeblogManager();
this.data = wMgr.getWeblogEntry(this.data.getId());
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
mLogger.error("Error getting weblogentry object", ex);
return;
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RemoveWebsiteIndexOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RemoveWebsiteIndexOperation.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RemoveWebsiteIndexOperation.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/RemoveWebsiteIndexOperation.java Sun Jun 3 11:16:02 2007
@@ -25,7 +25,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
-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.search.IndexManagerImpl;
@@ -71,7 +71,7 @@
try {
UserManager uMgr = RollerFactory.getRoller().getUserManager();
this.website = uMgr.getWebsite(this.website.getId());
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
mLogger.error("Error getting website object", ex);
return;
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java Sun Jun 3 11:16:02 2007
@@ -20,7 +20,7 @@
import java.io.Serializable;
import java.util.Date;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.ThemeTemplate;
@@ -71,7 +71,7 @@
if(decoratorName != null && !id.equals(decoratorName)) {
try {
return myTheme.getTemplateByName(decoratorName);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
// some kind of error getting decorator
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeInitializationException.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeInitializationException.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeInitializationException.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeInitializationException.java Sun Jun 3 11:16:02 2007
@@ -18,13 +18,13 @@
package org.apache.roller.weblogger.business.themes;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
/**
* Thrown when there is a problem initalizing a theme object.
*/
-public class ThemeInitializationException extends RollerException {
+public class ThemeInitializationException extends WebloggerException {
public ThemeInitializationException(String s,Throwable t) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeManager.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeManager.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeManager.java Sun Jun 3 11:16:02 2007
@@ -19,7 +19,7 @@
package org.apache.roller.weblogger.business.themes;
import java.util.List;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.Theme;
import org.apache.roller.weblogger.pojos.WeblogTheme;
import org.apache.roller.weblogger.pojos.Weblog;
@@ -35,10 +35,10 @@
*
* @return Theme The Theme object with the given id.
* @throws ThemeNotFoundException If the named theme cannot be found.
- * @throws RollerException If there is some kind of fatal backend error.
+ * @throws WebloggerException If there is some kind of fatal backend error.
**/
public SharedTheme getTheme(String id)
- throws ThemeNotFoundException, RollerException;
+ throws ThemeNotFoundException, WebloggerException;
/**
@@ -46,10 +46,10 @@
*
* @param weblog The weblog to get the theme for.
* @return WeblogTheme The theme to be used for the given weblog.
- * @throws RollerException If there is some kind of fatal backend error.
+ * @throws WebloggerException If there is some kind of fatal backend error.
*/
public WeblogTheme getTheme(Weblog weblog)
- throws RollerException;
+ throws WebloggerException;
/**
@@ -67,9 +67,9 @@
* @param weblog The weblog to import the theme into.
* @param theme The theme that should be imported.
*
- * @throws RollerException If there is some kind of error in saving.
+ * @throws WebloggerException If there is some kind of error in saving.
*/
public void importTheme(Weblog website, SharedTheme theme)
- throws RollerException;
+ throws WebloggerException;
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java Sun Jun 3 11:16:02 2007
@@ -32,7 +32,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.FileManager;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.UserManager;
@@ -97,7 +97,7 @@
* @see org.apache.roller.weblogger.model.ThemeManager#getTheme(java.lang.String)
*/
public SharedTheme getTheme(String id)
- throws ThemeNotFoundException, RollerException {
+ throws ThemeNotFoundException, WebloggerException {
// try to lookup theme from library
SharedTheme theme = (SharedTheme) this.themes.get(id);
@@ -114,7 +114,7 @@
/**
* @see org.apache.roller.weblogger.model.ThemeManager#getTheme(weblog)
*/
- public WeblogTheme getTheme(Weblog weblog) throws RollerException {
+ public WeblogTheme getTheme(Weblog weblog) throws WebloggerException {
if(weblog == null)
return null;
@@ -163,7 +163,7 @@
* @see org.apache.roller.weblogger.model.ThemeManager#importTheme(website, theme)
*/
public void importTheme(Weblog website, SharedTheme theme)
- throws RollerException {
+ throws WebloggerException {
log.debug("Importing theme ["+theme.getName()+"] to weblog ["+website.getName()+"]");
@@ -264,7 +264,7 @@
} catch (Exception e) {
log.error("ERROR importing theme", e);
- throw new RollerException( e );
+ throw new WebloggerException( e );
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeNotFoundException.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeNotFoundException.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeNotFoundException.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeNotFoundException.java Sun Jun 3 11:16:02 2007
@@ -18,13 +18,13 @@
package org.apache.roller.weblogger.business.themes;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
/**
* Thrown when the ThemeManager has a problem finding a named theme.
*/
-public class ThemeNotFoundException extends RollerException {
+public class ThemeNotFoundException extends WebloggerException {
public ThemeNotFoundException(String s,Throwable t) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeParsingException.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeParsingException.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeParsingException.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeParsingException.java Sun Jun 3 11:16:02 2007
@@ -18,13 +18,13 @@
package org.apache.roller.weblogger.business.themes;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
/**
* Thrown when there is a problem parsing a given theme xml descriptor.
*/
-public class ThemeParsingException extends RollerException {
+public class ThemeParsingException extends WebloggerException {
public ThemeParsingException(String s,Throwable t) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java Sun Jun 3 11:16:02 2007
@@ -20,7 +20,7 @@
import java.util.Date;
import java.util.List;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.FileManager;
import org.apache.roller.weblogger.business.FileNotFoundException;
import org.apache.roller.weblogger.business.FilePathException;
@@ -75,13 +75,13 @@
/**
* Get the collection of all templates associated with this Theme.
*/
- public List getTemplates() throws RollerException {
+ public List getTemplates() throws WebloggerException {
UserManager userMgr = RollerFactory.getRoller().getUserManager();
return userMgr.getPages(this.weblog);
}
- public ThemeTemplate getDefaultTemplate() throws RollerException {
+ public ThemeTemplate getDefaultTemplate() throws WebloggerException {
UserManager userMgr = RollerFactory.getRoller().getUserManager();
return userMgr.getPageByAction(this.weblog, ThemeTemplate.ACTION_WEBLOG);
}
@@ -91,7 +91,7 @@
* Lookup the specified template by action.
* Returns null if the template cannot be found.
*/
- public ThemeTemplate getTemplateByAction(String action) throws RollerException {
+ public ThemeTemplate getTemplateByAction(String action) throws WebloggerException {
if(action == null)
return null;
@@ -104,7 +104,7 @@
* Lookup the specified template by name.
* Returns null if the template cannot be found.
*/
- public ThemeTemplate getTemplateByName(String name) throws RollerException {
+ public ThemeTemplate getTemplateByName(String name) throws WebloggerException {
if(name == null)
return null;
@@ -117,7 +117,7 @@
* Lookup the specified template by link.
* Returns null if the template cannot be found.
*/
- public ThemeTemplate getTemplateByLink(String link) throws RollerException {
+ public ThemeTemplate getTemplateByLink(String link) throws WebloggerException {
if(link == null)
return null;
@@ -137,7 +137,7 @@
try {
FileManager fileMgr = RollerFactory.getRoller().getFileManager();
resource = fileMgr.getFile(this.weblog, path);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
// ignored, resource considered not found
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.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.FileManager;
import org.apache.roller.weblogger.business.FileNotFoundException;
import org.apache.roller.weblogger.business.FilePathException;
@@ -82,7 +82,7 @@
/**
* Get the collection of all templates associated with this Theme.
*/
- public List getTemplates() throws RollerException {
+ public List getTemplates() throws WebloggerException {
Map pages = new TreeMap();
@@ -124,7 +124,7 @@
/**
* Lookup the default template.
*/
- public ThemeTemplate getDefaultTemplate() throws RollerException {
+ public ThemeTemplate getDefaultTemplate() throws WebloggerException {
return this.theme.getDefaultTemplate();
}
@@ -133,7 +133,7 @@
* Lookup the specified template by action.
* Returns null if the template cannot be found.
*/
- public ThemeTemplate getTemplateByAction(String action) throws RollerException {
+ public ThemeTemplate getTemplateByAction(String action) throws WebloggerException {
if(action == null)
return null;
@@ -149,7 +149,7 @@
* Lookup the specified template by name.
* Returns null if the template cannot be found.
*/
- public ThemeTemplate getTemplateByName(String name) throws RollerException {
+ public ThemeTemplate getTemplateByName(String name) throws WebloggerException {
if(name == null)
return null;
@@ -174,7 +174,7 @@
* Lookup the specified template by link.
* Returns null if the template cannot be found.
*/
- public ThemeTemplate getTemplateByLink(String link) throws RollerException {
+ public ThemeTemplate getTemplateByLink(String link) throws WebloggerException {
if(link == null)
return null;
@@ -214,7 +214,7 @@
try {
FileManager fileMgr = RollerFactory.getRoller().getFileManager();
resource = fileMgr.getFile(this.weblog, path);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
// ignored, resource considered not found
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/utils/UpgradeDatabase.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/utils/UpgradeDatabase.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/utils/UpgradeDatabase.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/utils/UpgradeDatabase.java Sun Jun 3 11:16:02 2007
@@ -26,7 +26,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.pojos.WeblogPermission;
@@ -45,7 +45,7 @@
* Upgrade database if dbVersion is older than desiredVersion.
*/
public static void upgradeDatabase(Connection con, String desiredVersion)
- throws RollerException {
+ throws WebloggerException {
int myVersion = 0;
int dbversion = -1;
@@ -149,7 +149,7 @@
/**
* Upgrade database for Roller 1.3.0
*/
- private static void upgradeTo130(Connection con) throws RollerException {
+ private static void upgradeTo130(Connection con) throws WebloggerException {
try {
/*
* The new theme management code is going into place and it uses
@@ -179,7 +179,7 @@
} catch (SQLException e) {
mLogger.error("Problem upgrading database to version 130", e);
- throw new RollerException("Problem upgrading database to version 130", e);
+ throw new WebloggerException("Problem upgrading database to version 130", e);
}
// If someone is upgrading to 1.3.x then we are setting the db version
@@ -190,7 +190,7 @@
/**
* Upgrade database for Roller 2.0.0
*/
- private static void upgradeTo200(Connection con) throws RollerException {
+ private static void upgradeTo200(Connection con) throws WebloggerException {
try {
mLogger.info("Doing upgrade to 200 ...");
mLogger.info("Populating roller_user_permissions table");
@@ -255,7 +255,7 @@
} catch (SQLException e) {
mLogger.error("Problem upgrading database to version 200", e);
- throw new RollerException("Problem upgrading database to version 200", e);
+ throw new WebloggerException("Problem upgrading database to version 200", e);
}
UpgradeDatabase.updateDatabaseVersion(con, 200);
@@ -265,7 +265,7 @@
/**
* Upgrade database for Roller 2.1.0
*/
- private static void upgradeTo210(Connection con) throws RollerException {
+ private static void upgradeTo210(Connection con) throws WebloggerException {
try {
/*
* For Roller 2.1.0 we are going to standardize some of the
@@ -361,7 +361,7 @@
} catch (SQLException e) {
mLogger.error("Problem upgrading database to version 210", e);
- throw new RollerException("Problem upgrading database to version 210", e);
+ throw new WebloggerException("Problem upgrading database to version 210", e);
}
UpgradeDatabase.updateDatabaseVersion(con, 210);
@@ -371,7 +371,7 @@
/**
* Upgrade database for Roller 3.0.0
*/
- private static void upgradeTo300(Connection con) throws RollerException {
+ private static void upgradeTo300(Connection con) throws WebloggerException {
try {
/*
* For Roller 3.0.0 we are allowing each weblogentry to track a
@@ -432,7 +432,7 @@
} catch (SQLException e) {
mLogger.error("Problem upgrading database to version 300", e);
- throw new RollerException("Problem upgrading database to version 300", e);
+ throw new WebloggerException("Problem upgrading database to version 300", e);
}
UpgradeDatabase.updateDatabaseVersion(con, 300);
@@ -442,7 +442,7 @@
/**
* Upgrade database for Roller 3.2.0
*/
- private static void upgradeTo320(Connection con) throws RollerException {
+ private static void upgradeTo320(Connection con) throws WebloggerException {
mLogger.info("Doing upgrade to 320 ...");
@@ -500,7 +500,7 @@
} catch (SQLException e) {
mLogger.error("Problem upgrading database to version 320", e);
- throw new RollerException("Problem upgrading database to version 320", e);
+ throw new WebloggerException("Problem upgrading database to version 320", e);
}
@@ -649,7 +649,7 @@
} catch (SQLException e) {
mLogger.error("Problem upgrading database to version 320", e);
- throw new RollerException("Problem upgrading database to version 320", e);
+ throw new WebloggerException("Problem upgrading database to version 320", e);
}
// finally, upgrade db version string to 320
@@ -660,7 +660,7 @@
/**
* Upgrade database for Roller 4.0.0
*/
- private static void upgradeTo400(Connection con) throws RollerException {
+ private static void upgradeTo400(Connection con) throws WebloggerException {
mLogger.info("Doing upgrade to 400 ...");
@@ -714,7 +714,7 @@
} catch (SQLException e) {
mLogger.error("Problem upgrading database to version 400", e);
- throw new RollerException("Problem upgrading database to version 400", e);
+ throw new WebloggerException("Problem upgrading database to version 400", e);
}
// finally, upgrade db version string to 400
@@ -728,7 +728,7 @@
* This should only be called once for new installations
*/
private static void setDatabaseVersion(Connection con, int version)
- throws RollerException {
+ throws WebloggerException {
try {
Statement stmt = con.createStatement();
@@ -737,7 +737,7 @@
mLogger.debug("Set database verstion to "+version);
} catch(SQLException se) {
- throw new RollerException("Error setting database version.", se);
+ throw new WebloggerException("Error setting database version.", se);
}
}
@@ -746,7 +746,7 @@
* Update the existing database.version property
*/
private static void updateDatabaseVersion(Connection con, int version)
- throws RollerException {
+ throws WebloggerException {
try {
Statement stmt = con.createStatement();
@@ -756,7 +756,7 @@
mLogger.debug("Updated database verstion to "+version);
} catch(SQLException se) {
- throw new RollerException("Error setting database version.", se);
+ throw new WebloggerException("Error setting database version.", se);
}
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/PingConfig.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/PingConfig.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/PingConfig.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/PingConfig.java Sun Jun 3 11:16:02 2007
@@ -20,7 +20,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.pings.PingTargetManager;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.pojos.PingTarget;
@@ -182,7 +182,7 @@
*
* @see org.apache.roller.weblogger.ui.core.RollerContext#contextInitialized(javax.servlet.ServletContextEvent)
*/
- public static void initializeCommonTargets() throws RollerException {
+ public static void initializeCommonTargets() throws WebloggerException {
String configuredVal = RollerConfig.getProperty(PINGS_INITIAL_COMMON_TARGETS_PROP);
if (configuredVal == null || configuredVal.trim().length() == 0) {
if (logger.isDebugEnabled()) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/tasks/RefreshRollerPlanetTask.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/tasks/RefreshRollerPlanetTask.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/tasks/RefreshRollerPlanetTask.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/tasks/RefreshRollerPlanetTask.java Sun Jun 3 11:16:02 2007
@@ -27,6 +27,7 @@
import org.apache.roller.planet.config.PlanetConfig;
import org.apache.roller.planet.business.Planet;
import org.apache.roller.planet.business.PlanetFactory;
+import org.apache.roller.weblogger.WebloggerException;
/**
@@ -74,7 +75,7 @@
return this.leaseTime;
}
- public void init() throws RollerException {
+ public void init() throws WebloggerException {
// get relevant props
Properties props = this.getTaskProperties();
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java Sun Jun 3 11:16:02 2007
@@ -35,6 +35,7 @@
import org.apache.roller.planet.pojos.PlanetData;
import org.apache.roller.planet.pojos.PlanetGroupData;
import org.apache.roller.planet.pojos.PlanetSubscriptionData;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.util.URLUtilities;
@@ -83,7 +84,7 @@
}
- public void init() throws RollerException {
+ public void init() throws WebloggerException {
// get relevant props
Properties props = this.getTaskProperties();
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Theme.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Theme.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Theme.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Theme.java Sun Jun 3 11:16:02 2007
@@ -20,7 +20,7 @@
import java.util.Date;
import java.util.List;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
/**
@@ -69,34 +69,34 @@
/**
* Get the list of all templates associated with this Theme.
*/
- public List getTemplates() throws RollerException;
+ public List getTemplates() throws WebloggerException;
/**
* Lookup the default template for the Theme.
*/
- public ThemeTemplate getDefaultTemplate() throws RollerException;
+ public ThemeTemplate getDefaultTemplate() throws WebloggerException;
/**
* Lookup a template by action.
* Returns null if the template cannot be found.
*/
- public ThemeTemplate getTemplateByAction(String action) throws RollerException;
+ public ThemeTemplate getTemplateByAction(String action) throws WebloggerException;
/**
* Lookup a template by name.
* Returns null if the template cannot be found.
*/
- public ThemeTemplate getTemplateByName(String name) throws RollerException;
+ public ThemeTemplate getTemplateByName(String name) throws WebloggerException;
/**
* Lookup a template by link.
* Returns null if the template cannot be found.
*/
- public ThemeTemplate getTemplateByLink(String link) throws RollerException;
+ public ThemeTemplate getTemplateByLink(String link) throws WebloggerException;
/**
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/User.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/User.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/User.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/User.java Sun Jun 3 11:16:02 2007
@@ -28,7 +28,7 @@
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.RollerConfig;
import org.apache.roller.weblogger.business.Roller;
import org.apache.roller.util.UUIDGenerator;
@@ -306,9 +306,9 @@
* @param new2 Confirm this matches new password
* @author Dave Johnson
*/
- public void resetPassword(Roller roller, String new1, String new2) throws RollerException {
+ public void resetPassword(Roller roller, String new1, String new2) throws WebloggerException {
if (!new1.equals(new2)) {
- throw new RollerException("newUser.error.mismatchedPasswords");
+ throw new WebloggerException("newUser.error.mismatchedPasswords");
}
String encrypt = RollerConfig.getProperty("passwds.encryption.enabled");
@@ -355,7 +355,7 @@
/**
* Grant to user role specified by role name.
*/
- public void grantRole(String roleName) throws RollerException {
+ public void grantRole(String roleName) throws WebloggerException {
if (!hasRole(roleName)) {
UserRole role = new UserRole(null, this, roleName);
getRoles().add(role);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java Sun Jun 3 11:16:02 2007
@@ -33,7 +33,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.referrers.RefererManager;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.commons.logging.Log;
@@ -193,7 +193,7 @@
// let the ThemeManager handle it
ThemeManager themeMgr = RollerFactory.getRoller().getThemeManager();
return themeMgr.getTheme(this);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error getting theme for weblog - "+getHandle(), ex);
}
@@ -205,7 +205,7 @@
/**
* Lookup the default page for this website.
*/
- public ThemeTemplate getDefaultPage() throws RollerException {
+ public ThemeTemplate getDefaultPage() throws WebloggerException {
// look for the page in our Theme
Theme weblogTheme = getTheme();
@@ -222,7 +222,7 @@
*
* @roller.wrapPojoMethod type="pojo"
*/
- public ThemeTemplate getPageByAction(String action) throws RollerException {
+ public ThemeTemplate getPageByAction(String action) throws WebloggerException {
if(action == null)
return null;
@@ -241,7 +241,7 @@
* Lookup a Template for this website by name.
* @roller.wrapPojoMethod type="pojo"
*/
- public ThemeTemplate getPageByName(String name) throws RollerException {
+ public ThemeTemplate getPageByName(String name) throws WebloggerException {
if(name == null)
return null;
@@ -260,7 +260,7 @@
* Lookup a template for this website by link.
* @roller.wrapPojoMethod type="pojo"
*/
- public ThemeTemplate getPageByLink(String link) throws RollerException {
+ public ThemeTemplate getPageByLink(String link) throws WebloggerException {
if(link == null)
return null;
@@ -279,7 +279,7 @@
* Get a list of all pages that are part of this website.
* @roller.wrapPojoMethod type="pojo-collection" class="org.apache.roller.weblogger.pojos.Template"
*/
- public List getPages() throws RollerException {
+ public List getPages() throws WebloggerException {
// look for the pages in our Theme
Theme weblogTheme = getTheme();
@@ -1020,7 +1020,7 @@
Roller roller = RollerFactory.getRoller();
WeblogManager wmgr = roller.getWeblogManager();
entry = wmgr.getWeblogEntryByAnchor(this, anchor);
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
this.log.error("ERROR: getting entry by anchor");
}
return entry;
@@ -1036,7 +1036,7 @@
// try {
WeblogCategory category = this.getDefaultCategory();
ret = category.getWeblogCategories();
-// } catch (RollerException e) {
+// } catch (WebloggerException e) {
// log.error("ERROR: fetching categories", e);
// }
return ret;
@@ -1060,7 +1060,7 @@
category = this.getDefaultCategory();
}
ret = category.getWeblogCategories();
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("ERROR: fetching categories for path: " + categoryPath, e);
}
return ret;
@@ -1082,7 +1082,7 @@
} else {
category = this.getDefaultCategory();
}
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("ERROR: fetching category at path: " + categoryPath, e);
}
return category;
@@ -1118,7 +1118,7 @@
null,
0,
length);
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("ERROR: getting recent entries", e);
}
return recentEntries;
@@ -1157,7 +1157,7 @@
null,
0,
length);
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("ERROR: getting recent entries", e);
}
return recentEntries;
@@ -1186,7 +1186,7 @@
true, // we want reverse chrono order
0, // offset
length); // length
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("ERROR: getting recent comments", e);
}
return recentComments;
@@ -1210,7 +1210,7 @@
} else {
return bmgr.getFolder(this, folderName);
}
- } catch (RollerException re) {
+ } catch (WebloggerException re) {
log.error("ERROR: fetching folder for weblog", re);
}
return ret;
@@ -1228,7 +1228,7 @@
RefererManager rmgr = roller.getRefererManager();
return rmgr.getTodaysReferers(this);
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("PageModel getTodaysReferers()", e);
}
return (referers == null ? Collections.EMPTY_LIST : referers);
@@ -1249,7 +1249,7 @@
return (hitCount != null) ? hitCount.getDailyHits() : 0;
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("Error getting weblog hit count", e);
}
return 0;
@@ -1296,7 +1296,7 @@
Roller roller = RollerFactory.getRoller();
WeblogManager mgr = roller.getWeblogManager();
count = mgr.getCommentCount(this);
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("Error getting comment count for weblog " + this.getName(), e);
}
return count;
@@ -1314,7 +1314,7 @@
Roller roller = RollerFactory.getRoller();
WeblogManager mgr = roller.getWeblogManager();
count = mgr.getEntryCount(this);
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("Error getting entry count for weblog " + this.getName(), e);
}
return count;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java Sun Jun 3 11:16:02 2007
@@ -28,7 +28,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.BookmarkManager;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.util.UUIDGenerator;
@@ -313,7 +313,7 @@
/**
* Add a bookmark to this folder.
*/
- public void addBookmark(WeblogBookmark bookmark) throws RollerException {
+ public void addBookmark(WeblogBookmark bookmark) throws WebloggerException {
bookmark.setFolder(this);
getBookmarks().add(bookmark);
}
@@ -324,7 +324,7 @@
*
* @param subfolders
*/
- public List retrieveBookmarks(boolean subfolders) throws RollerException {
+ public List retrieveBookmarks(boolean subfolders) throws WebloggerException {
BookmarkManager bmgr = RollerFactory.getRoller().getBookmarkManager();
return bmgr.getBookmarks(this, subfolders);
}
@@ -367,7 +367,7 @@
// convenience method for updating the folder name, which triggers a path tree rebuild
- public void updateName(String newName) throws RollerException {
+ public void updateName(String newName) throws WebloggerException {
// update name
setName(newName);
@@ -388,7 +388,7 @@
// update the path tree for a given folder
public static void updatePathTree(WeblogBookmarkFolder folder)
- throws RollerException {
+ throws WebloggerException {
log.debug("Updating path tree for folder "+folder.getPath());
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogCategory.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogCategory.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogCategory.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogCategory.java Sun Jun 3 11:16:02 2007
@@ -28,7 +28,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.util.UUIDGenerator;
@@ -283,9 +283,9 @@
*
* @param subcats True if entries from sub-categories are to be returned.
* @return List of WeblogEntryData objects.
- * @throws RollerException
+ * @throws WebloggerException
*/
- public List retrieveWeblogEntries(boolean subcats) throws RollerException {
+ public List retrieveWeblogEntries(boolean subcats) throws WebloggerException {
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
return wmgr.getWeblogEntries(this, subcats);
}
@@ -359,7 +359,7 @@
public boolean isInUse() {
try {
return RollerFactory.getRoller().getWeblogManager().isWeblogCategoryInUse(this);
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
throw new RuntimeException(e);
}
}
@@ -368,7 +368,7 @@
// convenience method for updating the category name, which triggers a path tree rebuild
- public void updateName(String newName) throws RollerException {
+ public void updateName(String newName) throws WebloggerException {
// update name
setName(newName);
@@ -389,7 +389,7 @@
// updates the paths of all descendents of the given category
public static void updatePathTree(WeblogCategory cat)
- throws RollerException {
+ throws WebloggerException {
log.debug("Updating path tree for category "+cat.getPath());
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java Sun Jun 3 11:16:02 2007
@@ -44,7 +44,7 @@
import org.apache.commons.lang.builder.HashCodeBuilder;
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.WeblogEntryPlugin;
@@ -429,7 +429,7 @@
att.setValue(value);
}
}
- public void onRemoveEntryAttribute(WeblogEntryAttribute att) throws RollerException {
+ public void onRemoveEntryAttribute(WeblogEntryAttribute att) throws WebloggerException {
attMap.remove(att.getName());
}
//-------------------------------------------------------------------------
@@ -637,7 +637,7 @@
return tagSet;
}
- private void setTags(Set tagSet) throws RollerException
+ private void setTags(Set tagSet) throws WebloggerException
{
this.tagSet = tagSet;
this.removedTags = new HashSet();
@@ -648,9 +648,9 @@
* Roller lowercases all tags based on locale because there's not a 1:1 mapping
* between uppercase/lowercase characters across all languages.
* @param name
- * @throws RollerException
+ * @throws WebloggerException
*/
- public void addTag(String name) throws RollerException {
+ public void addTag(String name) throws WebloggerException {
Locale locale = getWebsite() != null ? getWebsite().getLocaleInstance() : Locale.getDefault();
name = Utilities.normalizeTag(name, locale);
if(name.length() == 0)
@@ -673,7 +673,7 @@
addedTags.add(name);
}
- public void onRemoveTag(String name) throws RollerException {
+ public void onRemoveTag(String name) throws WebloggerException {
removedTags.add(name);
}
@@ -685,7 +685,7 @@
return removedTags;
}
- public void updateTags(List tags) throws RollerException {
+ public void updateTags(List tags) throws WebloggerException {
if(tags == null)
return;
@@ -735,7 +735,7 @@
return sb.toString();
}
- public void setTagsAsString(String tags) throws RollerException {
+ public void setTagsAsString(String tags) throws WebloggerException {
if (tags == null) {
tagSet.clear();
return;
@@ -864,7 +864,7 @@
false, // we want chrono order
0, // offset
-1); // no limit
- } catch (RollerException alreadyLogged) {}
+ } catch (WebloggerException alreadyLogged) {}
return list;
}
@@ -890,7 +890,7 @@
List referers = null;
try {
referers = RollerFactory.getRoller().getRefererManager().getReferersToEntry(getId());
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
mLogger.error("Unexpected exception", e);
}
return referers;
@@ -975,7 +975,7 @@
}
/** Create anchor for weblog entry, based on title or text */
- protected String createAnchor() throws RollerException {
+ protected String createAnchor() throws WebloggerException {
return RollerFactory.getRoller().getWeblogManager().createAnchor(this);
}
@@ -1110,7 +1110,7 @@
/**
* Determine if the specified user has permissions to edit this entry.
*/
- public boolean hasWritePermissions(User user) throws RollerException {
+ public boolean hasWritePermissions(User user) throws WebloggerException {
// global admins can hack whatever they want
if(user.hasRole("admin")) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java Sun Jun 3 11:16:02 2007
@@ -26,7 +26,7 @@
import org.apache.commons.lang.builder.HashCodeBuilder;
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.util.UUIDGenerator;
@@ -86,7 +86,7 @@
if(decoratorName != null && !id.equals(decoratorName)) {
try {
return weblog.getPageByName(decoratorName);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.error("Error getting decorator["+decoratorName+"] "+
"for template "+id);
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/FolderDataWrapper.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/FolderDataWrapper.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/FolderDataWrapper.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/FolderDataWrapper.java Sun Jun 3 11:16:02 2007
@@ -22,7 +22,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.WeblogBookmark;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
@@ -117,7 +117,7 @@
public List retrieveBookmarks(boolean subfolders)
- throws RollerException {
+ throws WebloggerException {
List initialCollection = this.pojo.retrieveBookmarks(subfolders);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogCategoryDataWrapper.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogCategoryDataWrapper.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogCategoryDataWrapper.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogCategoryDataWrapper.java Sun Jun 3 11:16:02 2007
@@ -22,7 +22,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.WeblogCategory;
import org.apache.roller.weblogger.pojos.WeblogEntry;
@@ -104,7 +104,7 @@
public List retrieveWeblogEntries(boolean subcats)
- throws RollerException {
+ throws WebloggerException {
List initialCollection = this.pojo.retrieveWeblogEntries(subcats);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WebsiteDataWrapper.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WebsiteDataWrapper.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WebsiteDataWrapper.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WebsiteDataWrapper.java Sun Jun 3 11:16:02 2007
@@ -25,7 +25,7 @@
import java.util.Locale;
import java.util.Set;
import java.util.TimeZone;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.ThemeTemplate;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.pojos.WeblogCategory;
@@ -59,24 +59,24 @@
public TemplateWrapper getPageByAction(String action)
- throws RollerException {
+ throws WebloggerException {
return TemplateWrapper.wrap(this.pojo.getPageByAction(action));
}
public TemplateWrapper getPageByName(String name)
- throws RollerException {
+ throws WebloggerException {
return TemplateWrapper.wrap(this.pojo.getPageByName(name));
}
public TemplateWrapper getPageByLink(String link)
- throws RollerException {
+ throws WebloggerException {
return TemplateWrapper.wrap(this.pojo.getPageByLink(link));
}
- public List getPages() throws RollerException {
+ public List getPages() throws WebloggerException {
List initialCollection = this.pojo.getPages();
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerContext.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerContext.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerContext.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerContext.java Sun Jun 3 11:16:02 2007
@@ -36,7 +36,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.DatabaseProvider;
import org.apache.roller.weblogger.business.runnable.RollerTask;
import org.apache.roller.weblogger.business.utils.UpgradeDatabase;
@@ -200,7 +200,7 @@
RuntimeSingleton.init(velocityProps);
} catch (Exception e) {
- throw new RollerException(e);
+ throw new WebloggerException(e);
}
}
@@ -208,7 +208,7 @@
/**
* Setup Acegi security features.
*/
- protected void initializeSecurityFeatures(ServletContext context) throws RollerException {
+ protected void initializeSecurityFeatures(ServletContext context) throws WebloggerException {
ApplicationContext ctx =
WebApplicationContextUtils.getRequiredWebApplicationContext(context);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java Sun Jun 3 11:16:02 2007
@@ -28,7 +28,7 @@
import javax.servlet.http.HttpSessionListener;
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;
@@ -95,7 +95,7 @@
if(user != null && user.getEnabled().booleanValue()) {
rollerSession.setAuthenticatedUser(user);
}
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.error("ERROR: getting user object",e);
}
}
@@ -143,7 +143,7 @@
try {
UserManager mgr = RollerFactory.getRoller().getUserManager();
authenticUser = mgr.getUser(userId);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
log.warn("Error looking up authenticated user "+userId, ex);
}
}
@@ -163,7 +163,7 @@
/**
* Does our authenticated user have the global admin role?
*/
- public boolean isGlobalAdminUser() throws RollerException {
+ public boolean isGlobalAdminUser() throws WebloggerException {
User user = getAuthenticatedUser();
if (user != null && user.hasRole("admin")
@@ -176,7 +176,7 @@
* Is session's authenticated user authorized to work in current website?
*/
public boolean isUserAuthorized(Weblog website)
- throws RollerException {
+ throws WebloggerException {
User user = getAuthenticatedUser();
if (user != null && user.getEnabled().booleanValue())
@@ -189,7 +189,7 @@
* Is session's authenticated user authorized to post in current weblog?
*/
public boolean isUserAuthorizedToAuthor(Weblog website)
- throws RollerException {
+ throws WebloggerException {
User user = getAuthenticatedUser();
if (user != null && user.getEnabled().booleanValue())
@@ -202,7 +202,7 @@
* Is session's authenticated user authorized to admin current weblog?
*/
public boolean isUserAuthorizedToAdmin(Weblog website)
- throws RollerException {
+ throws WebloggerException {
User user = getAuthenticatedUser();
if (user != null && user.getEnabled().booleanValue())
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/BasicUserAutoProvision.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/BasicUserAutoProvision.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/BasicUserAutoProvision.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/BasicUserAutoProvision.java Sun Jun 3 11:16:02 2007
@@ -19,7 +19,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.User;
@@ -46,7 +46,7 @@
mgr = RollerFactory.getRoller().getUserManager();
mgr.addUser(ud);
RollerFactory.getRoller().flush();
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
log.warn("Error while auto-provisioning user from SSO.", e);
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java Sun Jun 3 11:16:02 2007
@@ -6,7 +6,7 @@
import org.acegisecurity.userdetails.UserDetails;
import org.acegisecurity.userdetails.UserDetailsService;
import org.acegisecurity.userdetails.UsernameNotFoundException;
-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;
@@ -28,7 +28,7 @@
Roller roller = RollerFactory.getRoller();
UserManager umgr = roller.getUserManager();
userData = umgr.getUserByUserName(userName, Boolean.TRUE);
- } catch (RollerException ex) {
+ } catch (WebloggerException ex) {
throw new DataRetrievalFailureException("ERROR in user lookup", ex);
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java?view=diff&rev=543951&r1=543950&r2=543951
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java Sun Jun 3 11:16:02 2007
@@ -24,7 +24,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.WeblogEntry;
@@ -64,7 +64,7 @@
null,WeblogEntry.PUBLISHED, // status
locale,
0, -1);
- } catch (RollerException e) {
+ } catch (WebloggerException e) {
mLogger.error(e);
monthMap = new HashMap();
}