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 [3/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...
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=551059&r1=551058&r2=551059
==============================================================================
--- 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 22:52:00 2007
@@ -20,7 +20,7 @@
import org.apache.commons.logging.Log;
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.pings.PingTargetManager;
import org.apache.roller.weblogger.pojos.PingTarget;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
@@ -60,9 +60,9 @@
if(!hasActionErrors()) try {
// Appears to be ok. Save it and flush.
- PingTargetManager pingTargetMgr = RollerFactory.getRoller().getPingTargetManager();
+ PingTargetManager pingTargetMgr = WebloggerFactory.getRoller().getPingTargetManager();
pingTargetMgr.savePingTarget(pingTarget);
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
addMessage("pingTarget.saved");
@@ -84,7 +84,7 @@
protected void myValidate(PingTarget pingTarget) {
try {
- PingTargetManager pingTargetMgr = RollerFactory.getRoller().getPingTargetManager();
+ PingTargetManager pingTargetMgr = WebloggerFactory.getRoller().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=551059&r1=551058&r2=551059
==============================================================================
--- 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 22:52:00 2007
@@ -21,7 +21,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
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.pings.PingTargetManager;
import org.apache.roller.weblogger.pojos.PingTarget;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
@@ -48,7 +48,7 @@
*/
public void myPrepare() {
- PingTargetManager pingTargetMgr = RollerFactory.getRoller().getPingTargetManager();
+ PingTargetManager pingTargetMgr = WebloggerFactory.getRoller().getPingTargetManager();
if(!StringUtils.isEmpty(getBean().getId())) {
try {
@@ -104,9 +104,9 @@
if(!hasActionErrors()) try {
// Appears to be ok. Save it and flush.
- PingTargetManager pingTargetMgr = RollerFactory.getRoller().getPingTargetManager();
+ PingTargetManager pingTargetMgr = WebloggerFactory.getRoller().getPingTargetManager();
pingTargetMgr.savePingTarget(getPingTarget());
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
addMessage("pingTarget.saved");
@@ -126,7 +126,7 @@
protected void myValidate(PingTarget pingTarget) {
try {
- PingTargetManager pingTargetMgr = RollerFactory.getRoller().getPingTargetManager();
+ PingTargetManager pingTargetMgr = WebloggerFactory.getRoller().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=551059&r1=551058&r2=551059
==============================================================================
--- 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 22:52:00 2007
@@ -23,7 +23,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
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.pings.PingTargetManager;
import org.apache.roller.weblogger.pojos.PingTarget;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
@@ -61,7 +61,7 @@
// load specified ping target if possible
if(!StringUtils.isEmpty(getPingTargetId())) {
try {
- PingTargetManager pingTargetMgr = RollerFactory.getRoller().getPingTargetManager();
+ PingTargetManager pingTargetMgr = WebloggerFactory.getRoller().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 = RollerFactory.getRoller().getPingTargetManager();
+ PingTargetManager pingTargetMgr = WebloggerFactory.getRoller().getPingTargetManager();
pingTargetMgr.removePingTarget(getPingTarget());
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().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=551059&r1=551058&r2=551059
==============================================================================
--- 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 22:52:00 2007
@@ -26,7 +26,7 @@
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.RollerConfig;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
-import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.themes.ThemeManager;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.pojos.User;
@@ -64,7 +64,7 @@
try {
if (!RollerConfig.getBooleanProperty("groupblogging.enabled")) {
- UserManager mgr = RollerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getRoller().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 = RollerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getRoller().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 = RollerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getRoller().getUserManager();
mgr.addWebsite(wd);
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().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 = RollerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getRoller().getUserManager();
if (mgr.getWebsiteByHandle(getBean().getHandle()) != null) {
addError("createWeblog.error.handleExists");
// reset handle
@@ -181,7 +181,7 @@
public List getThemes() {
- ThemeManager themeMgr = RollerFactory.getRoller().getThemeManager();
+ ThemeManager themeMgr = WebloggerFactory.getRoller().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=551059&r1=551058&r2=551059
==============================================================================
--- 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 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.startup.StartupException;
import org.apache.roller.weblogger.business.startup.WebloggerStartup;
import org.apache.roller.weblogger.config.RollerConfig;
@@ -63,7 +63,7 @@
public String execute() {
- if(RollerFactory.isBootstrapped()) {
+ if(WebloggerFactory.isBootstrapped()) {
return SUCCESS;
}
@@ -95,7 +95,7 @@
public String create() {
- if(RollerFactory.isBootstrapped()) {
+ if(WebloggerFactory.isBootstrapped()) {
return SUCCESS;
}
@@ -114,7 +114,7 @@
public String upgrade() {
- if(RollerFactory.isBootstrapped()) {
+ if(WebloggerFactory.isBootstrapped()) {
return SUCCESS;
}
@@ -133,16 +133,16 @@
public String bootstrap() {
- if(RollerFactory.isBootstrapped()) {
+ if(WebloggerFactory.isBootstrapped()) {
return SUCCESS;
}
try {
// trigger bootstrapping process
- RollerFactory.bootstrap();
+ WebloggerFactory.bootstrap();
// trigger initialization process
- RollerFactory.getRoller().initialize();
+ WebloggerFactory.getRoller().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=551059&r1=551058&r2=551059
==============================================================================
--- 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 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.UserManager;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.pojos.User;
@@ -62,14 +62,14 @@
public String accept() {
try {
- UserManager userMgr = RollerFactory.getRoller().getUserManager();
+ UserManager userMgr = WebloggerFactory.getRoller().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);
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
addMessage("yourWebsites.accepted", perms.getWebsite().getHandle());
} else {
@@ -88,13 +88,13 @@
public String decline() {
try {
- UserManager userMgr = RollerFactory.getRoller().getUserManager();
+ UserManager userMgr = WebloggerFactory.getRoller().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);
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
addMessage("yourWebsites.declined", perms.getWebsite().getHandle());
} else {
@@ -115,17 +115,17 @@
User user = getAuthenticatedUser();
try {
- UserManager mgr = RollerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getRoller().getUserManager();
Weblog website = mgr.getWebsite(getWebsiteId());
- UserManager userMgr = RollerFactory.getRoller().getUserManager();
+ UserManager userMgr = WebloggerFactory.getRoller().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);
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
}
addMessage("yourWebsites.resigned", perms.getWebsite().getHandle());
@@ -141,7 +141,7 @@
public List getExistingPermissions() {
try {
- UserManager mgr = RollerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getRoller().getUserManager();
return mgr.getAllPermissions(getAuthenticatedUser());
} catch(Exception e) {
return Collections.EMPTY_LIST;
@@ -150,7 +150,7 @@
public List getPendingPermissions() {
try {
- UserManager mgr = RollerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getRoller().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=551059&r1=551058&r2=551059
==============================================================================
--- 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 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.business.UserManager;
import org.apache.roller.weblogger.pojos.User;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
@@ -86,7 +86,7 @@
if (!StringUtils.isEmpty(getBean().getPasswordText()) &&
!StringUtils.isEmpty(getBean().getPasswordConfirm())) {
try {
- existingUser.resetPassword(RollerFactory.getRoller(),
+ existingUser.resetPassword(WebloggerFactory.getRoller(),
getBean().getPasswordText(),
getBean().getPasswordConfirm());
} catch (WebloggerException e) {
@@ -96,9 +96,9 @@
try {
// save the updated profile
- UserManager mgr = RollerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getRoller().getUserManager();
mgr.saveUser(existingUser);
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().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=551059&r1=551058&r2=551059
==============================================================================
--- 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 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.config.RollerConfig;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
@@ -116,7 +116,7 @@
if (!hasActionErrors()) try {
- UserManager mgr = RollerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getRoller().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(RollerFactory.getRoller(),
+ ud.resetPassword(WebloggerFactory.getRoller(),
getBean().getPasswordText(), getBean().getPasswordConfirm());
}
@@ -165,7 +165,7 @@
// save new user
mgr.addUser(ud);
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
// now send activation email if necessary
if (activationEnabled && ud.getActivationCode() != null) {
@@ -202,7 +202,7 @@
public String activate() {
try {
- UserManager mgr = RollerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getRoller().getUserManager();
if (getActivationCode() == null) {
addError("error.activate.user.missingActivationCode");
@@ -214,7 +214,7 @@
user.setEnabled(Boolean.TRUE);
user.setActivationCode(null);
mgr.saveUser(user);
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
setActivationStatus("active");
@@ -277,7 +277,7 @@
// check that username is not taken
if(!StringUtils.isEmpty(getBean().getUserName())) try {
- UserManager mgr = RollerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getRoller().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=551059&r1=551058&r2=551059
==============================================================================
--- 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 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;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
@@ -57,7 +57,7 @@
public String execute() {
try {
- UserManager umgr = RollerFactory.getRoller().getUserManager();
+ UserManager umgr = WebloggerFactory.getRoller().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=551059&r1=551058&r2=551059
==============================================================================
--- 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 22:52:00 2007
@@ -25,7 +25,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.pojos.WeblogBookmark;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
import org.apache.roller.weblogger.pojos.WeblogPermission;
@@ -65,7 +65,7 @@
public void myPrepare() {
try {
- BookmarkManager bmgr = RollerFactory.getRoller().getBookmarkManager();
+ BookmarkManager bmgr = WebloggerFactory.getRoller().getBookmarkManager();
if(!StringUtils.isEmpty(getFolderId())) {
setFolder(bmgr.getFolder(getFolderId()));
}
@@ -105,9 +105,9 @@
newBookmark.setFolder(getFolder());
getBean().copyTo(newBookmark);
- BookmarkManager bmgr = RollerFactory.getRoller().getBookmarkManager();
+ BookmarkManager bmgr = WebloggerFactory.getRoller().getBookmarkManager();
bmgr.saveBookmark(newBookmark);
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().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=551059&r1=551058&r2=551059
==============================================================================
--- 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 22:52:00 2007
@@ -25,7 +25,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.pojos.WeblogBookmark;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
@@ -61,7 +61,7 @@
public void myPrepare() {
try {
- BookmarkManager bmgr = RollerFactory.getRoller().getBookmarkManager();
+ BookmarkManager bmgr = WebloggerFactory.getRoller().getBookmarkManager();
if(!StringUtils.isEmpty(getBean().getId())) {
setBookmark(bmgr.getBookmark(getBean().getId()));
}
@@ -102,9 +102,9 @@
getBean().copyTo(getBookmark());
- BookmarkManager bmgr = RollerFactory.getRoller().getBookmarkManager();
+ BookmarkManager bmgr = WebloggerFactory.getRoller().getBookmarkManager();
bmgr.saveBookmark(getBookmark());
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().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=551059&r1=551058&r2=551059
==============================================================================
--- 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 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.pojos.WeblogBookmark;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
import org.apache.roller.weblogger.pojos.WeblogPermission;
@@ -81,7 +81,7 @@
public void myPrepare() {
try {
- BookmarkManager bmgr = RollerFactory.getRoller().getBookmarkManager();
+ BookmarkManager bmgr = WebloggerFactory.getRoller().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 = RollerFactory.getRoller().getBookmarkManager();
+ BookmarkManager bmgr = WebloggerFactory.getRoller().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 = RollerFactory.getRoller().getBookmarkManager();
+ BookmarkManager bmgr = WebloggerFactory.getRoller().getBookmarkManager();
log.debug("Deleting selected folders and bookmarks.");
@@ -170,7 +170,7 @@
}
// flush changes
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
// notify caches
CacheManager.invalidate(getActionWeblog());
@@ -191,7 +191,7 @@
public String move() {
try {
- BookmarkManager bmgr = RollerFactory.getRoller().getBookmarkManager();
+ BookmarkManager bmgr = WebloggerFactory.getRoller().getBookmarkManager();
log.debug("Moving folders and bookmarks to folder - "+getTargetFolderId());
@@ -224,7 +224,7 @@
}
// flush changes
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().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=551059&r1=551058&r2=551059
==============================================================================
--- 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 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.business.BookmarkManager;
-import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
import org.apache.roller.weblogger.util.cache.CacheManager;
@@ -76,7 +76,7 @@
*/
public String save() {
- BookmarkManager bm = RollerFactory.getRoller().getBookmarkManager();
+ BookmarkManager bm = WebloggerFactory.getRoller().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);
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().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=551059&r1=551058&r2=551059
==============================================================================
--- 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 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.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.pojos.WeblogCategory;
@@ -76,7 +76,7 @@
public void myPrepare() {
try {
- WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getRoller().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 = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getRoller().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 = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
log.debug("Moving categories to category - "+getTargetCategoryId());
@@ -154,7 +154,7 @@
}
// flush changes
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().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=551059&r1=551058&r2=551059
==============================================================================
--- 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 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.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogCategory;
import org.apache.roller.weblogger.pojos.WeblogPermission;
@@ -63,7 +63,7 @@
public void myPrepare() {
try {
- WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
if(!StringUtils.isEmpty(getCategoryId())) {
setCategory(wmgr.getWeblogCategory(getCategoryId()));
}
@@ -116,9 +116,9 @@
getCategory().addCategory(newCategory);
// save changes
- WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
wmgr.saveWeblogCategory(newCategory);
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().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=551059&r1=551058&r2=551059
==============================================================================
--- 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 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.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogCategory;
import org.apache.roller.weblogger.pojos.WeblogPermission;
@@ -60,7 +60,7 @@
public void myPrepare() {
try {
- WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
if(!StringUtils.isEmpty(getBean().getId())) {
setCategory(wmgr.getWeblogCategory(getBean().getId()));
}
@@ -109,9 +109,9 @@
getBean().copyTo(getCategory());
// save changes
- WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
wmgr.saveWeblogCategory(getCategory());
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().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=551059&r1=551058&r2=551059
==============================================================================
--- 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 22:52:00 2007
@@ -26,7 +26,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.WeblogPermission;
import org.apache.roller.weblogger.pojos.WeblogCategory;
@@ -69,7 +69,7 @@
public void myPrepare() {
try {
- WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getRoller().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 = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getRoller().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 = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
if(getTargetCategoryId() != null) {
WeblogCategory target = wmgr.getWeblogCategory(getTargetCategoryId());
wmgr.moveWeblogCategoryContents(getCategory(), target);
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
}
wmgr.removeWeblogCategory(getCategory());
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().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=551059&r1=551058&r2=551059
==============================================================================
--- 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 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.WeblogEntryComment;
@@ -86,7 +86,7 @@
List comments = Collections.EMPTY_LIST;
boolean hasMore = false;
try {
- WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
// lookup weblog entry if necessary
WeblogEntry queryEntry = null;
@@ -181,7 +181,7 @@
getBean().loadCheckboxes(getPager().getItems());
try {
- WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
List allMatchingComments = wmgr.getComments(
getActionWeblog(),
null,
@@ -213,7 +213,7 @@
public String delete() {
try {
- WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
int deleted = wmgr.removeMatchingComments(
getActionWeblog(),
null,
@@ -246,7 +246,7 @@
public String update() {
try {
- WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
List<WeblogEntryComment> flushList = new ArrayList();
@@ -319,7 +319,7 @@
}
}
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().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=551059&r1=551058&r2=551059
==============================================================================
--- 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 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;
import org.apache.roller.weblogger.business.pings.PingTargetManager;
import org.apache.roller.weblogger.config.PingConfig;
import org.apache.roller.weblogger.pojos.WeblogPermission;
@@ -61,7 +61,7 @@
public void loadPingTargets() {
if(!PingConfig.getDisallowCustomTargets()) try {
- PingTargetManager pingTargetMgr = RollerFactory.getRoller().getPingTargetManager();
+ PingTargetManager pingTargetMgr = WebloggerFactory.getRoller().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=551059&r1=551058&r2=551059
==============================================================================
--- 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 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.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogCategory;
import org.apache.roller.weblogger.pojos.WeblogPermission;
@@ -85,7 +85,7 @@
try {
String status = getBean().getStatus();
- WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
List<WeblogEntry> rawEntries = wmgr.getWeblogEntries(
getActionWeblog(),
null,
@@ -174,7 +174,7 @@
List<WeblogCategory> weblogCats = Collections.EMPTY_LIST;
try {
- WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getRoller().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=551059&r1=551058&r2=551059
==============================================================================
--- 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 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.WeblogPermission;
import org.apache.roller.weblogger.pojos.WeblogEntry;
@@ -102,7 +102,7 @@
public String save() {
if(!hasActionErrors()) try {
- WeblogManager weblogMgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager weblogMgr = WebloggerFactory.getRoller().getWeblogManager();
WeblogEntry entry = new WeblogEntry();
entry.setCreator(getAuthenticatedUser());
@@ -156,7 +156,7 @@
log.debug("Saving entry");
weblogMgr.saveWeblogEntry(entry);
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
// notify search of the new entry
reindexEntry(entry);
@@ -166,7 +166,7 @@
// Queue applicable pings for this update.
if(entry.isPublished()) {
- RollerFactory.getRoller().getAutopingManager().queueApplicableAutoPings(entry);
+ WebloggerFactory.getRoller().getAutopingManager().queueApplicableAutoPings(entry);
}
if(entry.isPending()) {
@@ -200,7 +200,7 @@
*/
public List<WeblogCategory> getCategories() {
try {
- WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
return 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/EntryBase.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java?view=diff&rev=551059&r1=551058&r2=551059
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.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.plugins.PluginManager;
-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.search.IndexManager;
import org.apache.roller.weblogger.pojos.WeblogPermission;
@@ -50,7 +50,7 @@
* Trigger reindexing of modified entry.
*/
protected void reindexEntry(WeblogEntry entry) {
- IndexManager manager = RollerFactory.getRoller().getIndexManager();
+ IndexManager manager = WebloggerFactory.getRoller().getIndexManager();
// if published, index the entry
if (entry.isPublished()) {
@@ -72,7 +72,7 @@
public List<WeblogEntry> getRecentPublishedEntries() {
List<WeblogEntry> entries = Collections.EMPTY_LIST;
try {
- entries = RollerFactory.getRoller().getWeblogManager().getWeblogEntries(
+ entries = WebloggerFactory.getRoller().getWeblogManager().getWeblogEntries(
getActionWeblog(), // userName
null,
@@ -101,7 +101,7 @@
public List<WeblogEntry> getRecentScheduledEntries() {
List<WeblogEntry> entries = Collections.EMPTY_LIST;
try {
- entries = RollerFactory.getRoller().getWeblogManager().getWeblogEntries(
+ entries = WebloggerFactory.getRoller().getWeblogManager().getWeblogEntries(
getActionWeblog(), // userName
null,
@@ -129,7 +129,7 @@
public List<WeblogEntry> getRecentDraftEntries() {
List<WeblogEntry> entries = Collections.EMPTY_LIST;
try {
- entries = RollerFactory.getRoller().getWeblogManager().getWeblogEntries(
+ entries = WebloggerFactory.getRoller().getWeblogManager().getWeblogEntries(
getActionWeblog(),
null,
@@ -157,7 +157,7 @@
public List<WeblogEntry> getRecentPendingEntries() {
List<WeblogEntry> entries = Collections.EMPTY_LIST;
try {
- entries = RollerFactory.getRoller().getWeblogManager().getWeblogEntries(
+ entries = WebloggerFactory.getRoller().getWeblogManager().getWeblogEntries(
getActionWeblog(),
null,
@@ -180,7 +180,7 @@
public List<WeblogEntryPlugin> getEntryPlugins() {
List<WeblogEntryPlugin> availablePlugins = Collections.EMPTY_LIST;
try {
- PluginManager ppmgr = RollerFactory.getRoller().getPagePluginManager();
+ PluginManager ppmgr = WebloggerFactory.getRoller().getPagePluginManager();
Map<String, WeblogEntryPlugin> plugins = ppmgr.getWeblogEntryPlugins(getActionWeblog());
if(plugins.size() > 0) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java?view=diff&rev=551059&r1=551058&r2=551059
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.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.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.WeblogEntryAttribute;
import org.apache.roller.weblogger.pojos.WeblogCategory;
@@ -274,7 +274,7 @@
if (getCategoryId() != null) {
WeblogCategory cat = null;
try {
- WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
cat = wmgr.getWeblogCategory(getCategoryId());
} catch (WebloggerException ex) {
log.error("Error getting category by id", ex);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java?view=diff&rev=551059&r1=551058&r2=551059
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.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.WeblogCategory;
import org.apache.roller.weblogger.pojos.WeblogPermission;
@@ -76,7 +76,7 @@
public void myPrepare() {
if(getBean().getId() != null) {
try {
- WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
setEntry(wmgr.getWeblogEntry(getBean().getId()));
} catch (WebloggerException ex) {
log.error("Error looking up entry by id - "+getBean().getId(), ex);
@@ -122,7 +122,7 @@
}
if(!hasActionErrors()) try {
- WeblogManager weblogMgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager weblogMgr = WebloggerFactory.getRoller().getWeblogManager();
WeblogEntry entry = getEntry();
@@ -168,7 +168,7 @@
log.debug("Saving entry");
weblogMgr.saveWeblogEntry(entry);
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
// notify search of the new entry
reindexEntry(entry);
@@ -178,7 +178,7 @@
// Queue applicable pings for this update.
if(entry.isPublished()) {
- RollerFactory.getRoller().getAutopingManager().queueApplicableAutoPings(entry);
+ WebloggerFactory.getRoller().getAutopingManager().queueApplicableAutoPings(entry);
}
if(entry.isPending()) {
@@ -263,7 +263,7 @@
*/
public List<WeblogCategory> getCategories() {
try {
- WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
return 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/EntryRemove.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java?view=diff&rev=551059&r1=551058&r2=551059
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.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;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.business.search.IndexManager;
import org.apache.roller.weblogger.pojos.WeblogEntry;
@@ -53,7 +53,7 @@
public void myPrepare() {
if(getRemoveId() != null) {
try {
- WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
setRemoveEntry(wmgr.getWeblogEntry(getRemoveId()));
} catch (WebloggerException ex) {
log.error("Error looking up entry by id - "+getRemoveId(), ex);
@@ -77,16 +77,16 @@
// remove the entry from the search index
// TODO: can we do this in a better way?
entry.setStatus(WeblogEntry.DRAFT);
- IndexManager manager = RollerFactory.getRoller().getIndexManager();
+ IndexManager manager = WebloggerFactory.getRoller().getIndexManager();
manager.addEntryReIndexOperation(entry);
} catch (WebloggerException ex) {
log.warn("Trouble triggering entry indexing", ex);
}
// remove entry itself
- WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+ WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager();
wmgr.removeWeblogEntry(entry);
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
// flush caches
CacheManager.invalidate(entry);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java?view=diff&rev=551059&r1=551058&r2=551059
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java Tue Jun 26 22:52:00 2007
@@ -23,7 +23,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.pojos.WeblogBookmarkFolder;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
@@ -62,7 +62,7 @@
public void myPrepare() {
try {
- BookmarkManager bmgr = RollerFactory.getRoller().getBookmarkManager();
+ BookmarkManager bmgr = WebloggerFactory.getRoller().getBookmarkManager();
if(!StringUtils.isEmpty(getFolderId())) {
setFolder(bmgr.getFolder(getFolderId()));
}
@@ -108,9 +108,9 @@
getFolder().addFolder(newFolder);
// save changes
- BookmarkManager bmgr = RollerFactory.getRoller().getBookmarkManager();
+ BookmarkManager bmgr = WebloggerFactory.getRoller().getBookmarkManager();
bmgr.saveFolder(newFolder);
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
// notify caches
CacheManager.invalidate(newFolder);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java?view=diff&rev=551059&r1=551058&r2=551059
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java Tue Jun 26 22:52:00 2007
@@ -23,7 +23,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.pojos.WeblogBookmarkFolder;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
@@ -61,7 +61,7 @@
// load folder to edit
public void myPrepare() {
try {
- BookmarkManager bmgr = RollerFactory.getRoller().getBookmarkManager();
+ BookmarkManager bmgr = WebloggerFactory.getRoller().getBookmarkManager();
if(!StringUtils.isEmpty(getBean().getId())) {
setFolder(bmgr.getFolder(getBean().getId()));
}
@@ -110,9 +110,9 @@
getBean().copyTo(getFolder());
// save changes
- BookmarkManager bmgr = RollerFactory.getRoller().getBookmarkManager();
+ BookmarkManager bmgr = WebloggerFactory.getRoller().getBookmarkManager();
bmgr.saveFolder(getFolder());
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
// notify caches
CacheManager.invalidate(getFolder());
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java?view=diff&rev=551059&r1=551058&r2=551059
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.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.business.search.IndexManager;
-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.Weblog;
@@ -63,7 +63,7 @@
public String index() {
try {
- IndexManager manager = RollerFactory.getRoller().getIndexManager();
+ IndexManager manager = WebloggerFactory.getRoller().getIndexManager();
manager.rebuildWebsiteIndex(getActionWeblog());
addMessage("maintenance.message.indexed");
@@ -88,9 +88,9 @@
// some caches are based on weblog last-modified, so update it
weblog.setLastModified(new Date());
- UserManager umgr = RollerFactory.getRoller().getUserManager();
+ UserManager umgr = WebloggerFactory.getRoller().getUserManager();
umgr.saveWebsite(weblog);
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
// also notify cache manager
CacheManager.invalidate(weblog);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java?view=diff&rev=551059&r1=551058&r2=551059
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java Tue Jun 26 22:52:00 2007
@@ -24,7 +24,7 @@
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.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;
@@ -73,7 +73,7 @@
log.debug("Attempting to processing weblog permissions updates");
- UserManager userMgr = RollerFactory.getRoller().getUserManager();
+ UserManager userMgr = WebloggerFactory.getRoller().getUserManager();
List<WeblogPermission> permissions = getActionWeblog().getPermissions();
@@ -112,7 +112,7 @@
if (removed > 0 || changed > 0) {
log.debug("Weblog permissions updated, flushing changes");
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
}
} catch (Exception ex) {
log.error("Error saving permissions on weblog - "+getActionWeblog().getHandle(), ex);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java?view=diff&rev=551059&r1=551058&r2=551059
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.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.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;
@@ -88,7 +88,7 @@
log.debug("Attempting to process weblog invitation");
- UserManager umgr = RollerFactory.getRoller().getUserManager();
+ UserManager umgr = WebloggerFactory.getRoller().getUserManager();
// user being invited
User user = null;
@@ -128,7 +128,7 @@
if(!hasActionErrors()) try {
umgr.inviteUser(getActionWeblog(), user, Short.parseShort(getPermissionsMask()));
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
addMessage("inviteMember.userInvited");
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java?view=diff&rev=551059&r1=551058&r2=551059
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java Tue Jun 26 22:52:00 2007
@@ -24,7 +24,7 @@
import org.apache.roller.weblogger.config.PingConfig;
import org.apache.roller.weblogger.business.pings.AutoPingManager;
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.AutoPing;
import org.apache.roller.weblogger.pojos.PingTarget;
import org.apache.roller.weblogger.business.pings.WeblogUpdatePinger;
@@ -79,7 +79,7 @@
public void myPrepare() {
- PingTargetManager pingTargetMgr = RollerFactory.getRoller().getPingTargetManager();
+ PingTargetManager pingTargetMgr = WebloggerFactory.getRoller().getPingTargetManager();
// load selected ping target, if possible
if(getPingTargetId() != null) try {
@@ -123,10 +123,10 @@
public String enable() {
if(getPingTarget() != null) try {
- AutoPingManager autoPingMgr = RollerFactory.getRoller().getAutopingManager();
+ AutoPingManager autoPingMgr = WebloggerFactory.getRoller().getAutopingManager();
AutoPing autoPing = new AutoPing(null, getPingTarget(), getActionWeblog());
autoPingMgr.saveAutoPing(autoPing);
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
} catch(Exception ex) {
log.error("Error saving auto ping for target - "+getPingTargetId(), ex);
// TODO: i18n
@@ -143,9 +143,9 @@
public String disable() {
if(getPingTarget() != null) try {
- AutoPingManager autoPingMgr = RollerFactory.getRoller().getAutopingManager();
+ AutoPingManager autoPingMgr = WebloggerFactory.getRoller().getAutopingManager();
autoPingMgr.removeAutoPing(getPingTarget(), getActionWeblog());
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
} catch (Exception ex) {
log.error("Error removing auto ping for target - "+getPingTargetId(), ex);
// TODO: i18n
@@ -209,7 +209,7 @@
*/
private void buildIsEnabledMap() {
- AutoPingManager autoPingMgr = RollerFactory.getRoller().getAutopingManager();
+ AutoPingManager autoPingMgr = WebloggerFactory.getRoller().getAutopingManager();
// Build isEnabled map (keyed by ping target id and values Boolean.TRUE/Boolean.FALSE)
Map isEnabled = new HashMap();
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Referrers.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Referrers.java?view=diff&rev=551059&r1=551058&r2=551059
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Referrers.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Referrers.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.business.referrers.RefererManager;
-import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.pojos.WeblogReferrer;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
@@ -65,7 +65,7 @@
*/
public String execute() {
- RefererManager refmgr = RollerFactory.getRoller().getRefererManager();
+ RefererManager refmgr = WebloggerFactory.getRoller().getRefererManager();
try {
setDayHits(refmgr.getDayHits(getActionWeblog()));
setReferrers(refmgr.getTodaysReferers(getActionWeblog()));
@@ -85,9 +85,9 @@
public String reset() {
try {
- RefererManager refmgr = RollerFactory.getRoller().getRefererManager();
+ RefererManager refmgr = WebloggerFactory.getRoller().getRefererManager();
refmgr.clearReferrers(getActionWeblog());
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
CacheManager.invalidate(getActionWeblog());
} catch (Exception ex) {
@@ -107,7 +107,7 @@
String[] removeIds = getRemoveIds();
if(removeIds != null) {
- RefererManager refmgr = RollerFactory.getRoller().getRefererManager();
+ RefererManager refmgr = WebloggerFactory.getRoller().getRefererManager();
try {
WeblogReferrer referer = null;
@@ -121,7 +121,7 @@
}
// flush
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
// notify caches
CacheManager.invalidate(getActionWeblog());
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Resources.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Resources.java?view=diff&rev=551059&r1=551058&r2=551059
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Resources.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Resources.java Tue Jun 26 22:52:00 2007
@@ -31,7 +31,7 @@
import org.apache.roller.weblogger.business.FileNotFoundException;
import org.apache.roller.weblogger.business.FilePathException;
import org.apache.roller.weblogger.business.FileManager;
-import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.pojos.ThemeResource;
@@ -92,7 +92,7 @@
*/
public String execute() {
- FileManager fmgr = RollerFactory.getRoller().getFileManager();
+ FileManager fmgr = WebloggerFactory.getRoller().getFileManager();
setOverQuota(fmgr.overQuota(getActionWeblog()));
@@ -147,7 +147,7 @@
}
try {
- FileManager fmgr = RollerFactory.getRoller().getFileManager();
+ FileManager fmgr = WebloggerFactory.getRoller().getFileManager();
// add the new subdirectory
fmgr.createDirectory(getActionWeblog(), newDirPath);
@@ -183,7 +183,7 @@
return execute();
}
- FileManager fmgr = RollerFactory.getRoller().getFileManager();
+ FileManager fmgr = WebloggerFactory.getRoller().getFileManager();
List<String> uploaded = new ArrayList();
File[] uploads = getUploadedFiles();
@@ -267,7 +267,7 @@
if(deleteFiles != null) {
log.debug("Attempting to delete "+deleteFiles.length+" files");
- FileManager fmgr = RollerFactory.getRoller().getFileManager();
+ FileManager fmgr = WebloggerFactory.getRoller().getFileManager();
for (int i=0; i < deleteFiles.length; i++) {
if (deleteFiles[i].trim().startsWith("/") ||
deleteFiles[i].trim().startsWith("\\") ||
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java?view=diff&rev=551059&r1=551058&r2=551059
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.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.business.UserManager;
import org.apache.roller.weblogger.business.themes.ThemeManager;
import org.apache.roller.weblogger.pojos.Theme;
@@ -74,7 +74,7 @@
if(stylesheet != null) {
log.debug("custom stylesheet path is - "+stylesheet.getLink());
try {
- UserManager mgr = RollerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getRoller().getUserManager();
setTemplate(mgr.getPageByLink(getActionWeblog(), stylesheet.getLink()));
if(getTemplate() == null) {
@@ -94,7 +94,7 @@
stylesheetTmpl.setTemplateLanguage(stylesheet.getTemplateLanguage());
mgr.savePage(stylesheetTmpl);
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
setTemplate(stylesheetTmpl);
}
@@ -139,9 +139,9 @@
stylesheet.setContents(getContents());
// save template and flush
- UserManager mgr = RollerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getRoller().getUserManager();
mgr.savePage(stylesheet);
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
// notify caches
CacheManager.invalidate(stylesheet);
@@ -181,7 +181,7 @@
WeblogTemplate stylesheet = getTemplate();
// lookup the theme used by this weblog
- ThemeManager tmgr = RollerFactory.getRoller().getThemeManager();
+ ThemeManager tmgr = WebloggerFactory.getRoller().getThemeManager();
Theme theme = tmgr.getTheme(getActionWeblog().getEditorTheme());
// lookup
@@ -189,9 +189,9 @@
stylesheet.setContents(theme.getStylesheet().getContents());
// save template and flush
- UserManager mgr = RollerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getRoller().getUserManager();
mgr.savePage(stylesheet);
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
// notify caches
CacheManager.invalidate(stylesheet);
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java?view=diff&rev=551059&r1=551058&r2=551059
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.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.UserManager;
import org.apache.roller.weblogger.config.RollerConfig;
import org.apache.roller.weblogger.pojos.WeblogPermission;
@@ -65,7 +65,7 @@
public void myPrepare() {
try {
- UserManager mgr = RollerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getRoller().getUserManager();
setTemplate(mgr.getPage(getBean().getId()));
} catch (WebloggerException ex) {
log.error("Error looking up template - "+getBean().getId(), ex);
@@ -129,9 +129,9 @@
}
// save template and flush
- UserManager mgr = RollerFactory.getRoller().getUserManager();
+ UserManager mgr = WebloggerFactory.getRoller().getUserManager();
mgr.savePage(template);
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
// notify caches
CacheManager.invalidate(template);
@@ -154,7 +154,7 @@
// if name changed make sure there isn't a conflict
if(!getTemplate().getName().equals(getBean().getName())) {
try {
- UserManager umgr = RollerFactory.getRoller().getUserManager();
+ UserManager umgr = WebloggerFactory.getRoller().getUserManager();
if(umgr.getPageByName(getActionWeblog(), getBean().getName()) != null) {
addError("pagesForm.error.alreadyExists", getBean().getName());
}
@@ -167,7 +167,7 @@
if(!StringUtils.isEmpty(getBean().getLink()) &&
!getBean().getLink().equals(getTemplate().getLink())) {
try {
- UserManager umgr = RollerFactory.getRoller().getUserManager();
+ UserManager umgr = WebloggerFactory.getRoller().getUserManager();
if(umgr.getPageByLink(getActionWeblog(), getBean().getLink()) != null) {
addError("pagesForm.error.alreadyExists", getBean().getLink());
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java?view=diff&rev=551059&r1=551058&r2=551059
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.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;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.pojos.WeblogTemplate;
@@ -58,7 +58,7 @@
public void myPrepare() {
if(getRemoveId() != null) try {
- UserManager umgr = RollerFactory.getRoller().getUserManager();
+ UserManager umgr = WebloggerFactory.getRoller().getUserManager();
setTemplate(umgr.getPage(getRemoveId()));
} catch (WebloggerException ex) {
log.error("Error looking up template by id - "+getRemoveId(), ex);
@@ -83,9 +83,9 @@
if(getTemplate() != null) try {
if(!getTemplate().isRequired()) {
- UserManager umgr = RollerFactory.getRoller().getUserManager();
+ UserManager umgr = WebloggerFactory.getRoller().getUserManager();
umgr.removePage(getTemplate());
- RollerFactory.getRoller().flush();
+ WebloggerFactory.getRoller().flush();
// notify cache
CacheManager.invalidate(getTemplate());