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 2006/04/09 00:39:03 UTC
svn commit: r392619 - in
/incubator/roller/branches/roller-newbackend/src/org/roller/presentation:
./ bookmarks/actions/ pings/ planet/ servlets/ weblog/actions/
website/actions/ xmlrpc/
Author: agilliland
Date: Sat Apr 8 15:38:59 2006
New Revision: 392619
URL: http://svn.apache.org/viewcvs?rev=392619&view=rev
Log:
first batch of backend refactorings.
- removing calls to setUser/getUser/begin from presentation layer classes
- transitioning some calls to Pojo.save() and Pojo.remove() to new calls using XXXManager.store() and XXXManager.remove()
- removing some calls to Roller.commit()
Modified:
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/RollerContext.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/RollerRequest.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/TurnoverReferersTask.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/pings/PingQueueTask.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/planet/PlanetGroupsAction.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/planet/RefreshEntriesTask.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/planet/SyncWebsitesTask.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/servlets/CommentServlet.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/servlets/TrackbackServlet.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/BasePingTargetsAction.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/CategoriesAction.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/CategorySaveAction.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/CommentManagementAction.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/ReferersAction.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/ToggleLinkbackDisplayAction.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/CreateWebsiteAction.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/MemberPermissionsAction.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/RollerPropertiesAction.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/ThemeEditorAction.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/UserAdminAction.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/UserNewAction.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/WebsiteFormAction.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/YourProfileAction.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/YourWebsitesAction.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/xmlrpc/BaseAPIHandler.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/xmlrpc/BloggerAPIHandler.java
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/RollerContext.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/RollerContext.java?rev=392619&r1=392618&r2=392619&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/RollerContext.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/RollerContext.java Sat Apr 8 15:38:59 2006
@@ -154,15 +154,8 @@
upgradeDatabaseIfNeeded();
Roller roller = RollerFactory.getRoller();
- roller.begin(UserData.SYSTEM_USER);
setupRollerProperties();
- roller.getThemeManager();
- setupSpellChecker();
- setupIndexManager(roller);
- initializePingFeatures(roller);
- setupPingQueueTask(roller);
- setupScheduledTasks(mContext, roller);
// call Spring's context ContextLoaderListener to initialize
// all the context files specified in web.xml. This is necessary
@@ -171,6 +164,13 @@
super.contextInitialized(sce);
initializeSecurityFeatures(mContext);
+
+ roller.getThemeManager();
+ setupSpellChecker();
+ setupIndexManager(roller);
+ initializePingFeatures(roller);
+ setupPingQueueTask(roller);
+ setupScheduledTasks(mContext, roller);
roller.commit();
roller.release();
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/RollerRequest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/RollerRequest.java?rev=392619&r1=392618&r2=392619&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/RollerRequest.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/RollerRequest.java Sat Apr 8 15:38:59 2006
@@ -153,7 +153,8 @@
{
UserManager userMgr = RollerFactory.getRoller().getUserManager();
UserData currentUser = userMgr.getUser(userName);
- RollerFactory.getRoller().setUser(currentUser);
+ // TODO: possible fix for backend refactoryings
+ //RollerFactory.getRoller().setUser(currentUser);
}
// path info may be null, (e.g. on JSP error page)
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/TurnoverReferersTask.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/TurnoverReferersTask.java?rev=392619&r1=392618&r2=392619&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/TurnoverReferersTask.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/TurnoverReferersTask.java Sat Apr 8 15:38:59 2006
@@ -40,7 +40,6 @@
try {
Roller roller = RollerFactory.getRoller();
- roller.begin();
roller.getRefererManager().clearReferrers();
roller.commit();
roller.release();
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java?rev=392619&r1=392618&r2=392619&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java Sat Apr 8 15:38:59 2006
@@ -125,6 +125,7 @@
bmgr.removeBookmark(bookmarks[j]);
}
}
+ // TODO: new transaction method, removeBookmarks(list)
roller.commit();
CacheManager.invalidate(website);
@@ -210,6 +211,7 @@
bd.save();
}
}
+ // TODO: new transaction method, saveBookmarks(list)
roller.commit();
CacheManager.invalidate(website);
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/pings/PingQueueTask.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/pings/PingQueueTask.java?rev=392619&r1=392618&r2=392619&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/pings/PingQueueTask.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/pings/PingQueueTask.java Sat Apr 8 15:38:59 2006
@@ -61,7 +61,7 @@
try
{
roller = RollerFactory.getRoller();
- roller.begin();
+ //roller.begin();
PingQueueProcessor.getInstance().processQueue();
roller.commit();
}
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/planet/PlanetGroupsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/planet/PlanetGroupsAction.java?rev=392619&r1=392618&r2=392619&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/planet/PlanetGroupsAction.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/planet/PlanetGroupsAction.java Sat Apr 8 15:38:59 2006
@@ -150,7 +150,6 @@
roller.commit();
roller.release();
- roller.begin();
form.doReset(mapping, request);
request.setAttribute("model",
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java?rev=392619&r1=392618&r2=392619&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java Sat Apr 8 15:38:59 2006
@@ -158,7 +158,6 @@
roller.commit();
roller.release();
- roller.begin();
form.doReset(mapping, request);
form.setGroupHandle(groupHandle);
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/planet/RefreshEntriesTask.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/planet/RefreshEntriesTask.java?rev=392619&r1=392618&r2=392619&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/planet/RefreshEntriesTask.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/planet/RefreshEntriesTask.java Sat Apr 8 15:38:59 2006
@@ -38,7 +38,6 @@
}
public void run() {
try {
- roller.begin(UserData.SYSTEM_USER);
roller.getPlanetManager().refreshEntries();
roller.commit();
roller.release();
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/planet/SyncWebsitesTask.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/planet/SyncWebsitesTask.java?rev=392619&r1=392618&r2=392619&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/planet/SyncWebsitesTask.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/planet/SyncWebsitesTask.java Sat Apr 8 15:38:59 2006
@@ -62,7 +62,6 @@
*/
private void syncWebsites() {
try {
- roller.begin(UserData.SYSTEM_USER);
List liveUserFeeds = new ArrayList();
String baseURL = RollerRuntimeConfig.getProperty("site.absoluteurl");
if (baseURL == null || baseURL.trim().length()==0) {
@@ -121,7 +120,7 @@
roller.commit();
roller.release();
- roller.begin();
+ // TODO: new planet manager method deleteSubs(list)
group = group = planet.getGroup("all");
Iterator subs = group.getSubscriptions().iterator();
while (subs.hasNext()) {
@@ -149,7 +148,6 @@
int count = 0;
int errorCount = 0;
try {
- roller.begin(UserData.SYSTEM_USER);
PlanetManager planet = roller.getPlanetManager();
PlanetConfigData config = planet.getConfiguration();
Technorati technorati = null;
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/servlets/CommentServlet.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/servlets/CommentServlet.java?rev=392619&r1=392618&r2=392619&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/servlets/CommentServlet.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/servlets/CommentServlet.java Sat Apr 8 15:38:59 2006
@@ -207,7 +207,7 @@
comment.setApproved(Boolean.TRUE);
}
- comment.save();
+ mgr.saveComment(comment);
RollerFactory.getRoller().commit();
reindexEntry(entry);
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/servlets/TrackbackServlet.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/servlets/TrackbackServlet.java?rev=392619&r1=392618&r2=392619&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/servlets/TrackbackServlet.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/servlets/TrackbackServlet.java Sat Apr 8 15:38:59 2006
@@ -21,6 +21,7 @@
import org.roller.util.SpamChecker;
import org.roller.model.RollerFactory;
+import org.roller.model.WeblogManager;
import org.roller.pojos.WeblogEntryData;
import org.roller.pojos.WebsiteData;
import org.roller.presentation.RollerContext;
@@ -185,7 +186,8 @@
}
// save, commit, send response
- comment.save();
+ WeblogManager mgr = RollerFactory.getRoller().getWeblogManager();
+ mgr.saveComment(comment);
RollerFactory.getRoller().commit();
// Clear all caches associated with comment
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/BasePingTargetsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/BasePingTargetsAction.java?rev=392619&r1=392618&r2=392619&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/BasePingTargetsAction.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/BasePingTargetsAction.java Sat Apr 8 15:38:59 2006
@@ -163,7 +163,7 @@
// Appears to be ok.
// Save it, commit and return refreshed view of target list.
- pingTarget.save();
+ pingTargetMgr.storePingTarget(pingTarget);
RollerFactory.getRoller().commit();
ActionMessages msgs = new ActionMessages();
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/CategoriesAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/CategoriesAction.java?rev=392619&r1=392618&r2=392619&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/CategoriesAction.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/CategoriesAction.java Sat Apr 8 15:38:59 2006
@@ -137,6 +137,7 @@
}
}
}
+ // TODO: new manager method, moveCategory(cat, newPath)
RollerFactory.getRoller().commit();
saveMessages(request, messages);
}
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/CategorySaveAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/CategorySaveAction.java?rev=392619&r1=392618&r2=392619&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/CategorySaveAction.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/CategorySaveAction.java Sat Apr 8 15:38:59 2006
@@ -60,7 +60,7 @@
rses.getAuthenticatedUser(), PermissionsData.AUTHOR))
{
form.copyTo(cd, request.getLocale());
- cd.save();
+ wmgr.storeWeblogCategory(cd);
RollerFactory.getRoller().commit();
// notify caches of object invalidation
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/CommentManagementAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/CommentManagementAction.java?rev=392619&r1=392618&r2=392619&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/CommentManagementAction.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/CommentManagementAction.java Sat Apr 8 15:38:59 2006
@@ -167,7 +167,8 @@
}
comment.save();
flushList.add(comment);
- }
+ }
+ // TODO: new transaction method, saveComments(list)
RollerFactory.getRoller().commit();
for (Iterator comments=flushList.iterator(); comments.hasNext();) {
CacheManager.invalidate((CommentData)comments.next());
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/ReferersAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/ReferersAction.java?rev=392619&r1=392618&r2=392619&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/ReferersAction.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/ReferersAction.java Sat Apr 8 15:38:59 2006
@@ -139,6 +139,7 @@
{
refmgr.removeReferer(deleteIds[i]);
}
+ // TODO: new manager method, removeReferers(list)
RollerFactory.getRoller().commit();
CacheManager.invalidate(website);
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/ToggleLinkbackDisplayAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/ToggleLinkbackDisplayAction.java?rev=392619&r1=392618&r2=392619&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/ToggleLinkbackDisplayAction.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/ToggleLinkbackDisplayAction.java Sat Apr 8 15:38:59 2006
@@ -54,7 +54,7 @@
boolean was = ref.getVisible()==null ?
false : ref.getVisible().booleanValue();
ref.setVisible(Boolean.valueOf( !was )); // what up, dog?
- ref.save();
+ refmgr.storeReferer(ref);
RollerFactory.getRoller().commit();
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java?rev=392619&r1=392618&r2=392619&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java Sat Apr 8 15:38:59 2006
@@ -294,8 +294,14 @@
// Store value object (creates new or updates existing)
entry.setUpdateTime(new Timestamp(new Date().getTime()));
+
+ // make sure we have an anchor value set
+ if(entry.getAnchor() == null || entry.getAnchor().trim().equals("")) {
+ entry.setAnchor(weblogMgr.createAnchor(entry));
+ }
+
mLogger.debug("Saving entry");
- entry.save();
+ weblogMgr.storeWeblogEntry(entry);
RollerFactory.getRoller().commit();
mLogger.debug("Populating form");
@@ -310,6 +316,11 @@
RollerRequest rreq = RollerRequest.getRollerRequest(request);
//PageCacheFilter.removeFromCache(request, entry.getWebsite());
CacheManager.invalidate(entry);
+
+ // Queue applicable pings for this update.
+ if(entry.isPublished()) {
+ RollerFactory.getRoller().getAutopingManager().queueApplicableAutoPings(entry);
+ }
// Clean up session objects we used
HttpSession session = request.getSession(true);
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/CreateWebsiteAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/CreateWebsiteAction.java?rev=392619&r1=392618&r2=392619&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/CreateWebsiteAction.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/CreateWebsiteAction.java Sat Apr 8 15:38:59 2006
@@ -136,12 +136,9 @@
}
}
- // Need system user to create website
- roller.setUser(UserData.SYSTEM_USER);
- HashMap pages = null; //rollerContext.readThemeMacros(form.getTheme());
website = mgr.createWebsite(
user,
- pages,
+ null,
form.getHandle(),
form.getName(),
form.getDescription(),
@@ -149,7 +146,6 @@
form.getTheme(),
form.getLocale(),
form.getTimeZone());
- roller.commit();
request.setAttribute("model",
new CreateWebsitePageModel(request, response, mapping, website));
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/MemberPermissionsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/MemberPermissionsAction.java?rev=392619&r1=392618&r2=392619&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/MemberPermissionsAction.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/MemberPermissionsAction.java Sat Apr 8 15:38:59 2006
@@ -20,6 +20,7 @@
import org.roller.RollerException;
import org.roller.model.Roller;
import org.roller.model.RollerFactory;
+import org.roller.model.UserManager;
import org.roller.pojos.PermissionsData;
import org.roller.pojos.UserData;
import org.roller.pojos.WebsiteData;
@@ -114,6 +115,8 @@
// Ensure use has admin perms for this weblog
if (model.getWebsite() != null && rses.isUserAuthorizedToAdmin(model.getWebsite())) {
+ UserManager userMgr = RollerFactory.getRoller().getUserManager();
+
Iterator iter = model.getPermissions().iterator();
int removed = 0;
int changed = 0;
@@ -135,12 +138,13 @@
{
if (val == -1)
{
- perms.remove();
+ userMgr.removePermissions(perms);
removed++;
}
else
{
perms.setPermissionMask(val);
+ userMgr.storePermissions(perms);
changed++;
}
}
@@ -148,7 +152,8 @@
}
if (removed > 0 || changed > 0)
{
- RollerFactory.getRoller().commit();
+ // TODO BACKEND: new transaction method, savePerms(list)
+ // rather than storing above, we should modify all then store all here
}
if (removed > 0)
{
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/RollerPropertiesAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/RollerPropertiesAction.java?rev=392619&r1=392618&r2=392619&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/RollerPropertiesAction.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/RollerPropertiesAction.java Sat Apr 8 15:38:59 2006
@@ -161,11 +161,11 @@
// save it
propsManager.store(props);
+
// this operation causes OutOfMemory exceptions on sites with
// lots of referers so i am disabling it until it's
// not as dangerous -- Allen G
//mRoller.getRefererManager().applyRefererFilters();
- mRoller.commit();
ActionMessages uiMessages = new ActionMessages();
uiMessages.add(null, new ActionMessage("weblogEdit.changesSaved"));
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/ThemeEditorAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/ThemeEditorAction.java?rev=392619&r1=392618&r2=392619&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/ThemeEditorAction.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/ThemeEditorAction.java Sat Apr 8 15:38:59 2006
@@ -21,8 +21,8 @@
import org.roller.model.Roller;
import org.roller.model.RollerFactory;
import org.roller.model.ThemeManager;
+import org.roller.model.UserManager;
import org.roller.pojos.Theme;
-import org.roller.pojos.UserData;
import org.roller.pojos.WebsiteData;
import org.roller.presentation.BasePageModel;
import org.roller.presentation.RollerRequest;
@@ -275,17 +275,16 @@
// update theme for website and save
if(newTheme != null) {
try {
- Roller roller = RollerFactory.getRoller();
String username = rses.getAuthenticatedUser().getUserName();
+
website.setEditorTheme(newTheme);
- website.save();
- roller.commit();
- mLogger.debug("Saved theme "+newTheme+
- " for "+username);
+ UserManager userMgr = RollerFactory.getRoller().getUserManager();
+ userMgr.storeWebsite(website);
+
+ mLogger.debug("Saved theme "+newTheme+" for "+username);
// make sure to flush the page cache so ppl can see the change
- //PageCacheFilter.removeFromCache(request, website);
CacheManager.invalidate(website);
// update complete ... now just send them back to edit
@@ -352,7 +351,6 @@
// only if custom themes are allowed
if(RollerRuntimeConfig.getBooleanProperty("themes.customtheme.allowed")) {
try {
- roller.begin(UserData.SYSTEM_USER);
themeMgr.saveThemePages(website, usersTheme);
roller.commit();
} catch(RollerException re) {
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/UserAdminAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/UserAdminAction.java?rev=392619&r1=392618&r2=392619&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/UserAdminAction.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/UserAdminAction.java Sat Apr 8 15:38:59 2006
@@ -132,9 +132,7 @@
RollerSession.getRollerSession(request);
if (rollerSession.isGlobalAdminUser() )
{
- // Need system user to update user
- RollerFactory.getRoller().setUser(UserData.SYSTEM_USER);
- UserManager mgr= RollerFactory.getRoller().getUserManager();
+ UserManager mgr = RollerFactory.getRoller().getUserManager();
UserAdminForm userForm = (UserAdminForm)actionForm;
if (userForm.isNewUser()) {
@@ -163,12 +161,13 @@
msgs.add(ActionErrors.GLOBAL_ERROR,
new ActionError("userSettings.needPasswordTwice"));
}
+
// If no error messages, then add user
if (msgs.isEmpty()) {
try {
// Save new user to database
mgr.addUser(user);
- RollerFactory.getRoller().commit();
+
msgs.add(ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("userSettings.saved"));
saveMessages(request, msgs);
@@ -220,8 +219,7 @@
if (msgs.isEmpty()) {
try {
// Persist changes to user
- mgr.storeUser( user );
- RollerFactory.getRoller().commit();
+ mgr.storeUser(user);
msgs.add(ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("userSettings.saved"));
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/UserNewAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/UserNewAction.java?rev=392619&r1=392618&r2=392619&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/UserNewAction.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/UserNewAction.java Sat Apr 8 15:38:59 2006
@@ -135,9 +135,6 @@
{
// Add new user
UserManager mgr = RollerFactory.getRoller().getUserManager();
-
- // Need system user to add new user
- RollerFactory.getRoller().setUser(UserData.SYSTEM_USER);
UserData ud = new UserData();
form.copyTo(ud, request.getLocale()); // doesn't copy password
@@ -153,16 +150,9 @@
form.getPasswordText(), form.getPasswordConfirm());
}
- //String theme = form.getTheme();
- //HashMap pages = rollerContext.readThemeMacros(theme);
+ // save new user
mgr.addUser(ud);
- //mgr.createWebsite(ud, pages, theme, form.getLocale(), form.getTimezone());
- RollerFactory.getRoller().commit();
-
- // Flush cache so user will immediately appear on index page
- //PageCacheFilter.removeFromCache( request, ud );
- //MainPageAction.flushMainPageCache();
-
+
if (form.getAdminCreated())
{
// User created for admin, so return to new user page with empty form
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/WebsiteFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/WebsiteFormAction.java?rev=392619&r1=392618&r2=392619&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/WebsiteFormAction.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/WebsiteFormAction.java Sat Apr 8 15:38:59 2006
@@ -149,7 +149,7 @@
form.setEnabled(wd.getEnabled());
form.copyTo(wd, request.getLocale());
- wd.save();
+ umgr.storeWebsite(wd);
RollerFactory.getRoller().getRefererManager().applyRefererFilters(wd);
RollerFactory.getRoller().commit();
@@ -259,10 +259,10 @@
RollerSession rses = RollerSession.getRollerSession(request);
if ( rses.isUserAuthorizedToAdmin(website) ) {
- website.remove();
- RollerFactory.getRoller().commit();
- //PageCacheFilter.removeFromCache(request, website);
+ // remove website
+ umgr.removeWebsite(website);
+
CacheManager.invalidate(website);
actionForm.reset(mapping, request);
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/YourProfileAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/YourProfileAction.java?rev=392619&r1=392618&r2=392619&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/YourProfileAction.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/YourProfileAction.java Sat Apr 8 15:38:59 2006
@@ -123,9 +123,6 @@
RollerSession rollerSession = RollerSession.getRollerSession(request);
UserData data = rollerSession.getAuthenticatedUser();
- // Need system user to update user
- RollerFactory.getRoller().setUser(UserData.SYSTEM_USER);
-
// We want to be VERY selective about what data gets updated
data.setFullName(form.getFullName());
data.setEmailAddress(form.getEmailAddress());
@@ -152,8 +149,6 @@
// save the updated profile
UserManager mgr = RollerFactory.getRoller().getUserManager();
mgr.storeUser(data);
-
- RollerFactory.getRoller().commit();
request.setAttribute("model", new BasePageModel(
"yourProfile.title", request, response, mapping));
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/YourWebsitesAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/YourWebsitesAction.java?rev=392619&r1=392618&r2=392619&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/YourWebsitesAction.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/YourWebsitesAction.java Sat Apr 8 15:38:59 2006
@@ -18,6 +18,7 @@
import org.roller.config.RollerConfig;
import org.roller.model.Roller;
import org.roller.model.RollerFactory;
+import org.roller.model.UserManager;
import org.roller.pojos.PermissionsData;
import org.roller.pojos.UserData;
import org.roller.pojos.WebsiteData;
@@ -74,13 +75,14 @@
throws Exception
{
YourWebsitesForm form = (YourWebsitesForm)actionForm;
- Roller roller = RollerFactory.getRoller();
- PermissionsData perms =
- roller.getUserManager().retrievePermissions(form.getInviteId());
+ UserManager userMgr = RollerFactory.getRoller().getUserManager();
+ PermissionsData perms = userMgr.retrievePermissions(form.getInviteId());
+
+ // TODO ROLLER_2.0: notify inviter that invitee has accepted invitation
+ // TODO EXCEPTIONS: better exception handling
perms.setPending(false);
- // ROLLER_2.0: notify inviter that invitee has accepted invitation
- roller.commit();
+ userMgr.storePermissions(perms);
ActionMessages msgs = new ActionMessages();
msgs.add(null, new ActionMessage(
@@ -101,13 +103,13 @@
throws Exception
{
YourWebsitesForm form = (YourWebsitesForm)actionForm;
- Roller roller = RollerFactory.getRoller();
- PermissionsData perms =
- roller.getUserManager().retrievePermissions(form.getInviteId());
-
- perms.remove();
- // ROLLER_2.0: notify inviter that invitee has declined invitation
- roller.commit();
+
+ UserManager userMgr = RollerFactory.getRoller().getUserManager();
+ PermissionsData perms = userMgr.retrievePermissions(form.getInviteId());
+
+ // TODO ROLLER_2.0: notify inviter that invitee has declined invitation
+ // TODO EXCEPTIONS: better exception handling here
+ userMgr.removePermissions(perms);
ActionMessages msgs = new ActionMessages();
msgs.add(null, new ActionMessage(
@@ -128,18 +130,20 @@
throws Exception
{
YourWebsitesForm form = (YourWebsitesForm)actionForm;
- Roller roller = RollerFactory.getRoller();
+
RollerSession rses = RollerSession.getRollerSession(request);
UserData user = rses.getAuthenticatedUser();
RollerRequest rreq = RollerRequest.getRollerRequest(request);
WebsiteData website = rreq.getWebsite();
- PermissionsData perms =
- roller.getUserManager().getPermissions(website, user);
+
+ UserManager userMgr = RollerFactory.getRoller().getUserManager();
+ PermissionsData perms = userMgr.getPermissions(website, user);
+
if (perms != null)
{
- // TODO: notify website members that user has resigned
- perms.remove();
- roller.commit();
+ // TODO ROLLER_2.0: notify website members that user has resigned
+ // TODO EXCEPTIONS: better exception handling
+ userMgr.removePermissions(perms);
}
ActionMessages msgs = new ActionMessages();
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/xmlrpc/BaseAPIHandler.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/xmlrpc/BaseAPIHandler.java?rev=392619&r1=392618&r2=392619&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/xmlrpc/BaseAPIHandler.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/xmlrpc/BaseAPIHandler.java Sat Apr 8 15:38:59 2006
@@ -131,7 +131,7 @@
authenticated= user.getPassword().equals(password);
if (authenticated)
{
- RollerFactory.getRoller().setUser(user);
+ //RollerFactory.getRoller().setUser(user);
}
}
}
@@ -206,7 +206,7 @@
authenticated = user.getPassword().equals(password);
if (authenticated)
{
- RollerFactory.getRoller().setUser(user);
+ //RollerFactory.getRoller().setUser(user);
}
}
}
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/xmlrpc/BloggerAPIHandler.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/xmlrpc/BloggerAPIHandler.java?rev=392619&r1=392618&r2=392619&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/xmlrpc/BloggerAPIHandler.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/xmlrpc/BloggerAPIHandler.java Sat Apr 8 15:38:59 2006
@@ -382,7 +382,8 @@
entry.setText(content);
entry.setPubTime(current);
entry.setUpdateTime(current);
- entry.setCreator(roller.getUser());
+ // TODO: fix from backend refactoring
+ //entry.setCreator(roller.getUser());
entry.setWebsite(website);
entry.setCategory(website.getBloggerCategory());
if (Boolean.valueOf(publish).booleanValue()) {