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/27 07:52:07 UTC
svn commit: r551059 [1/5] - in /roller/trunk/apps/weblogger:
src/java/org/apache/roller/weblogger/business/
src/java/org/apache/roller/weblogger/business/pings/
src/java/org/apache/roller/weblogger/business/plugins/entry/
src/java/org/apache/roller/web...
Author: agilliland
Date: Tue Jun 26 22:52:00 2007
New Revision: 551059
URL: http://svn.apache.org/viewvc?view=rev&rev=551059
Log:
renaming RollerFactory to WebloggerFactory.
Added:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerFactory.java
- copied, changed from r551046, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerFactory.java
Removed:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerFactory.java
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/pings/PingQueueProcessor.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/pings/PingQueueTask.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/referrers/QueuedReferrerProcessingJob.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/referrers/ReferrerProcessingJob.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/HitCountProcessingJob.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/ResetHitCountsTask.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/RollerTaskWithLeasing.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/ScheduledEntriesTask.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/TurnoverReferersTask.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/WorkerThread.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/PingConfig.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/RollerRuntimeConfig.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/RollerRomeFeedFetcher.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogCategory.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerContext.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/PersistenceSessionFilter.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/BasicUserAutoProvision.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/WeblogRequestMapper.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/ConfigModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/URLModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/UsersPager.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesListPager.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesMonthPager.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPermalinkPager.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPreviewPager.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogsPager.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewThemeImageServlet.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServlet.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/ParsedRequest.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogCommentRequest.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewRequest.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewResourceRequest.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogRequest.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogSearchRequest.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogTrackbackRequest.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/ThemeResourceLoader.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargets.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetAddBase.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetEditBase.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetsBase.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargets.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Referrers.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Resources.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfigBean.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/UIActionInterceptor.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/MediacastUtil.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/cache/CacheManager.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/Authenticator.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/Handler.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/json/TagStatsServlet.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/BaseAPIHandler.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/TestUtils.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/BookmarkTest.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/CommentTest.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/FileManagerTest.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderCRUDTest.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderParentDeletesTest.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/HitCountTest.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/IndexManagerTest.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/PermissionTest.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/PingsTest.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/PropertiesTest.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/RefererTest.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/TaskLockTest.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/UserTest.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryCRUDTest.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryFunctionalityTest.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryParentDeletesTest.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogEntryTest.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogTest.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/xmlrpc/RollerXmlRpcServerTest.java
roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/footer.jsp
roller/trunk/apps/weblogger/web/roller-ui/login-redirect.jsp
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerImpl.java?view=diff&rev=551059&r1=551058&r2=551059
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerImpl.java Tue Jun 26 22:52:00 2007
@@ -301,13 +301,13 @@
// Remove custom ping targets if they have been disallowed
if (PingConfig.getDisallowCustomTargets()) {
log.info("Custom ping targets have been disallowed. Removing any existing custom targets.");
- RollerFactory.getRoller().getPingTargetManager().removeAllCustomPingTargets();
+ WebloggerFactory.getRoller().getPingTargetManager().removeAllCustomPingTargets();
}
// Remove all autoping configurations if ping usage has been disabled.
if (PingConfig.getDisablePingUsage()) {
log.info("Ping usage has been disabled. Removing any existing auto ping configurations.");
- RollerFactory.getRoller().getAutopingManager().removeAllAutoPings();
+ WebloggerFactory.getRoller().getAutopingManager().removeAllAutoPings();
}
} catch (Throwable t) {
throw new InitializationException("Error initializing ping systems", t);
Copied: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerFactory.java (from r551046, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerFactory.java)
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerFactory.java?view=diff&rev=551059&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerFactory.java&r1=551046&p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerFactory.java&r2=551059
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerFactory.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerFactory.java Tue Jun 26 22:52:00 2007
@@ -30,9 +30,9 @@
/**
* Provides access to the Weblogger instance and bootstraps the business tier.
*/
-public final class RollerFactory {
+public final class WebloggerFactory {
- private static final Log log = LogFactory.getLog(RollerFactory.class);
+ private static final Log log = LogFactory.getLog(WebloggerFactory.class);
// a reference to the bootstrapped Weblogger instance
private static Weblogger rollerInstance = null;
@@ -54,7 +54,7 @@
// non-instantiable
- private RollerFactory() {
+ private WebloggerFactory() {
// hello all you beautiful people
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/pings/PingQueueProcessor.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/pings/PingQueueProcessor.java?view=diff&rev=551059&r1=551058&r2=551059
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/pings/PingQueueProcessor.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/pings/PingQueueProcessor.java Tue Jun 26 22:52:00 2007
@@ -23,7 +23,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.config.PingConfig;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.pojos.PingQueueEntry;
@@ -51,7 +51,7 @@
private PingQueueProcessor() throws WebloggerException {
- pingQueueMgr = RollerFactory.getRoller().getPingQueueManager();
+ pingQueueMgr = WebloggerFactory.getRoller().getPingQueueManager();
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/pings/PingQueueTask.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/pings/PingQueueTask.java?view=diff&rev=551059&r1=551058&r2=551059
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/pings/PingQueueTask.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/pings/PingQueueTask.java Tue Jun 26 22:52:00 2007
@@ -27,7 +27,7 @@
import org.apache.roller.weblogger.business.runnable.RollerTaskWithLeasing;
import org.apache.roller.weblogger.config.PingConfig;
import org.apache.roller.weblogger.business.Weblogger;
-import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
/**
@@ -127,7 +127,7 @@
log.debug("task started");
PingQueueProcessor.getInstance().processQueue();
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
log.debug("task completed");
@@ -137,7 +137,7 @@
log.error("unexpected exception", ee);
} finally {
// always release
- RollerFactory.getRoller().release();
+ WebloggerFactory.getRoller().release();
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java?view=diff&rev=551059&r1=551058&r2=551059
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java Tue Jun 26 22:52:00 2007
@@ -27,7 +27,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
import org.apache.roller.weblogger.pojos.WeblogEntry;
@@ -128,7 +128,7 @@
private Properties loadAcronyms(Weblog website) {
Properties acronyms = new Properties();
try {
- UserManager userMgr = RollerFactory.getRoller().getUserManager();
+ UserManager userMgr = WebloggerFactory.getRoller().getUserManager();
WeblogTemplate acronymsPage = userMgr.getPageByName(
website, "_acronyms");
if (acronymsPage != null) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java?view=diff&rev=551059&r1=551058&r2=551059
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java Tue Jun 26 22:52:00 2007
@@ -29,7 +29,7 @@
import org.apache.commons.logging.LogFactory;
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.WebloggerFactory;
import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
import org.apache.roller.weblogger.pojos.WeblogBookmark;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
@@ -71,7 +71,7 @@
public String render(WeblogEntry entry, String str) {
String text = str;
try {
- BookmarkManager bMgr = RollerFactory.getRoller().getBookmarkManager();
+ BookmarkManager bMgr = WebloggerFactory.getRoller().getBookmarkManager();
WeblogBookmarkFolder rootFolder = bMgr.getRootFolder(entry.getWebsite());
text = matchBookmarks(text, rootFolder);
text = lookInFolders(text, rootFolder.getFolders());
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java?view=diff&rev=551059&r1=551058&r2=551059
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java Tue Jun 26 22:52:00 2007
@@ -23,7 +23,7 @@
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;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.WeblogBookmark;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
@@ -315,7 +315,7 @@
}
else
{
- BookmarkManager bMgr = RollerFactory.getRoller().getBookmarkManager();
+ BookmarkManager bMgr = WebloggerFactory.getRoller().getBookmarkManager();
List bookmarks = bMgr.getBookmarks(bMgr.getRootFolder(website), true);
for (Iterator i = bookmarks.iterator(); i.hasNext();)
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/referrers/QueuedReferrerProcessingJob.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/referrers/QueuedReferrerProcessingJob.java?view=diff&rev=551059&r1=551058&r2=551059
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/referrers/QueuedReferrerProcessingJob.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/referrers/QueuedReferrerProcessingJob.java Tue Jun 26 22:52:00 2007
@@ -23,7 +23,7 @@
package org.apache.roller.weblogger.business.referrers;
-import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
/**
@@ -42,7 +42,7 @@
public void execute() {
ReferrerQueueManager refQueue =
- RollerFactory.getRoller().getReferrerQueueManager();
+ WebloggerFactory.getRoller().getReferrerQueueManager();
// check the queue for any incoming referrers
referrer = refQueue.dequeue();
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=551059&r1=551058&r2=551059
==============================================================================
--- 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 Tue Jun 26 22:52:00 2007
@@ -30,7 +30,7 @@
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;
+import org.apache.roller.weblogger.business.WebloggerFactory;
/**
@@ -62,14 +62,14 @@
// process a referrer
try {
- RefererManager refMgr = RollerFactory.getRoller().getRefererManager();
+ RefererManager refMgr = WebloggerFactory.getRoller().getRefererManager();
refMgr.processReferrer(referrer.getRequestUrl(),
referrer.getReferrerUrl(),
referrer.getWeblogHandle(),
referrer.getWeblogAnchor(),
referrer.getWeblogDateString());
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
} catch(WebloggerException re) {
// trouble
mLogger.warn("Trouble processing referrer", re);
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=551059&r1=551058&r2=551059
==============================================================================
--- 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 Tue Jun 26 22:52:00 2007
@@ -26,7 +26,7 @@
import org.apache.commons.logging.LogFactory;
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.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.Weblog;
@@ -52,8 +52,8 @@
*/
public void execute() {
- UserManager umgr = RollerFactory.getRoller().getUserManager();
- WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+ UserManager umgr = WebloggerFactory.getRoller().getUserManager();
+ WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
HitCountQueue hitCounter = HitCountQueue.getInstance();
@@ -97,7 +97,7 @@
}
// flush the results to the db
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
long endTime = System.currentTimeMillis();
@@ -107,7 +107,7 @@
log.error("Error persisting updated hit counts", ex);
} finally {
// release session
- RollerFactory.getRoller().release();
+ WebloggerFactory.getRoller().release();
}
}
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=551059&r1=551058&r2=551059
==============================================================================
--- 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 Tue Jun 26 22:52:00 2007
@@ -23,7 +23,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
@@ -116,9 +116,9 @@
try {
log.info("task started");
- WeblogManager mgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager mgr = WebloggerFactory.getRoller().getWeblogManager();
mgr.resetAllHitCounts();
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
log.info("task completed");
@@ -128,7 +128,7 @@
log.error("unexpected exception", ee);
} finally {
// always release
- RollerFactory.getRoller().release();
+ WebloggerFactory.getRoller().release();
}
}
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=551059&r1=551058&r2=551059
==============================================================================
--- 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 Tue Jun 26 22:52:00 2007
@@ -21,7 +21,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
/**
@@ -51,7 +51,7 @@
*/
public final void run() {
- ThreadManager mgr = RollerFactory.getRoller().getThreadManager();
+ ThreadManager mgr = WebloggerFactory.getRoller().getThreadManager();
boolean lockAcquired = false;
try {
@@ -86,7 +86,7 @@
}
// always release Roller session
- RollerFactory.getRoller().release();
+ WebloggerFactory.getRoller().release();
}
}
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=551059&r1=551058&r2=551059
==============================================================================
--- 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 Tue Jun 26 22:52:00 2007
@@ -25,7 +25,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.business.search.IndexManager;
import org.apache.roller.weblogger.pojos.WeblogEntry;
@@ -122,8 +122,8 @@
log.debug("task started");
try {
- WeblogManager wMgr = RollerFactory.getRoller().getWeblogManager();
- IndexManager searchMgr = RollerFactory.getRoller().getIndexManager();
+ WeblogManager wMgr = WebloggerFactory.getRoller().getWeblogManager();
+ IndexManager searchMgr = WebloggerFactory.getRoller().getIndexManager();
Date now = new Date();
@@ -157,7 +157,7 @@
}
// commit the changes
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
// take a second pass to trigger reindexing and cache invalidations
// this is because we need the updated entries flushed first
@@ -178,7 +178,7 @@
log.error("Unexpected exception running task", e);
} finally {
// always release
- RollerFactory.getRoller().release();
+ WebloggerFactory.getRoller().release();
}
log.debug("task completed");
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=551059&r1=551058&r2=551059
==============================================================================
--- 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 Tue Jun 26 22:52:00 2007
@@ -24,7 +24,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.Weblogger;
-import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
/**
@@ -116,7 +116,7 @@
try {
log.info("task started");
- Weblogger roller = RollerFactory.getRoller();
+ Weblogger roller = WebloggerFactory.getRoller();
roller.getRefererManager().clearReferrers();
roller.flush();
@@ -128,7 +128,7 @@
log.error("unexpected exception", ee);
} finally {
// always release
- RollerFactory.getRoller().release();
+ WebloggerFactory.getRoller().release();
}
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/WorkerThread.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/WorkerThread.java?view=diff&rev=551059&r1=551058&r2=551059
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/WorkerThread.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/WorkerThread.java Tue Jun 26 22:52:00 2007
@@ -21,7 +21,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.business.Weblogger;
-import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
/**
@@ -74,7 +74,7 @@
}
// since this is a thread we have to make sure that we tidy up ourselves
- Weblogger roller = RollerFactory.getRoller();
+ Weblogger roller = WebloggerFactory.getRoller();
roller.release();
}
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=551059&r1=551058&r2=551059
==============================================================================
--- 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 Tue Jun 26 22:52:00 2007
@@ -24,7 +24,7 @@
import org.apache.roller.weblogger.business.FileManager;
import org.apache.roller.weblogger.business.FileNotFoundException;
import org.apache.roller.weblogger.business.FilePathException;
-import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.pojos.ThemeResource;
import org.apache.roller.weblogger.pojos.ThemeTemplate;
@@ -72,7 +72,7 @@
* Get the collection of all templates associated with this Theme.
*/
public List getTemplates() throws WebloggerException {
- UserManager userMgr = RollerFactory.getRoller().getUserManager();
+ UserManager userMgr = WebloggerFactory.getRoller().getUserManager();
return userMgr.getPages(this.weblog);
}
@@ -91,7 +91,7 @@
* Returns null if the template cannot be found.
*/
public ThemeTemplate getDefaultTemplate() throws WebloggerException {
- UserManager userMgr = RollerFactory.getRoller().getUserManager();
+ UserManager userMgr = WebloggerFactory.getRoller().getUserManager();
return userMgr.getPageByAction(this.weblog, ThemeTemplate.ACTION_WEBLOG);
}
@@ -104,7 +104,7 @@
if(action == null)
return null;
- UserManager userMgr = RollerFactory.getRoller().getUserManager();
+ UserManager userMgr = WebloggerFactory.getRoller().getUserManager();
return userMgr.getPageByAction(this.weblog, action);
}
@@ -117,7 +117,7 @@
if(name == null)
return null;
- UserManager userMgr = RollerFactory.getRoller().getUserManager();
+ UserManager userMgr = WebloggerFactory.getRoller().getUserManager();
return userMgr.getPageByName(this.weblog, name);
}
@@ -130,7 +130,7 @@
if(link == null)
return null;
- UserManager userMgr = RollerFactory.getRoller().getUserManager();
+ UserManager userMgr = WebloggerFactory.getRoller().getUserManager();
return userMgr.getPageByLink(this.weblog, link);
}
@@ -144,7 +144,7 @@
ThemeResource resource = null;
try {
- FileManager fileMgr = RollerFactory.getRoller().getFileManager();
+ FileManager fileMgr = WebloggerFactory.getRoller().getFileManager();
resource = fileMgr.getFile(this.weblog, path);
} 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=551059&r1=551058&r2=551059
==============================================================================
--- 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 Tue Jun 26 22:52:00 2007
@@ -30,7 +30,7 @@
import org.apache.roller.weblogger.business.FileManager;
import org.apache.roller.weblogger.business.FileNotFoundException;
import org.apache.roller.weblogger.business.FilePathException;
-import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.pojos.ThemeResource;
import org.apache.roller.weblogger.pojos.ThemeTemplate;
@@ -85,7 +85,7 @@
// first get the pages from the db
try {
ThemeTemplate template = null;
- UserManager userMgr = RollerFactory.getRoller().getUserManager();
+ UserManager userMgr = WebloggerFactory.getRoller().getUserManager();
Iterator dbPages = userMgr.getPages(this.weblog).iterator();
while(dbPages.hasNext()) {
template = (ThemeTemplate) dbPages.next();
@@ -130,7 +130,7 @@
ThemeTemplate stylesheet = this.theme.getStylesheet();
if(stylesheet != null) {
// now try getting custom version from weblog
- UserManager umgr = RollerFactory.getRoller().getUserManager();
+ UserManager umgr = WebloggerFactory.getRoller().getUserManager();
ThemeTemplate override = umgr.getPageByLink(this.weblog, stylesheet.getLink());
if(override != null) {
stylesheet = override;
@@ -188,7 +188,7 @@
// if we didn't get the Template from a theme then look in the db
if(template == null) {
- UserManager userMgr = RollerFactory.getRoller().getUserManager();
+ UserManager userMgr = WebloggerFactory.getRoller().getUserManager();
template = userMgr.getPageByName(this.weblog, name);
}
@@ -219,7 +219,7 @@
// if we didn't get the Template from a theme then look in the db
if(template == null) {
- UserManager userMgr = RollerFactory.getRoller().getUserManager();
+ UserManager userMgr = WebloggerFactory.getRoller().getUserManager();
template = userMgr.getPageByLink(this.weblog, link);
}
@@ -244,7 +244,7 @@
// if we didn't find it in our theme then look in weblog uploads
if(resource == null) {
try {
- FileManager fileMgr = RollerFactory.getRoller().getFileManager();
+ FileManager fileMgr = WebloggerFactory.getRoller().getFileManager();
resource = fileMgr.getFile(this.weblog, path);
} catch (WebloggerException ex) {
// ignored, resource considered not found
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=551059&r1=551058&r2=551059
==============================================================================
--- 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 Tue Jun 26 22:52:00 2007
@@ -22,7 +22,7 @@
import org.apache.commons.logging.LogFactory;
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.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.PingTarget;
import java.util.*;
@@ -190,7 +190,7 @@
}
return;
}
- PingTargetManager pingTargetMgr = RollerFactory.getRoller().getPingTargetManager();
+ PingTargetManager pingTargetMgr = WebloggerFactory.getRoller().getPingTargetManager();
if (!pingTargetMgr.getCommonPingTargets().isEmpty()) {
if (logger.isDebugEnabled()) {
logger.debug("Some common ping targets are present in the database already. Skipping initialization.");
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/RollerRuntimeConfig.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/RollerRuntimeConfig.java?view=diff&rev=551059&r1=551058&r2=551059
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/RollerRuntimeConfig.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/RollerRuntimeConfig.java Tue Jun 26 22:52:00 2007
@@ -26,7 +26,7 @@
import org.apache.roller.weblogger.config.runtime.RuntimeConfigDefs;
import org.apache.roller.weblogger.config.runtime.RuntimeConfigDefsParser;
import org.apache.roller.weblogger.business.PropertiesManager;
-import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.RuntimeConfigProperty;
@@ -63,7 +63,7 @@
String value = null;
try {
- PropertiesManager pmgr = RollerFactory.getRoller().getPropertiesManager();
+ PropertiesManager pmgr = WebloggerFactory.getRoller().getPropertiesManager();
RuntimeConfigProperty prop = pmgr.getProperty(name);
if(prop != null) {
value = prop.getValue();
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/RollerRomeFeedFetcher.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/RollerRomeFeedFetcher.java?view=diff&rev=551059&r1=551058&r2=551059
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/RollerRomeFeedFetcher.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/RollerRomeFeedFetcher.java Tue Jun 26 22:52:00 2007
@@ -37,7 +37,7 @@
import org.apache.roller.planet.pojos.PlanetEntryData;
import org.apache.roller.planet.pojos.PlanetSubscriptionData;
import org.apache.roller.weblogger.business.plugins.PluginManager;
-import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
@@ -80,13 +80,13 @@
Set newEntries = new TreeSet();
// get corresponding website object
- UserManager usermgr = RollerFactory.getRoller().getUserManager();
+ UserManager usermgr = WebloggerFactory.getRoller().getUserManager();
Weblog website = usermgr.getWebsiteByHandle(sub.getAuthor());
if (website == null)
return newEntries;
// figure website last update time
- WeblogManager blogmgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager blogmgr = WebloggerFactory.getRoller().getWeblogManager();
PlanetManager planetManager = PlanetFactory.getPlanet().getPlanetManager();
Date siteUpdated = website.getLastModified();
@@ -130,7 +130,7 @@
}
// Populate subscription object with new entries
- PluginManager ppmgr = RollerFactory.getRoller().getPagePluginManager();
+ PluginManager ppmgr = WebloggerFactory.getRoller().getPagePluginManager();
Map pagePlugins = ppmgr.getWeblogEntryPlugins(website);
Iterator entryIter = entries.iterator();
while (entryIter.hasNext()) {
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=551059&r1=551058&r2=551059
==============================================================================
--- 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 Tue Jun 26 22:52:00 2007
@@ -30,7 +30,7 @@
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.planet.business.PlanetFactory;
import org.apache.roller.planet.business.PlanetManager;
-import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.planet.pojos.PlanetData;
import org.apache.roller.planet.pojos.PlanetGroupData;
@@ -138,7 +138,7 @@
try {
PlanetManager planet = PlanetFactory.getPlanet().getPlanetManager();
- UserManager userManager = RollerFactory.getRoller().getUserManager();
+ UserManager userManager = WebloggerFactory.getRoller().getUserManager();
// first, make sure there is an "all" planet group
PlanetData planetObject = planet.getPlanet("zzz_default_planet_zzz");
@@ -223,7 +223,7 @@
log.error("ERROR refreshing entries", e);
} finally {
// don't forget to release
- RollerFactory.getRoller().release();
+ WebloggerFactory.getRoller().release();
PlanetFactory.getPlanet().release();
}
}
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=551059&r1=551058&r2=551059
==============================================================================
--- 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 Tue Jun 26 22:52:00 2007
@@ -35,7 +35,7 @@
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.referrers.RefererManager;
-import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
@@ -191,7 +191,7 @@
public WeblogTheme getTheme() {
try {
// let the ThemeManager handle it
- ThemeManager themeMgr = RollerFactory.getRoller().getThemeManager();
+ ThemeManager themeMgr = WebloggerFactory.getRoller().getThemeManager();
return themeMgr.getTheme(this);
} catch (WebloggerException ex) {
log.error("Error getting theme for weblog - "+getHandle(), ex);
@@ -924,7 +924,7 @@
public Map getInitializedPlugins() {
if (initializedPlugins == null) {
try {
- Weblogger roller = RollerFactory.getRoller();
+ Weblogger roller = WebloggerFactory.getRoller();
PluginManager ppmgr = roller.getPagePluginManager();
initializedPlugins = ppmgr.getWeblogEntryPlugins(this);
} catch (Exception e) {
@@ -943,7 +943,7 @@
public WeblogEntry getWeblogEntry(String anchor) {
WeblogEntry entry = null;
try {
- Weblogger roller = RollerFactory.getRoller();
+ Weblogger roller = WebloggerFactory.getRoller();
WeblogManager wmgr = roller.getWeblogManager();
entry = wmgr.getWeblogEntryByAnchor(this, anchor);
} catch (WebloggerException e) {
@@ -977,7 +977,7 @@
public Set getWeblogCategories(String categoryPath) {
Set ret = new HashSet();
try {
- Weblogger roller = RollerFactory.getRoller();
+ Weblogger roller = WebloggerFactory.getRoller();
WeblogManager wmgr = roller.getWeblogManager();
WeblogCategory category = null;
if (categoryPath != null && !categoryPath.equals("nil")) {
@@ -1001,7 +1001,7 @@
public WeblogCategory getWeblogCategory(String categoryPath) {
WeblogCategory category = null;
try {
- Weblogger roller = RollerFactory.getRoller();
+ Weblogger roller = WebloggerFactory.getRoller();
WeblogManager wmgr = roller.getWeblogManager();
if (categoryPath != null && !categoryPath.equals("nil")) {
category = wmgr.getWeblogCategoryByPath(this, categoryPath);
@@ -1029,7 +1029,7 @@
List recentEntries = new ArrayList();
if (length < 1) return recentEntries;
try {
- WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
recentEntries = wmgr.getWeblogEntries(
this,
@@ -1068,7 +1068,7 @@
}
if (length < 1) return recentEntries;
try {
- WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
recentEntries = wmgr.getWeblogEntries(
this,
@@ -1101,7 +1101,7 @@
List recentComments = new ArrayList();
if (length < 1) return recentComments;
try {
- WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
recentComments = wmgr.getComments(
this,
@@ -1129,7 +1129,7 @@
public WeblogBookmarkFolder getBookmarkFolder(String folderName) {
WeblogBookmarkFolder ret = null;
try {
- Weblogger roller = RollerFactory.getRoller();
+ Weblogger roller = WebloggerFactory.getRoller();
BookmarkManager bmgr = roller.getBookmarkManager();
if (folderName == null || folderName.equals("nil") || folderName.trim().equals("/")) {
return bmgr.getRootFolder(this);
@@ -1150,7 +1150,7 @@
public List getTodaysReferrers() {
List referers = null;
try {
- Weblogger roller = RollerFactory.getRoller();
+ Weblogger roller = WebloggerFactory.getRoller();
RefererManager rmgr = roller.getRefererManager();
return rmgr.getTodaysReferers(this);
@@ -1169,7 +1169,7 @@
*/
public int getTodaysHits() {
try {
- Weblogger roller = RollerFactory.getRoller();
+ Weblogger roller = WebloggerFactory.getRoller();
WeblogManager mgr = roller.getWeblogManager();
WeblogHitCount hitCount = mgr.getHitCountByWeblog(this);
@@ -1204,7 +1204,7 @@
startDate = cal.getTime();
}
try {
- Weblogger roller = RollerFactory.getRoller();
+ Weblogger roller = WebloggerFactory.getRoller();
WeblogManager wmgr = roller.getWeblogManager();
results = wmgr.getPopularTags(this, startDate, length);
} catch (Exception e) {
@@ -1219,7 +1219,7 @@
public long getCommentCount() {
long count = 0;
try {
- Weblogger roller = RollerFactory.getRoller();
+ Weblogger roller = WebloggerFactory.getRoller();
WeblogManager mgr = roller.getWeblogManager();
count = mgr.getCommentCount(this);
} catch (WebloggerException e) {
@@ -1237,7 +1237,7 @@
public long getEntryCount() {
long count = 0;
try {
- Weblogger roller = RollerFactory.getRoller();
+ Weblogger roller = WebloggerFactory.getRoller();
WeblogManager mgr = roller.getWeblogManager();
count = mgr.getEntryCount(this);
} catch (WebloggerException e) {
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=551059&r1=551058&r2=551059
==============================================================================
--- 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 Tue Jun 26 22:52:00 2007
@@ -30,7 +30,7 @@
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.WebloggerFactory;
import org.apache.roller.util.UUIDGenerator;
@@ -325,7 +325,7 @@
* @param subfolders
*/
public List retrieveBookmarks(boolean subfolders) throws WebloggerException {
- BookmarkManager bmgr = RollerFactory.getRoller().getBookmarkManager();
+ BookmarkManager bmgr = WebloggerFactory.getRoller().getBookmarkManager();
return bmgr.getBookmarks(this, subfolders);
}
@@ -405,7 +405,7 @@
} else {
childFolder.setPath(folder.getPath() + "/" + childFolder.getName());
}
- RollerFactory.getRoller().getBookmarkManager().saveFolder(childFolder);
+ WebloggerFactory.getRoller().getBookmarkManager().saveFolder(childFolder);
log.debug("NEW child folder path is "+ childFolder.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=551059&r1=551058&r2=551059
==============================================================================
--- 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 Tue Jun 26 22:52:00 2007
@@ -28,7 +28,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.util.UUIDGenerator;
@@ -250,7 +250,7 @@
* @throws WebloggerException
*/
public List retrieveWeblogEntries(boolean subcats) throws WebloggerException {
- WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
return wmgr.getWeblogEntries(this, subcats);
}
@@ -318,7 +318,7 @@
*/
public boolean isInUse() {
try {
- return RollerFactory.getRoller().getWeblogManager().isWeblogCategoryInUse(this);
+ return WebloggerFactory.getRoller().getWeblogManager().isWeblogCategoryInUse(this);
} catch (WebloggerException e) {
throw new RuntimeException(e);
}
@@ -364,7 +364,7 @@
} else {
childCat.setPath(cat.getPath() + "/" + childCat.getName());
}
- RollerFactory.getRoller().getWeblogManager().saveWeblogCategory(childCat);
+ WebloggerFactory.getRoller().getWeblogManager().saveWeblogCategory(childCat);
log.debug("NEW child category path is "+ childCat.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=551059&r1=551058&r2=551059
==============================================================================
--- 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 Tue Jun 26 22:52:00 2007
@@ -46,7 +46,7 @@
import org.apache.commons.logging.LogFactory;
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.WebloggerFactory;
import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.util.DateUtil;
@@ -710,7 +710,7 @@
}
}
- WeblogManager weblogManager = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager weblogManager = WebloggerFactory.getRoller().getWeblogManager();
for (Iterator it = removeTags.iterator(); it.hasNext();) {
weblogManager.removeWeblogEntryTag((String) it.next(), this);
}
@@ -853,7 +853,7 @@
public List getComments(boolean ignoreSpam, boolean approvedOnly) {
List list = new ArrayList();
try {
- WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
return wmgr.getComments(
getWebsite(),
@@ -889,7 +889,7 @@
public List getReferers() {
List referers = null;
try {
- referers = RollerFactory.getRoller().getRefererManager().getReferersToEntry(getId());
+ referers = WebloggerFactory.getRoller().getRefererManager().getReferersToEntry(getId());
} catch (WebloggerException e) {
mLogger.error("Unexpected exception", e);
}
@@ -976,7 +976,7 @@
/** Create anchor for weblog entry, based on title or text */
protected String createAnchor() throws WebloggerException {
- return RollerFactory.getRoller().getWeblogManager().createAnchor(this);
+ return WebloggerFactory.getRoller().getWeblogManager().createAnchor(this);
}
/** Create anchor for weblog entry, based on title or text */
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=551059&r1=551058&r2=551059
==============================================================================
--- 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 Tue Jun 26 22:52:00 2007
@@ -36,7 +36,7 @@
import org.apache.roller.weblogger.business.BootstrapException;
import org.apache.roller.weblogger.business.startup.StartupException;
import org.apache.roller.weblogger.config.RollerConfig;
-import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.planet.business.PlanetFactory;
import org.apache.roller.planet.business.startup.PlanetStartup;
import org.apache.roller.weblogger.business.startup.WebloggerStartup;
@@ -125,10 +125,10 @@
} else {
try {
// trigger bootstrapping process
- RollerFactory.bootstrap();
+ WebloggerFactory.bootstrap();
// trigger initialization process
- RollerFactory.getRoller().initialize();
+ WebloggerFactory.getRoller().initialize();
} catch (BootstrapException ex) {
log.fatal("Roller Weblogger bootstrap failed", ex);
@@ -137,7 +137,7 @@
}
// Initialize Planet if necessary
- if (RollerFactory.isBootstrapped()) {
+ if (WebloggerFactory.isBootstrapped()) {
if (RollerConfig.getBooleanProperty("planet.aggregator.enabled")) {
// Now prepare the core services of planet so we can bootstrap it
@@ -178,7 +178,7 @@
* Responds to app-destroy event and triggers shutdown sequence.
*/
public void contextDestroyed(ServletContextEvent sce) {
- RollerFactory.getRoller().shutdown();
+ WebloggerFactory.getRoller().shutdown();
// do we need a more generic mechanism for presentation layer shutdown?
CacheManager.shutdown();
}
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=551059&r1=551058&r2=551059
==============================================================================
--- 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 Tue Jun 26 22:52:00 2007
@@ -30,7 +30,7 @@
import org.apache.commons.logging.LogFactory;
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.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.pojos.User;
@@ -75,7 +75,7 @@
Principal principal = request.getUserPrincipal();
if (rollerSession.getAuthenticatedUser() == null && principal != null) {
try {
- UserManager umgr = RollerFactory.getRoller().getUserManager();
+ UserManager umgr = WebloggerFactory.getRoller().getUserManager();
User user = umgr.getUserByUserName(principal.getName());
// try one time to auto-provision, only happens if user==null
@@ -141,7 +141,7 @@
User authenticUser = null;
if(userId != null) {
try {
- UserManager mgr = RollerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getRoller().getUserManager();
authenticUser = mgr.getUser(userId);
} catch (WebloggerException ex) {
log.warn("Error looking up authenticated user "+userId, ex);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java?view=diff&rev=551059&r1=551058&r2=551059
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java Tue Jun 26 22:52:00 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.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.config.RollerConfig;
@@ -52,7 +52,7 @@
log.debug("Entered "+request.getRequestURI());
- if (!RollerFactory.isBootstrapped() &&
+ if (!WebloggerFactory.isBootstrapped() &&
"auto".equals(RollerConfig.getProperty("installation.type")) &&
!isInstallUrl(request.getServletPath())) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/PersistenceSessionFilter.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/PersistenceSessionFilter.java?view=diff&rev=551059&r1=551058&r2=551059
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/PersistenceSessionFilter.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/PersistenceSessionFilter.java Tue Jun 26 22:52:00 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.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.config.RollerConfig;
import org.apache.roller.planet.business.PlanetFactory;
@@ -59,9 +59,9 @@
try {
chain.doFilter(request, response);
} finally {
- if (RollerFactory.isBootstrapped()) {
+ if (WebloggerFactory.isBootstrapped()) {
log.debug("Releasing Roller Session");
- RollerFactory.getRoller().release();
+ WebloggerFactory.getRoller().release();
// if planet is enabled then release planet backend as well
if (RollerConfig.getBooleanProperty("planet.aggregator.enabled")) {
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=551059&r1=551058&r2=551059
==============================================================================
--- 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 Tue Jun 26 22:52:00 2007
@@ -20,7 +20,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.pojos.User;
@@ -43,9 +43,9 @@
if(ud != null) {
UserManager mgr;
try {
- mgr = RollerFactory.getRoller().getUserManager();
+ mgr = WebloggerFactory.getRoller().getUserManager();
mgr.addUser(ud);
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
} 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=551059&r1=551058&r2=551059
==============================================================================
--- 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 Tue Jun 26 22:52:00 2007
@@ -8,7 +8,7 @@
import org.acegisecurity.userdetails.UsernameNotFoundException;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.Weblogger;
-import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.pojos.UserRole;
import org.apache.roller.weblogger.pojos.User;
@@ -25,7 +25,7 @@
User userData = null;
try {
- Weblogger roller = RollerFactory.getRoller();
+ Weblogger roller = WebloggerFactory.getRoller();
UserManager umgr = roller.getUserManager();
userData = umgr.getUserByUserName(userName, Boolean.TRUE);
} catch (WebloggerException 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=551059&r1=551058&r2=551059
==============================================================================
--- 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 Tue Jun 26 22:52:00 2007
@@ -25,7 +25,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.ui.rendering.util.WeblogPageRequest;
@@ -54,7 +54,7 @@
protected void loadWeblogEntries(Date startDate, Date endDate, String catName) {
try {
- WeblogManager mgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager mgr = WebloggerFactory.getRoller().getWeblogManager();
monthMap = mgr.getWeblogEntryObjectMap(
weblog, // website
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=551059&r1=551058&r2=551059
==============================================================================
--- 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 Tue Jun 26 22:52:00 2007
@@ -28,7 +28,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
@@ -100,7 +100,7 @@
// Get entries before startDate, using category restriction limit 1
// Use entry's date as previous month
try {
- WeblogManager mgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager mgr = WebloggerFactory.getRoller().getWeblogManager();
List prevEntries = mgr.getWeblogEntries(
weblog, // website
@@ -126,7 +126,7 @@
// Get entries after endDate, using category restriction limit 1
// Use entry's date as next month
try {
- WeblogManager mgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager mgr = WebloggerFactory.getRoller().getWeblogManager();
List nextEntries = mgr.getWeblogEntries(
weblog, // website
@@ -157,7 +157,7 @@
protected void loadWeblogEntries(Date startDate, Date endDate, String catName) {
try {
- WeblogManager mgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager mgr = WebloggerFactory.getRoller().getWeblogManager();
monthMap = mgr.getWeblogEntryStringMap(
weblog, // website
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/WeblogRequestMapper.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/WeblogRequestMapper.java?view=diff&rev=551059&r1=551058&r2=551059
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/WeblogRequestMapper.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/WeblogRequestMapper.java Tue Jun 26 22:52:00 2007
@@ -30,7 +30,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.config.RollerConfig;
-import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.pojos.Weblog;
@@ -383,7 +383,7 @@
boolean isWeblog = false;
try {
- UserManager mgr = RollerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getRoller().getUserManager();
Weblog weblog = mgr.getWebsiteByHandle(potentialHandle);
if(weblog != null) {
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=551059&r1=551058&r2=551059
==============================================================================
--- 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 Tue Jun 26 22:52:00 2007
@@ -22,7 +22,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
/**
@@ -105,19 +105,19 @@
/** Get Roller version string */
public String getRollerVersion() {
- return RollerFactory.getRoller().getVersion();
+ return WebloggerFactory.getRoller().getVersion();
}
/** Get timestamp of Roller build */
public String getRollerBuildTimestamp() {
- return RollerFactory.getRoller().getBuildTime();
+ return WebloggerFactory.getRoller().getBuildTime();
}
/** Get username who created Roller build */
public String getRollerBuildUser() {
- return RollerFactory.getRoller().getBuildUser();
+ return WebloggerFactory.getRoller().getBuildUser();
}
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=551059&r1=551058&r2=551059
==============================================================================
--- 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 Tue Jun 26 22:52:00 2007
@@ -26,7 +26,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.Weblogger;
-import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.pojos.wrapper.ThemeTemplateWrapper;
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=551059&r1=551058&r2=551059
==============================================================================
--- 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 Tue Jun 26 22:52:00 2007
@@ -34,7 +34,7 @@
import org.apache.lucene.search.Hits;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.Weblogger;
-import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.business.search.FieldConstants;
import org.apache.roller.weblogger.business.search.IndexManager;
@@ -119,7 +119,7 @@
this.entryCount = RollerRuntimeConfig.getIntProperty("site.newsfeeds.defaultEntries");
// setup the search
- IndexManager indexMgr = RollerFactory.getRoller().getIndexManager();
+ IndexManager indexMgr = WebloggerFactory.getRoller().getIndexManager();
SearchOperation search = new SearchOperation(indexMgr);
search.setTerm(feedRequest.getTerm());
@@ -170,7 +170,7 @@
try {
TreeSet categories = new TreeSet();
- Weblogger roller = RollerFactory.getRoller();
+ Weblogger roller = WebloggerFactory.getRoller();
WeblogManager weblogMgr = roller.getWeblogManager();
WeblogEntry entry = null;