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/17 17:23:16 UTC
svn commit: r394696 [2/2] - in /incubator/roller/branches/roller-newbackend:
./ src/org/roller/business/hibernate/ src/org/roller/model/
src/org/roller/presentation/ src/org/roller/presentation/pings/
src/org/roller/presentation/planet/ src/org/roller/...
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/planet/PlanetConfigAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/planet/PlanetConfigAction.java?rev=394696&r1=394695&r2=394696&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/planet/PlanetConfigAction.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/planet/PlanetConfigAction.java Mon Apr 17 08:23:11 2006
@@ -135,6 +135,7 @@
group.setTitle("external");
planet.saveGroup(group);
}
+ roller.flush();
roller.commit();
ActionMessages messages = new ActionMessages();
messages.add(null, new ActionMessage("planetConfig.success.saved"));
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=394696&r1=394695&r2=394696&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 Mon Apr 17 08:23:11 2006
@@ -147,6 +147,7 @@
{
PlanetGroupData group = planet.getGroup(form.getHandle());
planet.deleteGroup(group);
+ roller.flush();
roller.commit();
roller.release();
@@ -202,7 +203,8 @@
group = planet.getGroupById(form.getId());
}
form.copyTo(group, request.getLocale());
- planet.saveGroup(group);
+ planet.saveGroup(group);
+ roller.flush();
roller.commit();
ActionMessages messages = new ActionMessages();
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=394696&r1=394695&r2=394696&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 Mon Apr 17 08:23:11 2006
@@ -155,6 +155,7 @@
targetGroup.removeSubscription(sub);
planet.deleteSubscription(sub);
+ roller.flush();
roller.commit();
roller.release();
@@ -228,6 +229,7 @@
form.setGroupHandle(groupHandle);
planet.saveSubscription(sub);
planet.saveGroup(targetGroup);
+ roller.flush();
roller.commit();
messages.add(null,
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=394696&r1=394695&r2=394696&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 Mon Apr 17 08:23:11 2006
@@ -39,6 +39,7 @@
public void run() {
try {
roller.getPlanetManager().refreshEntries();
+ roller.flush();
roller.commit();
roller.release();
} catch (RollerException e) {
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=394696&r1=394695&r2=394696&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 Mon Apr 17 08:23:11 2006
@@ -76,6 +76,7 @@
group.setHandle("all");
group.setTitle("all");
planet.saveGroup(group);
+ roller.flush();
roller.commit();
}
try {
@@ -117,6 +118,7 @@
}
}
planet.saveGroup(group);
+ roller.flush();
roller.commit();
roller.release();
@@ -131,6 +133,7 @@
planet.deleteSubscription(sub);
}
}
+ roller.flush();
roller.commit();
} finally {
roller.release();
@@ -220,6 +223,7 @@
}
count++;
}
+ roller.flush();
roller.commit();
} finally {
roller.release();
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=394696&r1=394695&r2=394696&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 Mon Apr 17 08:23:11 2006
@@ -208,6 +208,7 @@
}
mgr.saveComment(comment);
+ RollerFactory.getRoller().flush();
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=394696&r1=394695&r2=394696&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 Mon Apr 17 08:23:11 2006
@@ -188,6 +188,7 @@
// save, commit, send response
WeblogManager mgr = RollerFactory.getRoller().getWeblogManager();
mgr.saveComment(comment);
+ RollerFactory.getRoller().flush();
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=394696&r1=394695&r2=394696&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 Mon Apr 17 08:23:11 2006
@@ -164,6 +164,7 @@
// Appears to be ok.
// Save it, commit and return refreshed view of target list.
pingTargetMgr.storePingTarget(pingTarget);
+ RollerFactory.getRoller().flush();
RollerFactory.getRoller().commit();
ActionMessages msgs = new ActionMessages();
@@ -301,6 +302,7 @@
throw new RollerException("Missing ping target id.");
}
pingTargetMgr.removePingTarget(pingTargetId);
+ RollerFactory.getRoller().flush();
RollerFactory.getRoller().commit();
return view(mapping, form, req, res);
}
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=394696&r1=394695&r2=394696&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 Mon Apr 17 08:23:11 2006
@@ -138,6 +138,7 @@
}
}
// TODO: new manager method, moveCategory(cat, newPath)
+ RollerFactory.getRoller().flush();
RollerFactory.getRoller().commit();
saveMessages(request, messages);
}
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/CategoryDeleteAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/CategoryDeleteAction.java?rev=394696&r1=394695&r2=394696&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/CategoryDeleteAction.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/CategoryDeleteAction.java Mon Apr 17 08:23:11 2006
@@ -97,6 +97,7 @@
// User clicked YES to delete
// remove cat to delete
wmgr.removeWeblogCategory(catToDelete);
+ RollerFactory.getRoller().flush();
// notify caches of invalidated object
CacheManager.invalidate(catToDelete);
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=394696&r1=394695&r2=394696&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 Mon Apr 17 08:23:11 2006
@@ -61,6 +61,7 @@
{
form.copyTo(cd, request.getLocale());
wmgr.storeWeblogCategory(cd);
+ RollerFactory.getRoller().flush();
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=394696&r1=394695&r2=394696&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 Mon Apr 17 08:23:11 2006
@@ -165,11 +165,11 @@
comment.setApproved(Boolean.FALSE);
}
}
- // TODO: new transaction method, saveComments(list)
mgr.saveComment(comment);
flushList.add(comment);
}
+ RollerFactory.getRoller().flush();
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/PingSetupAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/PingSetupAction.java?rev=394696&r1=394695&r2=394696&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/PingSetupAction.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/weblog/actions/PingSetupAction.java Mon Apr 17 08:23:11 2006
@@ -184,6 +184,7 @@
AutoPingData autoPing = autoPingMgr.createAutoPing(pingTarget,
rreq.getWebsite());
autoPingMgr.storeAutoPing(autoPing);
+ RollerFactory.getRoller().flush();
RollerFactory.getRoller().commit();
return view(mapping, form, req, res);
@@ -212,6 +213,7 @@
return mapping.findForward("access-denied");
}
autoPingMgr.removeAutoPing(pingTarget, rreq.getWebsite());
+ RollerFactory.getRoller().flush();
RollerFactory.getRoller().commit();
return view(mapping, form, req, res);
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=394696&r1=394695&r2=394696&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 Mon Apr 17 08:23:11 2006
@@ -102,6 +102,7 @@
RefererManager refmgr = RollerFactory.getRoller().getRefererManager();
WebsiteData website = rreq.getWebsite();
refmgr.clearReferrers(website);
+ RollerFactory.getRoller().flush();
RollerFactory.getRoller().commit();
CacheManager.invalidate(website);
@@ -139,7 +140,7 @@
{
refmgr.removeReferer(deleteIds[i]);
}
- // TODO: new manager method, removeReferers(list)
+ RollerFactory.getRoller().flush();
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=394696&r1=394695&r2=394696&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 Mon Apr 17 08:23:11 2006
@@ -56,6 +56,7 @@
ref.setVisible(Boolean.valueOf( !was )); // what up, dog?
refmgr.storeReferer(ref);
+ RollerFactory.getRoller().flush();
RollerFactory.getRoller().commit();
//PageCacheFilter.removeFromCache( req, rreq.getWebsite() );
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=394696&r1=394695&r2=394696&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 Mon Apr 17 08:23:11 2006
@@ -302,6 +302,7 @@
mLogger.debug("Saving entry");
weblogMgr.storeWeblogEntry(entry);
+ RollerFactory.getRoller().flush();
mLogger.debug("Populating form");
form.copyFrom(entry, request.getLocale());
@@ -574,6 +575,7 @@
// remove entry itself
mgr.removeWeblogEntry(wd);
+ RollerFactory.getRoller().flush();
// flush caches
CacheManager.invalidate(wd);
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=394696&r1=394695&r2=394696&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 Mon Apr 17 08:23:11 2006
@@ -146,6 +146,7 @@
form.getTheme(),
form.getLocale(),
form.getTimeZone());
+ RollerFactory.getRoller().flush();
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=394696&r1=394695&r2=394696&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 Mon Apr 17 08:23:11 2006
@@ -152,8 +152,7 @@
}
if (removed > 0 || changed > 0)
{
- // TODO BACKEND: new transaction method, savePerms(list)
- // rather than storing above, we should modify all then store all here
+ RollerFactory.getRoller().flush();
}
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=394696&r1=394695&r2=394696&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 Mon Apr 17 08:23:11 2006
@@ -161,6 +161,7 @@
// save it
propsManager.store(props);
+ RollerFactory.getRoller().flush();
// this operation causes OutOfMemory exceptions on sites with
// lots of referers so i am disabling it until it's
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=394696&r1=394695&r2=394696&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 Mon Apr 17 08:23:11 2006
@@ -281,6 +281,7 @@
UserManager userMgr = RollerFactory.getRoller().getUserManager();
userMgr.storeWebsite(website);
+ RollerFactory.getRoller().flush();
mLogger.debug("Saved theme "+newTheme+" for "+username);
@@ -352,6 +353,7 @@
if(RollerRuntimeConfig.getBooleanProperty("themes.customtheme.allowed")) {
try {
themeMgr.saveThemePages(website, usersTheme);
+ RollerFactory.getRoller().flush();
} catch(RollerException re) {
mLogger.error(re);
errors.add(null, new ActionMessage("Error customizing theme"));
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=394696&r1=394695&r2=394696&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 Mon Apr 17 08:23:11 2006
@@ -167,6 +167,7 @@
try {
// Save new user to database
mgr.addUser(user);
+ RollerFactory.getRoller().flush();
msgs.add(ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("userSettings.saved"));
@@ -220,7 +221,8 @@
try {
// Persist changes to user
mgr.storeUser(user);
-
+ RollerFactory.getRoller().flush();
+
msgs.add(ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("userSettings.saved"));
saveMessages(request, msgs);
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=394696&r1=394695&r2=394696&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 Mon Apr 17 08:23:11 2006
@@ -152,6 +152,7 @@
// save new user
mgr.addUser(ud);
+ RollerFactory.getRoller().flush();
if (form.getAdminCreated())
{
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java?rev=394696&r1=394695&r2=394696&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java Mon Apr 17 08:23:11 2006
@@ -78,7 +78,8 @@
UserManager mgr = RollerFactory.getRoller().getUserManager();
mgr.storePage( data );
-
+ RollerFactory.getRoller().flush();
+
ActionMessages uiMessages = new ActionMessages();
uiMessages.add(ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("pagesForm.addNewPage.success",
@@ -208,7 +209,8 @@
if(!template.isRequired()) {
mgr.removePage(template);
-
+ RollerFactory.getRoller().flush();
+
// notify cache
CacheManager.invalidate(template);
} else {
@@ -311,7 +313,8 @@
validateLink( data );
mgr.storePage( data );
-
+ RollerFactory.getRoller().flush();
+
// set the (possibly) new link back into the Form bean
((WeblogTemplateForm)actionForm).setLink( data.getLink() );
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=394696&r1=394695&r2=394696&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 Mon Apr 17 08:23:11 2006
@@ -150,6 +150,8 @@
form.copyTo(wd, request.getLocale());
umgr.storeWebsite(wd);
+ RollerFactory.getRoller().flush();
+
RollerFactory.getRoller().getRefererManager().applyRefererFilters(wd);
messages.add(null,
@@ -261,6 +263,7 @@
// remove website
umgr.removeWebsite(website);
+ RollerFactory.getRoller().flush();
CacheManager.invalidate(website);
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=394696&r1=394695&r2=394696&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 Mon Apr 17 08:23:11 2006
@@ -149,6 +149,7 @@
// save the updated profile
UserManager mgr = RollerFactory.getRoller().getUserManager();
mgr.storeUser(data);
+ RollerFactory.getRoller().flush();
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=394696&r1=394695&r2=394696&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 Mon Apr 17 08:23:11 2006
@@ -83,7 +83,8 @@
// TODO EXCEPTIONS: better exception handling
perms.setPending(false);
userMgr.storePermissions(perms);
-
+ RollerFactory.getRoller().flush();
+
ActionMessages msgs = new ActionMessages();
msgs.add(null, new ActionMessage(
"yourWebsites.accepted", perms.getWebsite().getHandle()));
@@ -110,6 +111,7 @@
// TODO ROLLER_2.0: notify inviter that invitee has declined invitation
// TODO EXCEPTIONS: better exception handling here
userMgr.removePermissions(perms);
+ RollerFactory.getRoller().flush();
ActionMessages msgs = new ActionMessages();
msgs.add(null, new ActionMessage(
@@ -144,6 +146,7 @@
// TODO ROLLER_2.0: notify website members that user has resigned
// TODO EXCEPTIONS: better exception handling
userMgr.removePermissions(perms);
+ RollerFactory.getRoller().flush();
}
ActionMessages msgs = new ActionMessages();
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=394696&r1=394695&r2=394696&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 Mon Apr 17 08:23:11 2006
@@ -75,6 +75,7 @@
try {
// delete the entry
weblogMgr.removeWeblogEntry(entry);
+ roller.flush();
// notify cache
flushPageCache(entry.getWebsite());
@@ -326,6 +327,7 @@
// save the entry
weblogMgr.storeWeblogEntry(entry);
+ roller.flush();
// notify cache
flushPageCache(entry.getWebsite());
@@ -400,6 +402,7 @@
// save the entry
weblogMgr.storeWeblogEntry(entry);
+ roller.flush();
// notify cache
flushPageCache(entry.getWebsite());
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/presentation/xmlrpc/MetaWeblogAPIHandler.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/xmlrpc/MetaWeblogAPIHandler.java?rev=394696&r1=394695&r2=394696&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/presentation/xmlrpc/MetaWeblogAPIHandler.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/presentation/xmlrpc/MetaWeblogAPIHandler.java Mon Apr 17 08:23:11 2006
@@ -159,6 +159,7 @@
// save the entry
weblogMgr.storeWeblogEntry(entry);
+ roller.flush();
// notify cache
flushPageCache(entry.getWebsite());
@@ -257,6 +258,7 @@
// save the entry
weblogMgr.storeWeblogEntry(entry);
+ roller.flush();
// notify cache
flushPageCache(entry.getWebsite());
Modified: incubator/roller/branches/roller-newbackend/tests/org/roller/TestUtils.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/tests/org/roller/TestUtils.java?rev=394696&r1=394695&r2=394696&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/tests/org/roller/TestUtils.java (original)
+++ incubator/roller/branches/roller-newbackend/tests/org/roller/TestUtils.java Mon Apr 17 08:23:11 2006
@@ -27,6 +27,24 @@
/**
+ * Convenience method that simulates the end of a typical session.
+ *
+ * Normally this would be triggered by the end of the response in the webapp
+ * but for unit tests we need to do this explicitly.
+ *
+ * @param flush true if you want to flush changes to db before releasing
+ */
+ public static void endSession(boolean flush) throws Exception {
+
+ if(flush) {
+ RollerFactory.getRoller().flush();
+ }
+
+ RollerFactory.getRoller().release();
+ }
+
+
+ /**
* Convenience method that creates a user and stores it.
*/
public static UserData setupUser(String username) throws Exception {
Modified: incubator/roller/branches/roller-newbackend/tests/org/roller/business/CommentTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/tests/org/roller/business/CommentTest.java?rev=394696&r1=394695&r2=394696&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/tests/org/roller/business/CommentTest.java (original)
+++ incubator/roller/branches/roller-newbackend/tests/org/roller/business/CommentTest.java Mon Apr 17 08:23:11 2006
@@ -54,6 +54,7 @@
testUser = TestUtils.setupUser("commentTestUser");
testWeblog = TestUtils.setupWeblog("commentTestWeblog", testUser);
testEntry = TestUtils.setupWeblogEntry("commentTestEntry", testWeblog.getDefaultCategory(), testWeblog, testUser);
+ TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
throw new Exception("Test setup failed", ex);
@@ -66,6 +67,7 @@
TestUtils.teardownWeblogEntry(testEntry.getId());
TestUtils.teardownWeblog(testWeblog.getId());
TestUtils.teardownUser(testUser.getId());
+ TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
throw new Exception("Test teardown failed", ex);
@@ -94,6 +96,7 @@
// create a comment
mgr.saveComment(comment);
String id = comment.getId();
+ TestUtils.endSession(true);
// make sure comment was created
comment = null;
@@ -104,6 +107,7 @@
// update a comment
comment.setContent("testtest");
mgr.saveComment(comment);
+ TestUtils.endSession(true);
// make sure comment was updated
comment = null;
@@ -113,6 +117,7 @@
// delete a comment
mgr.removeComment(id);
+ TestUtils.endSession(true);
// make sure comment was deleted
comment = null;
@@ -133,6 +138,7 @@
CommentData comment1 = TestUtils.setupComment("comment1", testEntry);
CommentData comment2 = TestUtils.setupComment("comment2", testEntry);
CommentData comment3 = TestUtils.setupComment("comment3", testEntry);
+ TestUtils.endSession(true);
// get all comments
comments = null;
@@ -173,6 +179,7 @@
TestUtils.teardownComment(comment1.getId());
TestUtils.teardownComment(comment2.getId());
TestUtils.teardownComment(comment3.getId());
+ TestUtils.endSession(true);
}
@@ -189,12 +196,14 @@
CommentData comment2 = TestUtils.setupComment("comment2", testEntry);
CommentData comment3 = TestUtils.setupComment("comment3", testEntry);
CommentData comment4 = TestUtils.setupComment("comment4", testEntry);
+ TestUtils.endSession(true);
// remove a collection of comments
String[] delComments = new String[2];
delComments[0] = comment1.getId();
delComments[1] = comment2.getId();
mgr.removeComments(delComments);
+ TestUtils.endSession(true);
// make sure comments were deleted
comments = null;
@@ -204,6 +213,7 @@
// remove all comments for entry
mgr.removeCommentsForEntry(testEntry.getId());
+ TestUtils.endSession(true);
// make sure comments were deleted
comments = null;
Modified: incubator/roller/branches/roller-newbackend/tests/org/roller/business/FileManagerTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/tests/org/roller/business/FileManagerTest.java?rev=394696&r1=394695&r2=394696&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/tests/org/roller/business/FileManagerTest.java (original)
+++ incubator/roller/branches/roller-newbackend/tests/org/roller/business/FileManagerTest.java Mon Apr 17 08:23:11 2006
@@ -45,6 +45,7 @@
try {
testUser = TestUtils.setupUser("FileManagerTest_userName");
testWeblog = TestUtils.setupWeblog("FileManagerTest_handle", testUser);
+ TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
}
@@ -55,6 +56,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
TestUtils.teardownUser(testUser.getId());
+ TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
}
@@ -70,6 +72,7 @@
((RollerPropertyData)config.get("uploads.types.forbid")).setValue("gif");
((RollerPropertyData)config.get("uploads.dir.maxsize")).setValue("1.00");
pmgr.store(config);
+ TestUtils.endSession(true);
// test quota functionality
FileManager fmgr = RollerFactory.getRoller().getFileManager();
@@ -87,6 +90,7 @@
((RollerPropertyData)config.get("uploads.types.allowed")).setValue("opml");
((RollerPropertyData)config.get("uploads.dir.maxsize")).setValue("1.00");
pmgr.store(config);
+ TestUtils.endSession(true);
/* NOTE: upload dir for unit tests is set in
roller/personal/testing/roller-custom.properties */
Modified: incubator/roller/branches/roller-newbackend/tests/org/roller/business/PermissionTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/tests/org/roller/business/PermissionTest.java?rev=394696&r1=394695&r2=394696&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/tests/org/roller/business/PermissionTest.java (original)
+++ incubator/roller/branches/roller-newbackend/tests/org/roller/business/PermissionTest.java Mon Apr 17 08:23:11 2006
@@ -44,6 +44,7 @@
try {
testUser = TestUtils.setupUser("permsTestUser");
testWeblog = TestUtils.setupWeblog("permsTestWeblog", testUser);
+ TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
throw new Exception("Test setup failed", ex);
@@ -54,6 +55,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
TestUtils.teardownUser(testUser.getId());
+ TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
throw new Exception("Test teardown failed", ex);
@@ -73,6 +75,7 @@
perm = mgr.getPermissions(testWeblog, testUser);
assertNotNull(perm);
mgr.removePermissions(perm);
+ TestUtils.endSession(true);
// check that delete was successful
perm = null;
@@ -86,6 +89,7 @@
perm.setPending(false);
perm.setPermissionMask(PermissionsData.ADMIN);
mgr.storePermissions(perm);
+ TestUtils.endSession(true);
// check that create was successful
perm = null;
@@ -96,6 +100,7 @@
// update permissions
perm.setPermissionMask(PermissionsData.LIMITED);
mgr.storePermissions(perm);
+ TestUtils.endSession(true);
// check that update was successful
perm = null;
@@ -112,6 +117,7 @@
// we need a second user for this test
UserData user = TestUtils.setupUser("foofoo");
+ TestUtils.endSession(true);
UserManager mgr = RollerFactory.getRoller().getUserManager();
PermissionsData perm = null;
@@ -164,6 +170,7 @@
// cleanup the extra test user
TestUtils.teardownUser(user.getId());
+ TestUtils.endSession(true);
}
@@ -180,6 +187,7 @@
// need a second user and weblog to test with
UserData testUser2 = TestUtils.setupUser("permUser2");
WebsiteData testWeblog2 = TestUtils.setupWeblog("permWeblog2", testUser);
+ TestUtils.endSession(true);
// some perms to test with
PermissionsData perm1 = new PermissionsData();
@@ -200,6 +208,7 @@
// add perms (collection)
mgr.storePermissions(newPerms);
+ TestUtils.endSession(true);
// make sure perms were added
perms = null;
@@ -213,6 +222,7 @@
perm1.setPending(true);
perm2.setPending(true);
mgr.storePermissions(newPerms);
+ TestUtils.endSession(true);
// make sure perms were stored
perms = null;
@@ -223,6 +233,7 @@
// remove test data
TestUtils.teardownWeblog(testWeblog2.getId());
TestUtils.teardownUser(testUser2.getId());
+ TestUtils.endSession(true);
}
@@ -233,6 +244,7 @@
// we need a second user for this test
UserData user = TestUtils.setupUser("foobee");
+ TestUtils.endSession(true);
UserManager mgr = RollerFactory.getRoller().getUserManager();
PermissionsData perm = null;
@@ -241,11 +253,13 @@
// invite user to weblog
perm = mgr.inviteUser(testWeblog, user, PermissionsData.LIMITED);
String id = perm.getId();
+ TestUtils.endSession(true);
// accept invitation
perm = mgr.getPermissions(testWeblog, user);
perm.setPending(false);
mgr.storePermissions(perm);
+ TestUtils.endSession(true);
// re-query now that we have changed things
user = mgr.getUser(user.getUserName());
@@ -267,6 +281,7 @@
// test user can be retired from website
mgr.retireUser(testWeblog, user);
+ TestUtils.endSession(true);
user = mgr.retrieveUser(user.getId());
weblogs = mgr.getWebsites(user, null, null);
@@ -274,6 +289,7 @@
// cleanup the extra test user
TestUtils.teardownUser(user.getId());
+ TestUtils.endSession(true);
}
}
Modified: incubator/roller/branches/roller-newbackend/tests/org/roller/business/PingsTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/tests/org/roller/business/PingsTest.java?rev=394696&r1=394695&r2=394696&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/tests/org/roller/business/PingsTest.java (original)
+++ incubator/roller/branches/roller-newbackend/tests/org/roller/business/PingsTest.java Mon Apr 17 08:23:11 2006
@@ -54,6 +54,7 @@
try {
testUser = TestUtils.setupUser("wtTestUser");
testWeblog = TestUtils.setupWeblog("wtTestWeblog", testUser);
+ TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
throw new Exception("Test setup failed", ex);
@@ -73,6 +74,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
TestUtils.teardownUser(testUser.getId());
+ TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
throw new Exception("Test teardown failed", ex);
@@ -94,6 +96,7 @@
// create common ping
mgr.storePingTarget(testCommonPing);
String commonId = testCommonPing.getId();
+ TestUtils.endSession(true);
// make sure common ping was stored
ping = null;
@@ -105,6 +108,7 @@
testCustomPing.setWebsite(testWeblog);
mgr.storePingTarget(testCustomPing);
String customId = testCustomPing.getId();
+ TestUtils.endSession(true);
// make sure custom ping was stored
ping = null;
@@ -117,6 +121,7 @@
ping = mgr.retrievePingTarget(commonId);
ping.setName("testtestCommon");
mgr.storePingTarget(ping);
+ TestUtils.endSession(true);
// make sure common ping was updated
ping = null;
@@ -129,6 +134,7 @@
ping = mgr.retrievePingTarget(customId);
ping.setName("testtestCustom");
mgr.storePingTarget(ping);
+ TestUtils.endSession(true);
// make sure custom ping was updated
ping = null;
@@ -138,6 +144,7 @@
// delete common ping
mgr.removePingTarget(commonId);
+ TestUtils.endSession(true);
// make sure common ping was deleted
ping = null;
@@ -146,6 +153,7 @@
// delete custom ping
mgr.removePingTarget(customId);
+ TestUtils.endSession(true);
// make sure custom ping was deleted
ping = null;
@@ -165,11 +173,13 @@
// create common ping
mgr.storePingTarget(testCommonPing);
String commonId = testCommonPing.getId();
+ TestUtils.endSession(true);
// create custom ping
testCustomPing.setWebsite(testWeblog);
mgr.storePingTarget(testCustomPing);
String customId = testCustomPing.getId();
+ TestUtils.endSession(true);
// lookup by id
ping = null;
@@ -189,6 +199,7 @@
// remove custom pings for weblog
mgr.removeCustomPingTargets(testWeblog);
+ TestUtils.endSession(true);
// make sure remove succeeded
customPings = mgr.getCustomPingTargets(testWeblog);
@@ -197,6 +208,7 @@
// remove common ping
mgr.removePingTarget(commonId);
+ TestUtils.endSession(true);
}
@@ -211,11 +223,13 @@
// create ping target to use for tests
PingTargetData pingTarget = TestUtils.setupPingTarget("fooPing", "http://foo/null");
PingTargetData pingTarget2 = TestUtils.setupPingTarget("blahPing", "http://blah/null");
+ TestUtils.endSession(true);
// create autoPing
autoPing = mgr.createAutoPing(pingTarget, testWeblog);
mgr.storeAutoPing(autoPing);
String id = autoPing.getId();
+ TestUtils.endSession(true);
// make sure autoPing was stored
autoPing = null;
@@ -226,6 +240,7 @@
// update autoPing
autoPing.setPingTarget(pingTarget2);
mgr.storeAutoPing(autoPing);
+ TestUtils.endSession(true);
// make sure autoPing was updated
autoPing = null;
@@ -235,6 +250,7 @@
// delete autoPing
mgr.removeAutoPing(autoPing);
+ TestUtils.endSession(true);
// make sure common autoPing was deleted
autoPing = null;
@@ -244,6 +260,7 @@
// teardown test ping target
TestUtils.teardownPingTarget(pingTarget.getId());
TestUtils.teardownPingTarget(pingTarget2.getId());
+ TestUtils.endSession(true);
}
@@ -264,9 +281,11 @@
AutoPingData autoPing = TestUtils.setupAutoPing(pingTarget, testWeblog);
AutoPingData autoPing2 = TestUtils.setupAutoPing(pingTarget2, testWeblog);
AutoPingData autoPing3 = TestUtils.setupAutoPing(pingTarget3, testWeblog);
+ TestUtils.endSession(true);
// remove by weblog/target
mgr.removeAutoPing(pingTarget, testWeblog);
+ TestUtils.endSession(true);
// make sure remove succeeded
testAutoPing = null;
@@ -278,6 +297,7 @@
autoPings.add(autoPing2);
autoPings.add(autoPing3);
mgr.removeAutoPings(autoPings);
+ TestUtils.endSession(true);
// make sure delete was successful
autoPings = mgr.getAutoPingsByWebsite(testWeblog);
@@ -288,9 +308,11 @@
autoPing = TestUtils.setupAutoPing(pingTarget, testWeblog);
autoPing2 = TestUtils.setupAutoPing(pingTarget2, testWeblog);
autoPing3 = TestUtils.setupAutoPing(pingTarget3, testWeblog);
+ TestUtils.endSession(true);
// remove all
mgr.removeAllAutoPings();
+ TestUtils.endSession(true);
// make sure remove succeeded
autoPings = mgr.getAutoPingsByWebsite(testWeblog);
@@ -300,6 +322,7 @@
// teardown test ping target
TestUtils.teardownPingTarget(pingTarget.getId());
TestUtils.teardownPingTarget(pingTarget2.getId());
+ TestUtils.endSession(true);
}
@@ -313,11 +336,13 @@
// create autoPing target to use for tests
PingTargetData pingTarget = TestUtils.setupPingTarget("fooPing", "http://foo/null");
+ TestUtils.endSession(true);
// create autoPing
autoPing = mgr.createAutoPing(pingTarget, testWeblog);
mgr.storeAutoPing(autoPing);
String id = autoPing.getId();
+ TestUtils.endSession(true);
// lookup by id
autoPing = null;
@@ -338,9 +363,11 @@
// delete autoPing
mgr.removeAutoPing(autoPing);
+ TestUtils.endSession(true);
// teardown test ping target
TestUtils.teardownPingTarget(pingTarget.getId());
+ TestUtils.endSession(true);
}
Modified: incubator/roller/branches/roller-newbackend/tests/org/roller/business/PlanetManagerTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/tests/org/roller/business/PlanetManagerTest.java?rev=394696&r1=394695&r2=394696&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/tests/org/roller/business/PlanetManagerTest.java (original)
+++ incubator/roller/branches/roller-newbackend/tests/org/roller/business/PlanetManagerTest.java Mon Apr 17 08:23:11 2006
@@ -27,6 +27,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.roller.RollerException;
+import org.roller.TestUtils;
import org.roller.config.RollerConfig;
import org.roller.model.PlanetManager;
import org.roller.model.Roller;
@@ -55,7 +56,8 @@
config.setProxyHost("webcache.sfbay.sun.com");
config.setProxyPort(8080);
RollerFactory.getRoller().getPlanetManager().saveConfiguration(config);
- } catch (RollerException ex) {
+ TestUtils.endSession(true);
+ } catch (Exception ex) {
log.error(ex);
throw new RuntimeException(ex);
}
@@ -87,6 +89,7 @@
PlanetConfigData config = planet.getConfiguration();
config.setSiteUrl("http://footest/lskdf/null");
planet.saveConfiguration(config);
+ TestUtils.endSession(true);
}
{
// make sure config was saved
@@ -107,6 +110,7 @@
group.setHandle("test_handle");
group.setTitle("test_title");
planet.saveGroup(group);
+ TestUtils.endSession(true);
}
{ // retrieve group
PlanetGroupData group = planet.getGroup("test_handle");
@@ -117,6 +121,7 @@
{ // remove group
PlanetGroupData group = planet.getGroup("test_handle");
planet.deleteGroup(group);
+ TestUtils.endSession(true);
}
{ // verify that it is gone
PlanetGroupData group = planet.getGroup("test_handle");
@@ -133,6 +138,7 @@
PlanetSubscriptionData sub = new PlanetSubscriptionData();
sub.setFeedUrl("test_url");
planet.saveSubscription(sub);
+ TestUtils.endSession(true);
}
{ // retrieve subscription and add to group
PlanetGroupData group = new PlanetGroupData();
@@ -154,12 +160,14 @@
group.addSubscriptions(subs);
planet.saveGroup(group);
+ TestUtils.endSession(true);
}
{ // get group and check it's subscriptions, remove it
PlanetGroupData group = planet.getGroup("test_handle");
Set subs = group.getSubscriptions();
assertEquals(2, subs.size());
planet.deleteGroup(group);
+ TestUtils.endSession(true);
}
{ // make sure group gone, subs still there, then remove them too
PlanetGroupData group = planet.getGroup("test_handle");
@@ -170,6 +178,7 @@
assertNotNull(sub1);
planet.deleteSubscription(sub);
planet.deleteSubscription(sub1);
+ TestUtils.endSession(true);
}
{ // make sure subscriptions are gone
PlanetSubscriptionData sub = planet.getSubscription("test_url");
@@ -188,6 +197,7 @@
PlanetSubscriptionData sub = new PlanetSubscriptionData();
sub.setFeedUrl("test_url");
planet.saveSubscription(sub);
+ TestUtils.endSession(true);
}
{ // retrieve subscription and add entries
PlanetSubscriptionData sub = planet.getSubscription("test_url");
@@ -209,6 +219,7 @@
// save entries
planet.saveSubscription(sub);
+ TestUtils.endSession(true);
// get sub and check it's entries
sub = planet.getSubscription("test_url");
@@ -225,6 +236,7 @@
entry3.setSubscription(sub);
entry3.setPublished(new Date());
planet.saveEntry(entry3);
+ TestUtils.endSession(true);
// verify entry was added
sub = planet.getSubscription("test_url");
@@ -235,6 +247,7 @@
PlanetSubscriptionData sub = planet.getSubscription("test_url");
sub.purgeEntries();
planet.saveSubscription(sub);
+ TestUtils.endSession(true);
// make sure they were removed
sub = planet.getSubscription("test_url");
@@ -244,6 +257,7 @@
// remove test subscription
PlanetSubscriptionData sub = planet.getSubscription("test_url");
planet.deleteSubscription(sub);
+ TestUtils.endSession(true);
// make sure sub is gone
sub = planet.getSubscription("test_url");
@@ -271,9 +285,11 @@
group.addSubscription(sub);
planet.saveGroup(group);
+ TestUtils.endSession(true);
}
{
planet.refreshEntries();
+ TestUtils.endSession(true);
PlanetSubscriptionData sub = planet.getSubscription(feed_url1);
int entriesSize = sub.getEntries().size();
@@ -283,6 +299,7 @@
planet.deleteGroup(group);
planet.deleteSubscription(sub);
+ TestUtils.endSession(true);
assertTrue(entriesSize > 0);
}
@@ -315,9 +332,11 @@
group.addSubscription(sub1);
group.addSubscription(sub2);
planet.saveGroup(group);
+ TestUtils.endSession(true);
}
{
planet.refreshEntries();
+ TestUtils.endSession(true);
int count = 0;
Iterator subs = planet.getAllSubscriptions();
@@ -343,6 +362,7 @@
planet.deleteGroup(group);
planet.deleteSubscription(sub1);
planet.deleteSubscription(sub2);
+ TestUtils.endSession(true);
}
} catch (Exception e) {
e.printStackTrace();
@@ -366,11 +386,13 @@
PlanetSubscriptionData sub2 = new PlanetSubscriptionData();
sub2.setFeedUrl(feed_url2);
planet.saveSubscription(sub2);
+ TestUtils.endSession(true);
assertEquals(2, planet.getSubscriptionCount());
- planet.getSubscription(feed_url1).remove();
- planet.getSubscription(feed_url2).remove();
+ planet.deleteSubscription(planet.getSubscription(feed_url1));
+ planet.deleteSubscription(planet.getSubscription(feed_url2));
+ TestUtils.endSession(true);
}
} catch (Exception e) {
e.printStackTrace();
Modified: incubator/roller/branches/roller-newbackend/tests/org/roller/business/PropertiesTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/tests/org/roller/business/PropertiesTest.java?rev=394696&r1=394695&r2=394696&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/tests/org/roller/business/PropertiesTest.java (original)
+++ incubator/roller/branches/roller-newbackend/tests/org/roller/business/PropertiesTest.java Mon Apr 17 08:23:11 2006
@@ -12,6 +12,7 @@
import junit.framework.TestSuite;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.roller.TestUtils;
import org.roller.model.PropertiesManager;
import org.roller.model.RollerFactory;
import org.roller.pojos.RollerPropertyData;
@@ -49,8 +50,9 @@
public void testProperiesCRUD() throws Exception {
// remember, the properties table is initialized during Roller startup
-
PropertiesManager mgr = RollerFactory.getRoller().getPropertiesManager();
+ TestUtils.endSession(true);
+
RollerPropertyData prop = null;
// get a property by name
@@ -60,6 +62,7 @@
// update a property
prop.setValue("testtest");
mgr.store(prop);
+ TestUtils.endSession(true);
// make sure property was updated
prop = null;
@@ -78,6 +81,7 @@
prop = (RollerPropertyData) props.get("site.description");
prop.setValue("blahblah");
mgr.store(props);
+ TestUtils.endSession(true);
// make sure all properties were updated
props = mgr.getProperties();
Modified: incubator/roller/branches/roller-newbackend/tests/org/roller/business/UserTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/tests/org/roller/business/UserTest.java?rev=394696&r1=394695&r2=394696&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/tests/org/roller/business/UserTest.java (original)
+++ incubator/roller/branches/roller-newbackend/tests/org/roller/business/UserTest.java Mon Apr 17 08:23:11 2006
@@ -65,6 +65,7 @@
// add test user
mgr.addUser(testUser);
String id = testUser.getId();
+ TestUtils.endSession(true);
// make sure test user exists
user = null;
@@ -75,6 +76,7 @@
// modify user and save
user.setFullName("testtesttest");
mgr.storeUser(user);
+ TestUtils.endSession(true);
// make sure changes were saved
user = null;
@@ -84,6 +86,7 @@
// remove test user
mgr.removeUser(user);
+ TestUtils.endSession(true);
// make sure user no longer exists
user = null;
@@ -102,6 +105,7 @@
// add test user
UserData testUser = TestUtils.setupUser("userTestUser");
+ TestUtils.endSession(true);
// lookup by username
user = mgr.getUser(testUser.getUserName());
@@ -140,6 +144,7 @@
// remove test user
TestUtils.teardownUser(testUser.getId());
+ TestUtils.endSession(true);
}
@@ -153,6 +158,7 @@
// add test user
UserData testUser = TestUtils.setupUser("roleTestUser");
+ TestUtils.endSession(true);
// verify user has 2 roles, admin & editor
user = mgr.getUser(testUser.getUserName());
@@ -164,6 +170,7 @@
// remove role
user.revokeRole("admin");
mgr.storeUser(user);
+ TestUtils.endSession(true);
// check that role was removed
user = null;
@@ -176,6 +183,7 @@
// add role
user.grantRole("admin");
mgr.storeUser(user);
+ TestUtils.endSession(true);
// check that role was added
user = null;
@@ -187,6 +195,7 @@
// remove test user
TestUtils.teardownUser(testUser.getId());
+ TestUtils.endSession(true);
}
@@ -225,6 +234,7 @@
// add users (collection)
mgr.addUsers(newUsers);
+ TestUtils.endSession(true);
// make sure users were added
users = null;
@@ -236,6 +246,7 @@
testUser1.setFullName("blahblah");
testUser2.setFullName("foofoo");
mgr.storeUsers(newUsers);
+ TestUtils.endSession(true);
// make sure users were stored
users = null;
@@ -248,6 +259,7 @@
// remove users (collection)
TestUtils.teardownUser(testUser1.getId());
TestUtils.teardownUser(testUser2.getId());
+ TestUtils.endSession(true);
}
Modified: incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogCategoryTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogCategoryTest.java?rev=394696&r1=394695&r2=394696&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogCategoryTest.java (original)
+++ incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogCategoryTest.java Mon Apr 17 08:23:11 2006
@@ -52,6 +52,7 @@
try {
testUser = TestUtils.setupUser("entryTestUser");
testWeblog = TestUtils.setupWeblog("entryTestWeblog", testUser);
+ TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
throw new Exception("Test setup failed", ex);
@@ -65,6 +66,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
TestUtils.teardownUser(testUser.getId());
+ TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
throw new Exception("Test teardown failed", ex);
@@ -91,6 +93,7 @@
newCat.setWebsite(testWeblog);
mgr.storeWeblogCategory(newCat);
String id = newCat.getId();
+ TestUtils.endSession(true);
// make sure category was added
cat = null;
@@ -105,6 +108,7 @@
// update category
cat.setName("testtest");
mgr.storeWeblogCategory(cat);
+ TestUtils.endSession(true);
// verify category was updated
cat = null;
@@ -114,6 +118,7 @@
// remove category
mgr.removeWeblogCategory(cat);
+ TestUtils.endSession(true);
// make sure category was removed
cat = null;
@@ -159,6 +164,8 @@
f3.setWebsite(testWeblog);
mgr.storeWeblogCategory(f3);
+ TestUtils.endSession(true);
+
// check count of descendents and ancestors
f1 = mgr.retrieveWeblogCategory(f1.getId());
assertEquals(2, f1.getAllDescendentAssocs().size());
@@ -224,6 +231,8 @@
c3.setWebsite(testWeblog);
mgr.storeWeblogCategory(c3);
+ TestUtils.endSession(true);
+
c1 = mgr.retrieveWeblogCategory(c1.getId());
c2 = mgr.retrieveWeblogCategory(c2.getId());
c3 = mgr.retrieveWeblogCategory(c3.getId());
@@ -233,6 +242,8 @@
WeblogEntryData e2 = TestUtils.setupWeblogEntry("e2", c2, testWeblog, testUser);
WeblogEntryData e3 = TestUtils.setupWeblogEntry("e3", c3, testWeblog, testUser);
+ TestUtils.endSession(true);
+
// verify number of entries in each category
assertEquals(0, dest.retrieveWeblogEntries(true).size());
assertEquals(0, dest.retrieveWeblogEntries(false).size());
@@ -242,6 +253,7 @@
// move contents of source category c1 to destination catetory dest
c1.setParent(dest);
mgr.storeWeblogCategory(c1);
+ TestUtils.endSession(true);
// after move, verify number of entries in each category
dest = mgr.retrieveWeblogCategory(dest.getId());
Modified: incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogEntryTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogEntryTest.java?rev=394696&r1=394695&r2=394696&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogEntryTest.java (original)
+++ incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogEntryTest.java Mon Apr 17 08:23:11 2006
@@ -50,6 +50,7 @@
try {
testUser = TestUtils.setupUser("entryTestUser");
testWeblog = TestUtils.setupWeblog("entryTestWeblog", testUser);
+ TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
throw new Exception("Test setup failed", ex);
@@ -61,6 +62,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
TestUtils.teardownUser(testUser.getId());
+ TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
throw new Exception("Test teardown failed", ex);
@@ -90,6 +92,7 @@
// create a weblog entry
mgr.storeWeblogEntry(testEntry);
String id = testEntry.getId();
+ TestUtils.endSession(true);
// make sure entry was created
entry = mgr.retrieveWeblogEntry(id);
@@ -99,6 +102,7 @@
// update a weblog entry
entry.setTitle("testtest");
mgr.storeWeblogEntry(entry);
+ TestUtils.endSession(true);
// make sure entry was updated
entry = null;
@@ -108,6 +112,7 @@
// delete a weblog entry
mgr.removeWeblogEntry(entry);
+ TestUtils.endSession(true);
// make sure entry was deleted
entry = null;
@@ -141,6 +146,8 @@
entry3.setPubTime(entry3.getUpdateTime());
mgr.storeWeblogEntry(entry3);
+ TestUtils.endSession(true);
+
log.debug("entry1 = "+entry1.getUpdateTime());
log.debug("entry2 = "+entry2.getUpdateTime());
log.debug("entry3 = "+entry3.getUpdateTime());
@@ -251,6 +258,7 @@
TestUtils.teardownWeblogEntry(entry1.getId());
TestUtils.teardownWeblogEntry(entry2.getId());
TestUtils.teardownWeblogEntry(entry3.getId());
+ TestUtils.endSession(true);
}
@@ -265,6 +273,7 @@
// setup some test entries to use
WeblogEntryData entry1 = TestUtils.setupWeblogEntry("entry1", testWeblog.getDefaultCategory(), testWeblog, testUser);
+ TestUtils.endSession(true);
// make sure createAnchor gives us a new anchor value
String anchor = mgr.createAnchor(entry1);
@@ -273,11 +282,13 @@
// make sure we can create a new entry with specified anchor
WeblogEntryData entry2 = TestUtils.setupWeblogEntry(anchor, testWeblog.getDefaultCategory(), testWeblog, testUser);
+ TestUtils.endSession(true);
assertNotNull(entry2);
// teardown our test entries
TestUtils.teardownWeblogEntry(entry1.getId());
TestUtils.teardownWeblogEntry(entry2.getId());
+ TestUtils.endSession(true);
}
Modified: incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogPageTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogPageTest.java?rev=394696&r1=394695&r2=394696&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogPageTest.java (original)
+++ incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogPageTest.java Mon Apr 17 08:23:11 2006
@@ -50,6 +50,7 @@
try {
testUser = TestUtils.setupUser("wtTestUser");
testWeblog = TestUtils.setupWeblog("wtTestWeblog", testUser);
+ TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
throw new Exception("Test setup failed", ex);
@@ -69,6 +70,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
TestUtils.teardownUser(testUser.getId());
+ TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
throw new Exception("Test teardown failed", ex);
@@ -88,6 +90,7 @@
// create template
mgr.storePage(testPage);
+ TestUtils.endSession(true);
// check that create was successful
template = null;
@@ -98,6 +101,7 @@
// update template
template.setName("testtesttest");
mgr.storePage(template);
+ TestUtils.endSession(true);
// check that update was successful
template = null;
@@ -107,6 +111,7 @@
// delete template
mgr.removePage(template);
+ TestUtils.endSession(true);
// check that delete was successful
template = null;
@@ -126,6 +131,7 @@
// create page
mgr.storePage(testPage);
String id = testPage.getId();
+ TestUtils.endSession(true);
// lookup by id
page = mgr.retrievePage(id);
@@ -151,6 +157,7 @@
// delete page
mgr.removePage(page);
+ TestUtils.endSession(true);
}
}
Modified: incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogTest.java?rev=394696&r1=394695&r2=394696&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogTest.java (original)
+++ incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogTest.java Mon Apr 17 08:23:11 2006
@@ -42,6 +42,7 @@
try {
testUser = TestUtils.setupUser("weblogTestUser");
+ TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
throw new Exception("Test setup failed", ex);
@@ -52,6 +53,7 @@
try {
TestUtils.teardownUser(testUser.getId());
+ TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
throw new Exception("Test teardown failed", ex);
@@ -88,6 +90,7 @@
// add test weblog
mgr.createWebsite(testWeblog);
String id = testWeblog.getId();
+ TestUtils.endSession(true);
// make sure test weblog exists
weblog = null;
@@ -98,6 +101,7 @@
// modify weblog and save
weblog.setName("testtesttest");
mgr.storeWebsite(weblog);
+ TestUtils.endSession(true);
// make sure changes were saved
weblog = null;
@@ -107,6 +111,7 @@
// remove test weblog
mgr.removeWebsite(weblog);
+ TestUtils.endSession(true);
// make sure weblog no longer exists
weblog = null;
@@ -126,6 +131,7 @@
// add test weblogs
WebsiteData testWeblog1 = TestUtils.setupWeblog("testWeblog1", testUser);
WebsiteData testWeblog2 = TestUtils.setupWeblog("testWeblog2", testUser);
+ TestUtils.endSession(true);
// lookup by id
weblog = mgr.retrieveWebsite(testWeblog1.getId());
@@ -149,6 +155,7 @@
weblog = mgr.getWebsiteByHandle(testWeblog1.getHandle(), Boolean.FALSE);
weblog.setEnabled(Boolean.TRUE);
mgr.storeWebsite(weblog);
+ TestUtils.endSession(true);
weblog = null;
weblog = mgr.getWebsiteByHandle(testWeblog1.getHandle());
assertNotNull(weblog);
@@ -163,6 +170,7 @@
// make sure disabled weblogs are not returned
weblog.setEnabled(Boolean.FALSE);
mgr.storeWebsite(weblog);
+ TestUtils.endSession(true);
List weblogs2 = mgr.getWebsites(testUser, Boolean.TRUE, Boolean.TRUE);
assertEquals(1, weblogs2.size());
weblog = (WebsiteData) weblogs2.get(0);
@@ -171,12 +179,14 @@
// make sure inactive weblogs are not returned
weblog.setActive(Boolean.FALSE);
mgr.storeWebsite(weblog);
+ TestUtils.endSession(true);
List weblogs3 = mgr.getWebsites(testUser, Boolean.TRUE, Boolean.TRUE);
assertEquals(0, weblogs3.size());
// remove test weblogs
TestUtils.teardownWeblog(testWeblog1.getId());
TestUtils.teardownWeblog(testWeblog2.getId());
+ TestUtils.endSession(true);
}
@@ -223,6 +233,7 @@
// add weblogs (collection)
mgr.addWebsites(newWeblogs);
+ TestUtils.endSession(true);
// make sure weblogs were added
weblogs = null;
@@ -234,6 +245,7 @@
testWeblog1.setName("blahblah");
testWeblog2.setName("foofoo");
mgr.storeWebsites(newWeblogs);
+ TestUtils.endSession(true);
// make sure weblogs were stored
weblogs = null;
@@ -246,6 +258,7 @@
// remove weblogs (collection)
TestUtils.teardownWeblog(testWeblog1.getId());
TestUtils.teardownWeblog(testWeblog2.getId());
+ TestUtils.endSession(true);
}