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 08:20:39 UTC
svn commit: r551071 [2/4] - 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...
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPreviewPager.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPreviewPager.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPreviewPager.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPreviewPager.java Tue Jun 26 23:20:33 2007
@@ -62,7 +62,7 @@
public Map getEntries() {
if (entries == null) try {
- Weblogger roller = WebloggerFactory.getRoller();
+ Weblogger roller = WebloggerFactory.getWeblogger();
WeblogManager wmgr = roller.getWeblogManager();
currEntry = wmgr.getWeblogEntryByAnchor(weblog, entryAnchor);
if (currEntry != null) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogsPager.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogsPager.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogsPager.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogsPager.java Tue Jun 26 23:20:33 2007
@@ -140,7 +140,7 @@
startDate = cal.getTime();
}
try {
- Weblogger roller = WebloggerFactory.getRoller();
+ Weblogger roller = WebloggerFactory.getWeblogger();
UserManager umgr = roller.getUserManager();
List rawWeblogs = null;
if (letter == null) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java Tue Jun 26 23:20:33 2007
@@ -72,7 +72,7 @@
URLConnection conn = url.openConnection();
conn.setDoOutput(true);
- conn.setRequestProperty("User_Agent", "Roller " + WebloggerFactory.getRoller().getVersion());
+ conn.setRequestProperty("User_Agent", "Roller " + WebloggerFactory.getWeblogger().getVersion());
conn.setRequestProperty("Content-type", "application/x-www-form-urlencoded;charset=utf8");
conn.setRequestProperty("Content-length", Integer.toString(sb.length()));
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java Tue Jun 26 23:20:33 2007
@@ -187,7 +187,7 @@
commentRequest = new WeblogCommentRequest(request);
// lookup weblog specified by comment request
- UserManager uMgr = WebloggerFactory.getRoller().getUserManager();
+ UserManager uMgr = WebloggerFactory.getWeblogger().getUserManager();
weblog = uMgr.getWebsiteByHandle(commentRequest.getWeblogHandle());
if(weblog == null) {
@@ -283,9 +283,9 @@
if(!WeblogEntryComment.SPAM.equals(comment.getStatus()) ||
!RollerRuntimeConfig.getBooleanProperty("comments.ignoreSpam.enabled")) {
- WeblogManager mgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
mgr.saveComment(comment);
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
// Send email notifications only to subscribers if comment is 100% valid
boolean notifySubscribers = (validationScore == 100);
@@ -293,7 +293,7 @@
// only re-index/invalidate the cache if comment isn't moderated
if(!weblog.getCommentModerationRequired()) {
- IndexManager manager = WebloggerFactory.getRoller().getIndexManager();
+ IndexManager manager = WebloggerFactory.getWeblogger().getIndexManager();
// remove entry before (re)adding it, or in case it isn't Published
manager.removeEntryIndexOperation(entry);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java Tue Jun 26 23:20:33 2007
@@ -192,7 +192,7 @@
try {
// tags specified. make sure they exist.
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
invalid = !wmgr.getTagComboExists(feedRequest.getTags(), (isSiteWide) ? null : weblog);
} catch (WebloggerException ex) {
invalid = true;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java Tue Jun 26 23:20:33 2007
@@ -328,7 +328,7 @@
try {
// tags specified. make sure they exist.
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
invalid = !wmgr.getTagComboExists(pageRequest.getTags(), (isSiteWide) ? null : weblog);
} catch (WebloggerException ex) {
invalid = true;
@@ -608,7 +608,7 @@
referrer.setWeblogDateString(pageRequest.getWeblogDate());
ReferrerQueueManager refQueue =
- WebloggerFactory.getRoller().getReferrerQueueManager();
+ WebloggerFactory.getWeblogger().getReferrerQueueManager();
refQueue.processReferrer(referrer);
} catch(Exception e) {
log.error("Error processing referrer", e);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java Tue Jun 26 23:20:33 2007
@@ -131,7 +131,7 @@
// if not from theme then see if resource is in weblog's upload dir
if(resourceStream == null) {
try {
- FileManager fileMgr = WebloggerFactory.getRoller().getFileManager();
+ FileManager fileMgr = WebloggerFactory.getWeblogger().getFileManager();
ThemeResource resource = fileMgr.getFile(weblog,
resourceRequest.getResourcePath());
resourceLastMod = resource.getLastModified();
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewThemeImageServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewThemeImageServlet.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewThemeImageServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewThemeImageServlet.java Tue Jun 26 23:20:33 2007
@@ -74,7 +74,7 @@
// try looking up selected theme
try {
- ThemeManager tmgr = WebloggerFactory.getRoller().getThemeManager();
+ ThemeManager tmgr = WebloggerFactory.getWeblogger().getThemeManager();
SharedTheme previewTheme = tmgr.getTheme(theme);
ThemeResource previewImage = previewTheme.getPreviewImage();
if(previewImage != null) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServlet.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServlet.java Tue Jun 26 23:20:33 2007
@@ -121,7 +121,7 @@
// if not from theme then see if resource is in weblog's upload dir
if(resourceStream == null) {
try {
- FileManager fileMgr = WebloggerFactory.getRoller().getFileManager();
+ FileManager fileMgr = WebloggerFactory.getWeblogger().getFileManager();
ThemeResource resource = fileMgr.getFile(weblog,
resourceRequest.getResourcePath());
resourceLastMod = resource.getLastModified();
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java Tue Jun 26 23:20:33 2007
@@ -82,7 +82,7 @@
searchRequest = new WeblogSearchRequest(request);
// now make sure the specified weblog really exists
- UserManager userMgr = WebloggerFactory.getRoller().getUserManager();
+ UserManager userMgr = WebloggerFactory.getWeblogger().getUserManager();
weblog = userMgr.getWebsiteByHandle(searchRequest.getWeblogHandle(), Boolean.TRUE);
} catch(Exception e) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/TrackbackServlet.java Tue Jun 26 23:20:33 2007
@@ -118,7 +118,7 @@
}
// lookup weblog specified by comment request
- UserManager uMgr = WebloggerFactory.getRoller().getUserManager();
+ UserManager uMgr = WebloggerFactory.getWeblogger().getUserManager();
weblog = uMgr.getWebsiteByHandle(trackbackRequest.getWeblogHandle());
if (weblog == null) {
@@ -127,7 +127,7 @@
}
// lookup entry specified by comment request
- WeblogManager weblogMgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager weblogMgr = WebloggerFactory.getWeblogger().getWeblogManager();
entry = weblogMgr.getWeblogEntryByAnchor(weblog, trackbackRequest.getWeblogAnchor());
if (entry == null) {
@@ -181,9 +181,9 @@
if(!WeblogEntryComment.SPAM.equals(comment.getStatus()) ||
!RollerRuntimeConfig.getBooleanProperty("trackbacks.ignoreSpam.enabled")) {
- WeblogManager mgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
mgr.saveComment(comment);
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
// only invalidate the cache if comment isn't moderated
if(!weblog.getCommentModerationRequired()) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/ParsedRequest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/ParsedRequest.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/ParsedRequest.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/ParsedRequest.java Tue Jun 26 23:20:33 2007
@@ -88,7 +88,7 @@
if(user == null && authenticUser != null) {
try {
- UserManager umgr = WebloggerFactory.getRoller().getUserManager();
+ UserManager umgr = WebloggerFactory.getWeblogger().getUserManager();
user = umgr.getUserByUserName(authenticUser);
} catch (WebloggerException ex) {
log.error("Error looking up user "+authenticUser, ex);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogCommentRequest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogCommentRequest.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogCommentRequest.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogCommentRequest.java Tue Jun 26 23:20:33 2007
@@ -203,7 +203,7 @@
if(weblogEntry == null && weblogAnchor != null) {
try {
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
weblogEntry = wmgr.getWeblogEntryByAnchor(getWeblog(), weblogAnchor);
} catch (WebloggerException ex) {
log.error("Error getting weblog entry "+weblogAnchor, ex);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java Tue Jun 26 23:20:33 2007
@@ -215,7 +215,7 @@
if(weblogCategory == null && weblogCategoryName != null) {
try {
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
weblogCategory = wmgr.getWeblogCategoryByPath(getWeblog(), weblogCategoryName);
} catch (WebloggerException ex) {
log.error("Error getting weblog category "+weblogCategoryName, ex);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.java Tue Jun 26 23:20:33 2007
@@ -331,7 +331,7 @@
if(weblogEntry == null && weblogAnchor != null) {
try {
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
weblogEntry = wmgr.getWeblogEntryByAnchor(getWeblog(), weblogAnchor);
} catch (WebloggerException ex) {
log.error("Error getting weblog entry "+weblogAnchor, ex);
@@ -366,7 +366,7 @@
if(weblogCategory == null && weblogCategoryName != null) {
try {
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
weblogCategory = wmgr.getWeblogCategoryByPath(getWeblog(), weblogCategoryName);
} catch (WebloggerException ex) {
log.error("Error getting weblog category "+weblogCategoryName, ex);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewRequest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewRequest.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewRequest.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewRequest.java Tue Jun 26 23:20:33 2007
@@ -97,7 +97,7 @@
if(theme == null && themeName != null) {
try {
- ThemeManager themeMgr = WebloggerFactory.getRoller().getThemeManager();
+ ThemeManager themeMgr = WebloggerFactory.getWeblogger().getThemeManager();
theme = themeMgr.getTheme(themeName);
} catch(ThemeNotFoundException tnfe) {
// bogus theme specified ... don't worry about it
@@ -133,7 +133,7 @@
}
try {
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
weblogEntry = wmgr.getWeblogEntryByAnchor(getWeblog(), anchor);
} catch (WebloggerException ex) {
log.error("Error getting weblog entry "+anchor, ex);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewResourceRequest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewResourceRequest.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewResourceRequest.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewResourceRequest.java Tue Jun 26 23:20:33 2007
@@ -84,7 +84,7 @@
if(theme == null && themeName != null) {
try {
- ThemeManager themeMgr = WebloggerFactory.getRoller().getThemeManager();
+ ThemeManager themeMgr = WebloggerFactory.getWeblogger().getThemeManager();
theme = themeMgr.getTheme(themeName);
} catch(ThemeNotFoundException tnfe) {
// bogus theme specified ... don't worry about it
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogRequest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogRequest.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogRequest.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogRequest.java Tue Jun 26 23:20:33 2007
@@ -186,7 +186,7 @@
if(weblog == null && weblogHandle != null) {
try {
- UserManager umgr = WebloggerFactory.getRoller().getUserManager();
+ UserManager umgr = WebloggerFactory.getWeblogger().getUserManager();
weblog = umgr.getWebsiteByHandle(weblogHandle, Boolean.TRUE);
} catch (WebloggerException ex) {
log.error("Error looking up weblog "+weblogHandle, ex);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogSearchRequest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogSearchRequest.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogSearchRequest.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogSearchRequest.java Tue Jun 26 23:20:33 2007
@@ -135,7 +135,7 @@
if(weblogCategory == null && weblogCategoryName != null) {
try {
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
weblogCategory = wmgr.getWeblogCategoryByPath(getWeblog(), weblogCategoryName);
} catch (WebloggerException ex) {
log.error("Error getting weblog category "+weblogCategoryName, ex);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogTrackbackRequest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogTrackbackRequest.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogTrackbackRequest.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogTrackbackRequest.java Tue Jun 26 23:20:33 2007
@@ -195,7 +195,7 @@
if(weblogEntry == null && weblogAnchor != null) {
try {
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
weblogEntry = wmgr.getWeblogEntryByAnchor(getWeblog(), weblogAnchor);
} catch (WebloggerException ex) {
log.error("Error getting weblog entry "+weblogAnchor, ex);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java Tue Jun 26 23:20:33 2007
@@ -78,7 +78,7 @@
try {
WeblogTemplate page =
- WebloggerFactory.getRoller().getUserManager().getPage(name);
+ WebloggerFactory.getWeblogger().getUserManager().getPage(name);
if (page == null) {
throw new ResourceNotFoundException(
@@ -116,7 +116,7 @@
String name = resource.getName();
try {
WeblogTemplate page =
- WebloggerFactory.getRoller().getUserManager().getPage(name);
+ WebloggerFactory.getWeblogger().getUserManager().getPage(name);
if (mLogger.isDebugEnabled()) {
mLogger.debug(name + ": resource=" + resource.getLastModified() +
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/ThemeResourceLoader.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/ThemeResourceLoader.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/ThemeResourceLoader.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/ThemeResourceLoader.java Tue Jun 26 23:20:33 2007
@@ -73,7 +73,7 @@
throw new ResourceNotFoundException("Invalid ThemeRL key "+name);
// lookup the template from the proper theme
- ThemeManager themeMgr = WebloggerFactory.getRoller().getThemeManager();
+ ThemeManager themeMgr = WebloggerFactory.getWeblogger().getThemeManager();
Theme theme = themeMgr.getTheme(split[0]);
ThemeTemplate template = theme.getTemplateByName(split[1]);
@@ -126,7 +126,7 @@
return last_mod;
// lookup the template from the proper theme
- ThemeManager themeMgr = WebloggerFactory.getRoller().getThemeManager();
+ ThemeManager themeMgr = WebloggerFactory.getWeblogger().getThemeManager();
Theme theme = themeMgr.getTheme(split[0]);
ThemeTemplate template = theme.getTemplateByName(split[1]);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java Tue Jun 26 23:20:33 2007
@@ -212,7 +212,7 @@
if(weblog == null)
return;
- Weblogger mRoller = WebloggerFactory.getRoller();
+ Weblogger mRoller = WebloggerFactory.getWeblogger();
Map props = mRoller.getPropertiesManager().getProperties();
ctx.put("userName", weblog.getHandle());
@@ -380,9 +380,9 @@
ctx.put("page",ThemeTemplateWrapper.wrap(page));
ctx.put("utilities", new OldUtilities() );
ctx.put("stringUtils", new OldStringUtils() );
- ctx.put("rollerVersion", WebloggerFactory.getRoller().getVersion() );
- ctx.put("rollerBuildTime", WebloggerFactory.getRoller().getBuildTime() );
- ctx.put("rollerBuildUser", WebloggerFactory.getRoller().getBuildUser() );
+ ctx.put("rollerVersion", WebloggerFactory.getWeblogger().getVersion() );
+ ctx.put("rollerBuildTime", WebloggerFactory.getWeblogger().getBuildTime() );
+ ctx.put("rollerBuildUser", WebloggerFactory.getWeblogger().getBuildUser() );
ctx.put("newsfeedCache", NewsfeedCache.getInstance() );
ctx.put("requestParameters", request.getParameterMap());
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java Tue Jun 26 23:20:33 2007
@@ -90,7 +90,7 @@
mFolder = folder;
// init plugins
- Weblogger roller = WebloggerFactory.getRoller();
+ Weblogger roller = WebloggerFactory.getWeblogger();
PluginManager ppmgr = roller.getPagePluginManager();
mPagePlugins = ppmgr.getWeblogEntryPlugins(mWebsite);
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java Tue Jun 26 23:20:33 2007
@@ -120,10 +120,10 @@
mIsMonthSpecified = isMonth;
mLocale = locale;
- mBookmarkMgr = WebloggerFactory.getRoller().getBookmarkManager();
- mRefererMgr = WebloggerFactory.getRoller().getRefererManager();
- mUserMgr = WebloggerFactory.getRoller().getUserManager();
- mWeblogMgr = WebloggerFactory.getRoller().getWeblogManager();
+ mBookmarkMgr = WebloggerFactory.getWeblogger().getBookmarkManager();
+ mRefererMgr = WebloggerFactory.getWeblogger().getRefererManager();
+ mUserMgr = WebloggerFactory.getWeblogger().getUserManager();
+ mWeblogMgr = WebloggerFactory.getWeblogger().getWeblogManager();
// Preload what we can for encapsulation. What we cannot preload we
// will use the Managers later to fetch.
@@ -379,7 +379,7 @@
} else if (mIsMonthSpecified) {
endDate = DateUtil.getEndOfMonth(endDate, cal);
}
- Map mRet = WebloggerFactory.getRoller().getWeblogManager().getWeblogEntryObjectMap(
+ Map mRet = WebloggerFactory.getWeblogger().getWeblogManager().getWeblogEntryObjectMap(
mWebsite,
startDate, // startDate
@@ -475,7 +475,7 @@
catParam = null;
}
}
- WeblogManager mgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
//ret = mgr.getRecentWeblogEntriesArray(
//name, day, catParam, maxEntries, true );
@@ -789,7 +789,7 @@
public List getRecentComments(int maxCount) {
List recentComments = new ArrayList();
try {
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
List recent = wmgr.getComments(
mWebsite,
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargets.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargets.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargets.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CommonPingTargets.java Tue Jun 26 23:20:33 2007
@@ -58,7 +58,7 @@
public void loadPingTargets() {
try {
- PingTargetManager pingTargetMgr = WebloggerFactory.getRoller().getPingTargetManager();
+ PingTargetManager pingTargetMgr = WebloggerFactory.getWeblogger().getPingTargetManager();
setPingTargets(pingTargetMgr.getCommonPingTargets());
} catch (WebloggerException ex) {
log.error("Error loading common ping targets", ex);
@@ -77,9 +77,9 @@
try {
getPingTarget().setAutoEnabled(true);
- PingTargetManager pingTargetMgr = WebloggerFactory.getRoller().getPingTargetManager();
+ PingTargetManager pingTargetMgr = WebloggerFactory.getWeblogger().getPingTargetManager();
pingTargetMgr.savePingTarget(getPingTarget());
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
} catch (Exception ex) {
getLogger().error("Error saving ping target", ex);
// TODO: i18n
@@ -103,9 +103,9 @@
try {
getPingTarget().setAutoEnabled(false);
- PingTargetManager pingTargetMgr = WebloggerFactory.getRoller().getPingTargetManager();
+ PingTargetManager pingTargetMgr = WebloggerFactory.getWeblogger().getPingTargetManager();
pingTargetMgr.savePingTarget(getPingTarget());
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
} catch (Exception ex) {
getLogger().error("Error saving ping target", ex);
// TODO: i18n
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java Tue Jun 26 23:20:33 2007
@@ -85,7 +85,7 @@
if (!hasActionErrors()) try {
- UserManager mgr = WebloggerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
// copy form data into new user pojo
User newUser = new User();
@@ -94,7 +94,7 @@
// set username and password
newUser.setUserName(getBean().getUserName());
- newUser.resetPassword(WebloggerFactory.getRoller(),
+ newUser.resetPassword(WebloggerFactory.getWeblogger(),
getBean().getPassword(), getBean().getPassword());
// are we granting the user admin rights?
@@ -104,7 +104,7 @@
// save new user
mgr.addUser(newUser);
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
// TODO: i18n
addMessage("New user created");
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java Tue Jun 26 23:20:33 2007
@@ -90,7 +90,7 @@
List comments = Collections.EMPTY_LIST;
boolean hasMore = false;
try {
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
comments = wmgr.getComments(
null,
null,
@@ -174,7 +174,7 @@
getBean().loadCheckboxes(getPager().getItems());
try {
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
List allMatchingComments = wmgr.getComments(
null,
null,
@@ -206,7 +206,7 @@
public String delete() {
try {
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
int deleted = wmgr.removeMatchingComments(
null,
null,
@@ -239,7 +239,7 @@
public String update() {
try {
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
List flushList = new ArrayList();
@@ -289,7 +289,7 @@
}
}
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
// notify caches of changes
for (Iterator comments=flushList.iterator(); comments.hasNext();) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java Tue Jun 26 23:20:33 2007
@@ -75,7 +75,7 @@
public void myPrepare() {
try {
// just grab our properties map and make it available to the action
- PropertiesManager mgr = WebloggerFactory.getRoller().getPropertiesManager();
+ PropertiesManager mgr = WebloggerFactory.getWeblogger().getPropertiesManager();
setProperties(mgr.getProperties());
} catch (WebloggerException ex) {
log.error("Error getting runtime properties map", ex);
@@ -144,9 +144,9 @@
try {
// save 'em and flush
- PropertiesManager mgr = WebloggerFactory.getRoller().getPropertiesManager();
+ PropertiesManager mgr = WebloggerFactory.getWeblogger().getPropertiesManager();
mgr.saveProperties(getProperties());
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
// notify user of our success
addMessage("weblogEdit.changesSaved");
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java Tue Jun 26 23:20:33 2007
@@ -68,14 +68,14 @@
// load the user object we are modifying
if(getUserName() != null) {
try {
- UserManager mgr = WebloggerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
setUser(mgr.getUserByUserName(getUserName()));
} catch(Exception e) {
log.error("Error looking up user - "+getUserName(), e);
}
} else if(getBean().getId() != null) {
try {
- UserManager mgr = WebloggerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
setUser(mgr.getUser(getBean().getId()));
} catch(Exception e) {
log.error("Error looking up user - "+getBean().getId(), e);
@@ -116,7 +116,7 @@
// reset password if set
if (!StringUtils.isEmpty(getBean().getPassword())) {
try {
- getUser().resetPassword(WebloggerFactory.getRoller(),
+ getUser().resetPassword(WebloggerFactory.getWeblogger(),
getBean().getPassword(),
getBean().getPassword());
} catch (WebloggerException e) {
@@ -125,7 +125,7 @@
}
try {
- UserManager mgr = WebloggerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
// grant/revoke admin role if needed
if(getUser().hasRole("admin") && !getBean().isAdministrator()) {
@@ -138,7 +138,7 @@
// save the updated profile
mgr.saveUser(getUser());
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
// TODO: i18n
addMessage("user updated.");
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java Tue Jun 26 23:20:33 2007
@@ -43,7 +43,7 @@
HttpServletResponse response)
throws ServletException, IOException {
- Weblogger roller = WebloggerFactory.getRoller();
+ Weblogger roller = WebloggerFactory.getWeblogger();
try {
WeblogManager wmgr = roller.getWeblogManager();
WeblogEntryComment c = wmgr.getComment(request.getParameter("id"));
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServlet.java Tue Jun 26 23:20:33 2007
@@ -64,7 +64,7 @@
try { length = Integer.parseInt(request.getParameter("length"));
} catch (Throwable ignored) {}
- Weblogger roller = WebloggerFactory.getRoller();
+ Weblogger roller = WebloggerFactory.getWeblogger();
try {
UserManager umgr = roller.getUserManager();
List users =
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetAddBase.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetAddBase.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetAddBase.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetAddBase.java Tue Jun 26 23:20:33 2007
@@ -60,9 +60,9 @@
if(!hasActionErrors()) try {
// Appears to be ok. Save it and flush.
- PingTargetManager pingTargetMgr = WebloggerFactory.getRoller().getPingTargetManager();
+ PingTargetManager pingTargetMgr = WebloggerFactory.getWeblogger().getPingTargetManager();
pingTargetMgr.savePingTarget(pingTarget);
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
addMessage("pingTarget.saved");
@@ -84,7 +84,7 @@
protected void myValidate(PingTarget pingTarget) {
try {
- PingTargetManager pingTargetMgr = WebloggerFactory.getRoller().getPingTargetManager();
+ PingTargetManager pingTargetMgr = WebloggerFactory.getWeblogger().getPingTargetManager();
if (!pingTargetMgr.isNameUnique(pingTarget)) {
addError("pingTarget.nameNotUnique");
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetEditBase.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetEditBase.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetEditBase.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetEditBase.java Tue Jun 26 23:20:33 2007
@@ -48,7 +48,7 @@
*/
public void myPrepare() {
- PingTargetManager pingTargetMgr = WebloggerFactory.getRoller().getPingTargetManager();
+ PingTargetManager pingTargetMgr = WebloggerFactory.getWeblogger().getPingTargetManager();
if(!StringUtils.isEmpty(getBean().getId())) {
try {
@@ -104,9 +104,9 @@
if(!hasActionErrors()) try {
// Appears to be ok. Save it and flush.
- PingTargetManager pingTargetMgr = WebloggerFactory.getRoller().getPingTargetManager();
+ PingTargetManager pingTargetMgr = WebloggerFactory.getWeblogger().getPingTargetManager();
pingTargetMgr.savePingTarget(getPingTarget());
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
addMessage("pingTarget.saved");
@@ -126,7 +126,7 @@
protected void myValidate(PingTarget pingTarget) {
try {
- PingTargetManager pingTargetMgr = WebloggerFactory.getRoller().getPingTargetManager();
+ PingTargetManager pingTargetMgr = WebloggerFactory.getWeblogger().getPingTargetManager();
if (!pingTargetMgr.isNameUnique(pingTarget)) {
addError("pingTarget.nameNotUnique");
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetsBase.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetsBase.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetsBase.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetsBase.java Tue Jun 26 23:20:33 2007
@@ -61,7 +61,7 @@
// load specified ping target if possible
if(!StringUtils.isEmpty(getPingTargetId())) {
try {
- PingTargetManager pingTargetMgr = WebloggerFactory.getRoller().getPingTargetManager();
+ PingTargetManager pingTargetMgr = WebloggerFactory.getWeblogger().getPingTargetManager();
setPingTarget(pingTargetMgr.getPingTarget(getPingTargetId()));
} catch (WebloggerException ex) {
getLogger().error("Error looking up ping target - "+getPingTargetId(), ex);
@@ -104,9 +104,9 @@
if(getPingTarget() != null) {
try {
- PingTargetManager pingTargetMgr = WebloggerFactory.getRoller().getPingTargetManager();
+ PingTargetManager pingTargetMgr = WebloggerFactory.getWeblogger().getPingTargetManager();
pingTargetMgr.removePingTarget(getPingTarget());
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
// remove deleted target from list
getPingTargets().remove(getPingTarget());
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java Tue Jun 26 23:20:33 2007
@@ -64,7 +64,7 @@
try {
if (!RollerConfig.getBooleanProperty("groupblogging.enabled")) {
- UserManager mgr = WebloggerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
List permissions = mgr.getAllPermissions(user);
if (permissions.size() > 0) {
// sneaky user trying to get around 1 blog limit that applies
@@ -92,7 +92,7 @@
User user = getAuthenticatedUser();
try {
if (!RollerConfig.getBooleanProperty("groupblogging.enabled")) {
- UserManager mgr = WebloggerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
List permissions = mgr.getAllPermissions(user);
if (permissions.size() > 0) {
// sneaky user trying to get around 1 blog limit that applies
@@ -128,9 +128,9 @@
try {
// add weblog and flush
- UserManager mgr = WebloggerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
mgr.addWebsite(wd);
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
// tell the user their weblog was created
addMessage("createWebsite.created", getBean().getHandle());
@@ -166,7 +166,7 @@
// make sure handle isn't already taken
if(!StringUtils.isEmpty(getBean().getHandle())) try {
- UserManager mgr = WebloggerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
if (mgr.getWebsiteByHandle(getBean().getHandle()) != null) {
addError("createWeblog.error.handleExists");
// reset handle
@@ -181,7 +181,7 @@
public List getThemes() {
- ThemeManager themeMgr = WebloggerFactory.getRoller().getThemeManager();
+ ThemeManager themeMgr = WebloggerFactory.getWeblogger().getThemeManager();
return themeMgr.getEnabledThemesList();
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java Tue Jun 26 23:20:33 2007
@@ -142,7 +142,7 @@
WebloggerFactory.bootstrap();
// trigger initialization process
- WebloggerFactory.getRoller().initialize();
+ WebloggerFactory.getWeblogger().initialize();
return SUCCESS;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java Tue Jun 26 23:20:33 2007
@@ -62,14 +62,14 @@
public String accept() {
try {
- UserManager userMgr = WebloggerFactory.getRoller().getUserManager();
+ UserManager userMgr = WebloggerFactory.getWeblogger().getUserManager();
WeblogPermission perms = userMgr.getPermissions(getInviteId());
if (perms != null) {
// TODO ROLLER_2.0: notify inviter that invitee has accepted invitation
// TODO EXCEPTIONS: better exception handling
perms.setPending(false);
userMgr.savePermissions(perms);
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
addMessage("yourWebsites.accepted", perms.getWebsite().getHandle());
} else {
@@ -88,13 +88,13 @@
public String decline() {
try {
- UserManager userMgr = WebloggerFactory.getRoller().getUserManager();
+ UserManager userMgr = WebloggerFactory.getWeblogger().getUserManager();
WeblogPermission perms = userMgr.getPermissions(getInviteId());
if (perms != null) {
// TODO ROLLER_2.0: notify inviter that invitee has declined invitation
// TODO EXCEPTIONS: better exception handling here
userMgr.removePermissions(perms);
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
addMessage("yourWebsites.declined", perms.getWebsite().getHandle());
} else {
@@ -115,17 +115,17 @@
User user = getAuthenticatedUser();
try {
- UserManager mgr = WebloggerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
Weblog website = mgr.getWebsite(getWebsiteId());
- UserManager userMgr = WebloggerFactory.getRoller().getUserManager();
+ UserManager userMgr = WebloggerFactory.getWeblogger().getUserManager();
WeblogPermission perms = userMgr.getPermissions(website, user);
if (perms != null) {
// TODO ROLLER_2.0: notify website members that user has resigned
// TODO EXCEPTIONS: better exception handling
userMgr.removePermissions(perms);
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
}
addMessage("yourWebsites.resigned", perms.getWebsite().getHandle());
@@ -141,7 +141,7 @@
public List getExistingPermissions() {
try {
- UserManager mgr = WebloggerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
return mgr.getAllPermissions(getAuthenticatedUser());
} catch(Exception e) {
return Collections.EMPTY_LIST;
@@ -150,7 +150,7 @@
public List getPendingPermissions() {
try {
- UserManager mgr = WebloggerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
return mgr.getPendingPermissions(getAuthenticatedUser());
} catch(Exception e) {
return Collections.EMPTY_LIST;
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java Tue Jun 26 23:20:33 2007
@@ -86,7 +86,7 @@
if (!StringUtils.isEmpty(getBean().getPasswordText()) &&
!StringUtils.isEmpty(getBean().getPasswordConfirm())) {
try {
- existingUser.resetPassword(WebloggerFactory.getRoller(),
+ existingUser.resetPassword(WebloggerFactory.getWeblogger(),
getBean().getPasswordText(),
getBean().getPasswordConfirm());
} catch (WebloggerException e) {
@@ -96,9 +96,9 @@
try {
// save the updated profile
- UserManager mgr = WebloggerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
mgr.saveUser(existingUser);
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
// TODO: i18n
addMessage("profile updated.");
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java Tue Jun 26 23:20:33 2007
@@ -116,7 +116,7 @@
if (!hasActionErrors()) try {
- UserManager mgr = WebloggerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
// copy form data into new user pojo
User ud = new User();
@@ -128,7 +128,7 @@
// If user set both password and passwordConfirm then reset password
if (!StringUtils.isEmpty(getBean().getPasswordText()) &&
!StringUtils.isEmpty(getBean().getPasswordConfirm())) {
- ud.resetPassword(WebloggerFactory.getRoller(),
+ ud.resetPassword(WebloggerFactory.getWeblogger(),
getBean().getPasswordText(), getBean().getPasswordConfirm());
}
@@ -165,7 +165,7 @@
// save new user
mgr.addUser(ud);
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
// now send activation email if necessary
if (activationEnabled && ud.getActivationCode() != null) {
@@ -202,7 +202,7 @@
public String activate() {
try {
- UserManager mgr = WebloggerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
if (getActivationCode() == null) {
addError("error.activate.user.missingActivationCode");
@@ -214,7 +214,7 @@
user.setEnabled(Boolean.TRUE);
user.setActivationCode(null);
mgr.saveUser(user);
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
setActivationStatus("active");
@@ -277,7 +277,7 @@
// check that username is not taken
if(!StringUtils.isEmpty(getBean().getUserName())) try {
- UserManager mgr = WebloggerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
if(mgr.getUserByUserName(getBean().getUserName(), null) != null) {
addError("error.add.user.userNameInUse");
// reset user name
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java Tue Jun 26 23:20:33 2007
@@ -57,7 +57,7 @@
public String execute() {
try {
- UserManager umgr = WebloggerFactory.getRoller().getUserManager();
+ UserManager umgr = WebloggerFactory.getWeblogger().getUserManager();
setUserCount(umgr.getUserCount());
setBlogCount(umgr.getWeblogCount());
} catch (WebloggerException ex) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java Tue Jun 26 23:20:33 2007
@@ -65,7 +65,7 @@
public void myPrepare() {
try {
- BookmarkManager bmgr = WebloggerFactory.getRoller().getBookmarkManager();
+ BookmarkManager bmgr = WebloggerFactory.getWeblogger().getBookmarkManager();
if(!StringUtils.isEmpty(getFolderId())) {
setFolder(bmgr.getFolder(getFolderId()));
}
@@ -105,9 +105,9 @@
newBookmark.setFolder(getFolder());
getBean().copyTo(newBookmark);
- BookmarkManager bmgr = WebloggerFactory.getRoller().getBookmarkManager();
+ BookmarkManager bmgr = WebloggerFactory.getWeblogger().getBookmarkManager();
bmgr.saveBookmark(newBookmark);
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
CacheManager.invalidate(newBookmark);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java Tue Jun 26 23:20:33 2007
@@ -61,7 +61,7 @@
public void myPrepare() {
try {
- BookmarkManager bmgr = WebloggerFactory.getRoller().getBookmarkManager();
+ BookmarkManager bmgr = WebloggerFactory.getWeblogger().getBookmarkManager();
if(!StringUtils.isEmpty(getBean().getId())) {
setBookmark(bmgr.getBookmark(getBean().getId()));
}
@@ -102,9 +102,9 @@
getBean().copyTo(getBookmark());
- BookmarkManager bmgr = WebloggerFactory.getRoller().getBookmarkManager();
+ BookmarkManager bmgr = WebloggerFactory.getWeblogger().getBookmarkManager();
bmgr.saveBookmark(getBookmark());
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
CacheManager.invalidate(getBookmark());
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java Tue Jun 26 23:20:33 2007
@@ -81,7 +81,7 @@
public void myPrepare() {
try {
- BookmarkManager bmgr = WebloggerFactory.getRoller().getBookmarkManager();
+ BookmarkManager bmgr = WebloggerFactory.getWeblogger().getBookmarkManager();
if(!StringUtils.isEmpty(getFolderId()) &&
!"/".equals(getFolderId())) {
setFolder(bmgr.getFolder(getFolderId()));
@@ -105,7 +105,7 @@
try {
// Build list of all folders, except for current one, sorted by path.
- BookmarkManager bmgr = WebloggerFactory.getRoller().getBookmarkManager();
+ BookmarkManager bmgr = WebloggerFactory.getWeblogger().getBookmarkManager();
List<WeblogBookmarkFolder> folders = bmgr.getAllFolders(getActionWeblog());
for(WeblogBookmarkFolder fd : folders) {
if (!fd.getId().equals(getFolderId())) {
@@ -143,7 +143,7 @@
*/
public String delete() {
- BookmarkManager bmgr = WebloggerFactory.getRoller().getBookmarkManager();
+ BookmarkManager bmgr = WebloggerFactory.getWeblogger().getBookmarkManager();
log.debug("Deleting selected folders and bookmarks.");
@@ -170,7 +170,7 @@
}
// flush changes
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
// notify caches
CacheManager.invalidate(getActionWeblog());
@@ -191,7 +191,7 @@
public String move() {
try {
- BookmarkManager bmgr = WebloggerFactory.getRoller().getBookmarkManager();
+ BookmarkManager bmgr = WebloggerFactory.getWeblogger().getBookmarkManager();
log.debug("Moving folders and bookmarks to folder - "+getTargetFolderId());
@@ -224,7 +224,7 @@
}
// flush changes
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
// notify caches
CacheManager.invalidate(getActionWeblog());
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java Tue Jun 26 23:20:33 2007
@@ -76,7 +76,7 @@
*/
public String save() {
- BookmarkManager bm = WebloggerFactory.getRoller().getBookmarkManager();
+ BookmarkManager bm = WebloggerFactory.getWeblogger().getBookmarkManager();
InputStream stream = null;
if(getOpmlFile() != null && getOpmlFile().exists()) try {
@@ -101,7 +101,7 @@
// Use Roller BookmarkManager to import bookmarks
bm.importBookmarks(getActionWeblog(), folderName, data);
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
// notify caches
CacheManager.invalidate(getActionWeblog());
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java Tue Jun 26 23:20:33 2007
@@ -76,7 +76,7 @@
public void myPrepare() {
try {
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
if(!StringUtils.isEmpty(getCategoryId()) &&
!"/".equals(getCategoryId())) {
setCategory(wmgr.getWeblogCategory(getCategoryId()));
@@ -96,7 +96,7 @@
try {
// Build list of all categories, except for current one, sorted by path.
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
List<WeblogCategory> cats = wmgr.getWeblogCategories(getActionWeblog(), true);
for(WeblogCategory cat : cats) {
if (!cat.getId().equals(getCategoryId())) {
@@ -132,7 +132,7 @@
public String move() {
try {
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
log.debug("Moving categories to category - "+getTargetCategoryId());
@@ -154,7 +154,7 @@
}
// flush changes
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
}
} catch (WebloggerException ex) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java Tue Jun 26 23:20:33 2007
@@ -63,7 +63,7 @@
public void myPrepare() {
try {
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
if(!StringUtils.isEmpty(getCategoryId())) {
setCategory(wmgr.getWeblogCategory(getCategoryId()));
}
@@ -116,9 +116,9 @@
getCategory().addCategory(newCategory);
// save changes
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
wmgr.saveWeblogCategory(newCategory);
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
// notify caches
CacheManager.invalidate(newCategory);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java Tue Jun 26 23:20:33 2007
@@ -60,7 +60,7 @@
public void myPrepare() {
try {
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
if(!StringUtils.isEmpty(getBean().getId())) {
setCategory(wmgr.getWeblogCategory(getBean().getId()));
}
@@ -109,9 +109,9 @@
getBean().copyTo(getCategory());
// save changes
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
wmgr.saveWeblogCategory(getCategory());
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
// notify caches
CacheManager.invalidate(getCategory());
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java Tue Jun 26 23:20:33 2007
@@ -69,7 +69,7 @@
public void myPrepare() {
try {
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
if(!StringUtils.isEmpty(getRemoveId())) {
setCategory(wmgr.getWeblogCategory(getRemoveId()));
}
@@ -89,7 +89,7 @@
try {
// Build list of all categories, except for current one, sorted by path.
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
List<WeblogCategory> cats = wmgr.getWeblogCategories(getActionWeblog(), true);
for(WeblogCategory cat : cats) {
if (!cat.getId().equals(getRemoveId())) {
@@ -116,16 +116,16 @@
public String remove() {
if(getCategory() != null) try {
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
if(getTargetCategoryId() != null) {
WeblogCategory target = wmgr.getWeblogCategory(getTargetCategoryId());
wmgr.moveWeblogCategoryContents(getCategory(), target);
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
}
wmgr.removeWeblogCategory(getCategory());
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
// notify cache
CacheManager.invalidate(getCategory());
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java Tue Jun 26 23:20:33 2007
@@ -86,7 +86,7 @@
List comments = Collections.EMPTY_LIST;
boolean hasMore = false;
try {
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
// lookup weblog entry if necessary
WeblogEntry queryEntry = null;
@@ -181,7 +181,7 @@
getBean().loadCheckboxes(getPager().getItems());
try {
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
List allMatchingComments = wmgr.getComments(
getActionWeblog(),
null,
@@ -213,7 +213,7 @@
public String delete() {
try {
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
int deleted = wmgr.removeMatchingComments(
getActionWeblog(),
null,
@@ -246,7 +246,7 @@
public String update() {
try {
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
List<WeblogEntryComment> flushList = new ArrayList();
@@ -319,7 +319,7 @@
}
}
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
// notify caches of changes
for(WeblogEntryComment comm : flushList) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargets.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargets.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargets.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargets.java Tue Jun 26 23:20:33 2007
@@ -61,7 +61,7 @@
public void loadPingTargets() {
if(!PingConfig.getDisallowCustomTargets()) try {
- PingTargetManager pingTargetMgr = WebloggerFactory.getRoller().getPingTargetManager();
+ PingTargetManager pingTargetMgr = WebloggerFactory.getWeblogger().getPingTargetManager();
setPingTargets(pingTargetMgr.getCustomPingTargets(getActionWeblog()));
} catch (WebloggerException ex) {
log.error("Error loading common ping targets", ex);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java Tue Jun 26 23:20:33 2007
@@ -85,7 +85,7 @@
try {
String status = getBean().getStatus();
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
List<WeblogEntry> rawEntries = wmgr.getWeblogEntries(
getActionWeblog(),
null,
@@ -174,7 +174,7 @@
List<WeblogCategory> weblogCats = Collections.EMPTY_LIST;
try {
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
weblogCats = wmgr.getWeblogCategories(getActionWeblog(), false);
} catch (WebloggerException ex) {
log.error("Error getting category list for weblog - "+getWeblog(), ex);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java?view=diff&rev=551071&r1=551070&r2=551071
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java Tue Jun 26 23:20:33 2007
@@ -102,7 +102,7 @@
public String save() {
if(!hasActionErrors()) try {
- WeblogManager weblogMgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager weblogMgr = WebloggerFactory.getWeblogger().getWeblogManager();
WeblogEntry entry = new WeblogEntry();
entry.setCreator(getAuthenticatedUser());
@@ -156,7 +156,7 @@
log.debug("Saving entry");
weblogMgr.saveWeblogEntry(entry);
- WebloggerFactory.getRoller().flush();
+ WebloggerFactory.getWeblogger().flush();
// notify search of the new entry
reindexEntry(entry);
@@ -166,7 +166,7 @@
// Queue applicable pings for this update.
if(entry.isPublished()) {
- WebloggerFactory.getRoller().getAutopingManager().queueApplicableAutoPings(entry);
+ WebloggerFactory.getWeblogger().getAutopingManager().queueApplicableAutoPings(entry);
}
if(entry.isPending()) {
@@ -200,7 +200,7 @@
*/
public List<WeblogCategory> getCategories() {
try {
- WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
return wmgr.getWeblogCategories(getActionWeblog(), false);
} catch (WebloggerException ex) {
log.error("Error getting category list for weblog - "+getWeblog(), ex);