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/19 22:53:20 UTC
svn commit: r395393 [8/10] - in /incubator/roller/trunk: ./
contrib/plugins/src/org/roller/presentation/velocity/plugins/topictag/
metadata/database/hibernate/
sandbox/atomadminprotocol/src/org/roller/presentation/atomadminapi/
sandbox/atomprotocol/src...
Modified: incubator/roller/trunk/src/org/roller/presentation/weblog/actions/ReferersAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/weblog/actions/ReferersAction.java?rev=395393&r1=395392&r2=395393&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/weblog/actions/ReferersAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/weblog/actions/ReferersAction.java Wed Apr 19 13:53:01 2006
@@ -19,6 +19,7 @@
import org.apache.struts.actions.DispatchAction;
import org.roller.model.RefererManager;
import org.roller.model.RollerFactory;
+import org.roller.pojos.RefererData;
import org.roller.pojos.WebsiteData;
import org.roller.presentation.BasePageModel;
import org.roller.presentation.RollerRequest;
@@ -102,7 +103,7 @@
RefererManager refmgr = RollerFactory.getRoller().getRefererManager();
WebsiteData website = rreq.getWebsite();
refmgr.clearReferrers(website);
- RollerFactory.getRoller().commit();
+ RollerFactory.getRoller().flush();
CacheManager.invalidate(website);
}
@@ -131,15 +132,17 @@
{
RefererManager refmgr = RollerFactory.getRoller().getRefererManager();
WebsiteData website = rreq.getWebsite();
-
+
+ RefererData referer = null;
String[] deleteIds = req.getParameterValues("id");
if (deleteIds != null)
{
for (int i=0; i<deleteIds.length; i++)
{
- refmgr.removeReferer(deleteIds[i]);
+ referer = refmgr.getReferer(deleteIds[i]);
+ refmgr.removeReferer(referer);
}
- RollerFactory.getRoller().commit();
+ RollerFactory.getRoller().flush();
CacheManager.invalidate(website);
Modified: incubator/roller/trunk/src/org/roller/presentation/weblog/actions/ToggleLinkbackDisplayAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/weblog/actions/ToggleLinkbackDisplayAction.java?rev=395393&r1=395392&r2=395393&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/weblog/actions/ToggleLinkbackDisplayAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/weblog/actions/ToggleLinkbackDisplayAction.java Wed Apr 19 13:53:01 2006
@@ -49,14 +49,14 @@
{
RefererManager refmgr =
RollerFactory.getRoller().getRefererManager();
- RefererData ref = refmgr.retrieveReferer(refid);
+ RefererData ref = refmgr.getReferer(refid);
entry = ref.getWeblogEntry();
boolean was = ref.getVisible()==null ?
false : ref.getVisible().booleanValue();
ref.setVisible(Boolean.valueOf( !was )); // what up, dog?
- ref.save();
+ refmgr.saveReferer(ref);
- RollerFactory.getRoller().commit();
+ RollerFactory.getRoller().flush();
//PageCacheFilter.removeFromCache( req, rreq.getWebsite() );
CacheManager.invalidate(rreq.getWebsite());
Modified: incubator/roller/trunk/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java?rev=395393&r1=395392&r2=395393&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java Wed Apr 19 13:53:01 2006
@@ -136,7 +136,7 @@
WeblogEntryData entry = rreq.getWeblogEntry();
WeblogEntryFormEx form = (WeblogEntryFormEx)actionForm;
if (entry == null && form.getId() != null) {
- entry = wmgr.retrieveWeblogEntry(form.getId());
+ entry = wmgr.getWeblogEntry(form.getId());
}
if (entry == null) {
ResourceBundle resources = ResourceBundle.getBundle(
@@ -237,8 +237,8 @@
RollerSession rses = RollerSession.getRollerSession(request);
UserManager userMgr = roller.getUserManager();
WeblogManager weblogMgr = roller.getWeblogManager();
- UserData ud = userMgr.retrieveUser(form.getCreatorId());
- WebsiteData site = userMgr.retrieveWebsite(form.getWebsiteId());
+ UserData ud = userMgr.getUser(form.getCreatorId());
+ WebsiteData site = userMgr.getWebsite(form.getWebsiteId());
WeblogEntryData entry = null;
if ( rses.isUserAuthorizedToAuthor(site)
@@ -260,7 +260,7 @@
entry.setCreator(ud);
entry.setWebsite( site );
} else {
- entry = weblogMgr.retrieveWeblogEntry(form.getId());
+ entry = weblogMgr.getWeblogEntry(form.getId());
}
mLogger.debug("setting update time now");
@@ -294,9 +294,15 @@
// 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();
- RollerFactory.getRoller().commit();
+ weblogMgr.saveWeblogEntry(entry);
+ RollerFactory.getRoller().flush();
mLogger.debug("Populating form");
form.copyFrom(entry, request.getLocale());
@@ -311,6 +317,11 @@
//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);
session.removeAttribute("spellCheckEvents");
@@ -515,7 +526,7 @@
Roller roller = RollerFactory.getRoller();
WeblogEntryFormEx wf = (WeblogEntryFormEx)actionForm;
WeblogEntryData wd =
- roller.getWeblogManager().retrieveWeblogEntry(wf.getId());
+ roller.getWeblogManager().getWeblogEntry(wf.getId());
RollerSession rses =
RollerSession.getRollerSession(request);
if ( rses.isUserAuthorizedToAuthor(wd.getWebsite())
@@ -551,25 +562,22 @@
try {
WeblogManager mgr = RollerFactory.getRoller().getWeblogManager();
WeblogEntryData wd =
- mgr.retrieveWeblogEntry(request.getParameter("id"));
+ mgr.getWeblogEntry(request.getParameter("id"));
RollerSession rses =
RollerSession.getRollerSession(request);
if ( rses.isUserAuthorizedToAuthor(wd.getWebsite())
|| (rses.isUserAuthorized(wd.getWebsite()) && wd.isDraft()) ) {
- // Flush the page cache
- //PageCacheFilter.removeFromCache(request, wd.getWebsite());
- //CacheManager.invalidate(wd);
// remove the index for it
+ // TODO: can we do this in a better way?
wd.setStatus(WeblogEntryData.DRAFT);
reindexEntry(RollerFactory.getRoller(), wd);
// remove entry itself
- wd.remove();
- RollerFactory.getRoller().commit();
+ mgr.removeWeblogEntry(wd);
+ RollerFactory.getRoller().flush();
// flush caches
- //PageCacheFilter.removeFromCache(request, wd.getWebsite());
CacheManager.invalidate(wd);
ActionMessages uiMessages = new ActionMessages();
@@ -602,7 +610,7 @@
try {
WeblogEntryFormEx wf = (WeblogEntryFormEx)actionForm;
UserManager umgr = RollerFactory.getRoller().getUserManager();
- WebsiteData site = umgr.retrieveWebsite(wf.getWebsiteId());
+ WebsiteData site = umgr.getWebsite(wf.getWebsiteId());
RollerSession rses =
RollerSession.getRollerSession(request);
if (rses.isUserAuthorizedToAuthor(site)) {
@@ -658,7 +666,7 @@
try {
WeblogEntryFormEx wf = (WeblogEntryFormEx)actionForm;
UserManager umgr = RollerFactory.getRoller().getUserManager();
- WebsiteData site = umgr.retrieveWebsite(wf.getWebsiteId());
+ WebsiteData site = umgr.getWebsite(wf.getWebsiteId());
RollerSession rses =
RollerSession.getRollerSession(request);
if ( rses.isUserAuthorized(site) ) {
@@ -710,7 +718,7 @@
Roller roller = RollerFactory.getRoller();
RollerContext rctx= RollerContext.getRollerContext();
WeblogManager wmgr= roller.getWeblogManager();
- entry = wmgr.retrieveWeblogEntry(entryid);
+ entry = wmgr.getWeblogEntry(entryid);
RollerSession rses = RollerSession.getRollerSession(request);
if (rses.isUserAuthorizedToAuthor(entry.getWebsite())) {
Modified: incubator/roller/trunk/src/org/roller/presentation/weblog/actions/WeblogEntryManagementAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/weblog/actions/WeblogEntryManagementAction.java?rev=395393&r1=395392&r2=395393&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/weblog/actions/WeblogEntryManagementAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/weblog/actions/WeblogEntryManagementAction.java Wed Apr 19 13:53:01 2006
@@ -103,7 +103,7 @@
if (null != queryForm.getCategoryId() && !queryForm.getCategoryId().equals("")) {
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
- WeblogCategoryData cd = wmgr.retrieveWeblogCategory(queryForm.getCategoryId());
+ WeblogCategoryData cd = wmgr.getWeblogCategory(queryForm.getCategoryId());
category = cd.getPath();
}
Modified: incubator/roller/trunk/src/org/roller/presentation/website/actions/CommonPingTargetsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/website/actions/CommonPingTargetsAction.java?rev=395393&r1=395392&r2=395393&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/website/actions/CommonPingTargetsAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/website/actions/CommonPingTargetsAction.java Wed Apr 19 13:53:01 2006
@@ -68,9 +68,8 @@
protected PingTargetData createPingTarget(RollerRequest rreq, PingTargetForm pingTargetForm)
throws RollerException
{
- PingTargetManager pingTargetMgr = RollerFactory.getRoller().getPingTargetManager();
- return pingTargetMgr.createCommonPingTarget(
- pingTargetForm.getName(), pingTargetForm.getPingUrl());
+ return new PingTargetData(null, pingTargetForm.getName(),
+ pingTargetForm.getPingUrl(), null);
}
Modified: incubator/roller/trunk/src/org/roller/presentation/website/actions/CreateWebsiteAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/website/actions/CreateWebsiteAction.java?rev=395393&r1=395392&r2=395393&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/website/actions/CreateWebsiteAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/website/actions/CreateWebsiteAction.java Wed Apr 19 13:53:01 2006
@@ -136,20 +136,34 @@
}
}
- // Need system user to create website
- roller.setUser(UserData.SYSTEM_USER);
- HashMap pages = null; //rollerContext.readThemeMacros(form.getTheme());
- website = mgr.createWebsite(
- user,
- pages,
- form.getHandle(),
- form.getName(),
- form.getDescription(),
- form.getEmailAddress(),
- form.getTheme(),
- form.getLocale(),
- form.getTimeZone());
- roller.commit();
+ WebsiteData newWebsite = new WebsiteData(
+ null, // id
+ form.getName(), // name
+ form.getHandle(), // handle
+ form.getDescription(), // description
+ user, // userId
+ "dummy", // defaultPageId
+ "dummy", // weblogDayPageId
+ Boolean.TRUE, // enableBloggerApi
+ null, // bloggerCategory
+ null, // defaultCategory
+ "editor-text.jsp", // editorPage
+ "", // blacklist
+ Boolean.TRUE, // allowComments
+ Boolean.FALSE, // emailComments
+ "", // emailFromAddress
+ Boolean.TRUE, // isEnabled
+ form.getEmailAddress(), // emailAddress
+ new java.util.Date(), // dateCreated
+ Boolean.TRUE, // defaultAllowComments
+ 0, // defaultCommentDays
+ Boolean.FALSE); // moderateComments
+ newWebsite.setEditorTheme(form.getTheme());
+ newWebsite.setLocale(form.getLocale());
+ newWebsite.setTimeZone(form.getTimeZone());
+ mgr.addWebsite(newWebsite);
+
+ RollerFactory.getRoller().flush();
request.setAttribute("model",
new CreateWebsitePageModel(request, response, mapping, website));
Modified: incubator/roller/trunk/src/org/roller/presentation/website/actions/InviteMemberAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/website/actions/InviteMemberAction.java?rev=395393&r1=395392&r2=395393&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/website/actions/InviteMemberAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/website/actions/InviteMemberAction.java Wed Apr 19 13:53:01 2006
@@ -121,7 +121,7 @@
ActionMessages errors = new ActionErrors();
InviteMemberForm form = (InviteMemberForm)actionForm;
UserManager umgr = RollerFactory.getRoller().getUserManager();
- UserData user = umgr.getUser(form.getUserName());
+ UserData user = umgr.getUserByUsername(form.getUserName());
BasePageModel pageModel = new BasePageModel(
"inviteMember.title", request, response, mapping);
@@ -158,6 +158,8 @@
{
String mask = request.getParameter("permissionsMask");
umgr.inviteUser(website, user, Short.parseShort(mask));
+ RollerFactory.getRoller().flush();
+
request.setAttribute("user", user);
try
{
Modified: incubator/roller/trunk/src/org/roller/presentation/website/actions/MemberPermissionsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/website/actions/MemberPermissionsAction.java?rev=395393&r1=395392&r2=395393&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/website/actions/MemberPermissionsAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/website/actions/MemberPermissionsAction.java Wed Apr 19 13:53:01 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.savePermissions(perms);
changed++;
}
}
@@ -148,7 +152,7 @@
}
if (removed > 0 || changed > 0)
{
- RollerFactory.getRoller().commit();
+ RollerFactory.getRoller().flush();
}
if (removed > 0)
{
Modified: incubator/roller/trunk/src/org/roller/presentation/website/actions/RollerPropertiesAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/website/actions/RollerPropertiesAction.java?rev=395393&r1=395392&r2=395393&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/website/actions/RollerPropertiesAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/website/actions/RollerPropertiesAction.java Wed Apr 19 13:53:01 2006
@@ -160,12 +160,13 @@
}
// save it
- propsManager.store(props);
+ propsManager.saveProperties(props);
+ RollerFactory.getRoller().flush();
+
// 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/trunk/src/org/roller/presentation/website/actions/ThemeEditorAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/website/actions/ThemeEditorAction.java?rev=395393&r1=395392&r2=395393&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/website/actions/ThemeEditorAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/website/actions/ThemeEditorAction.java Wed Apr 19 13:53:01 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,17 @@
// 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.saveWebsite(website);
+ RollerFactory.getRoller().flush();
+
+ 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,9 +352,8 @@
// only if custom themes are allowed
if(RollerRuntimeConfig.getBooleanProperty("themes.customtheme.allowed")) {
try {
- roller.begin(UserData.SYSTEM_USER);
themeMgr.saveThemePages(website, usersTheme);
- roller.commit();
+ RollerFactory.getRoller().flush();
} catch(RollerException re) {
mLogger.error(re);
errors.add(null, new ActionMessage("Error customizing theme"));
Modified: incubator/roller/trunk/src/org/roller/presentation/website/actions/UserAdminAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/website/actions/UserAdminAction.java?rev=395393&r1=395392&r2=395393&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/website/actions/UserAdminAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/website/actions/UserAdminAction.java Wed Apr 19 13:53:01 2006
@@ -73,7 +73,7 @@
{
ActionMessages msgs = getErrors(request);
msgs = (msgs == null) ? new ActionMessages() : msgs;
- user = mgr.getUser(userForm.getUserName(), null);
+ user = mgr.getUserByUsername(userForm.getUserName(), null);
if (user != null)
{
userForm.copyFrom(user, request.getLocale());
@@ -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,14 @@
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();
+ RollerFactory.getRoller().flush();
+
msgs.add(ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("userSettings.saved"));
saveMessages(request, msgs);
@@ -190,7 +190,7 @@
} else {
- UserData user = mgr.retrieveUser(userForm.getId());
+ UserData user = mgr.getUser(userForm.getId());
userForm.copyTo(user, request.getLocale());
// Check username and email addresses
@@ -220,9 +220,9 @@
if (msgs.isEmpty()) {
try {
// Persist changes to user
- mgr.storeUser( user );
- RollerFactory.getRoller().commit();
-
+ mgr.saveUser(user);
+ RollerFactory.getRoller().flush();
+
msgs.add(ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("userSettings.saved"));
saveMessages(request, msgs);
Modified: incubator/roller/trunk/src/org/roller/presentation/website/actions/UserNewAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/website/actions/UserNewAction.java?rev=395393&r1=395392&r2=395393&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/website/actions/UserNewAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/website/actions/UserNewAction.java Wed Apr 19 13:53:01 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,10 @@
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();
-
+ RollerFactory.getRoller().flush();
+
if (form.getAdminCreated())
{
// User created for admin, so return to new user page with empty form
Modified: incubator/roller/trunk/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java?rev=395393&r1=395392&r2=395393&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java Wed Apr 19 13:53:01 2006
@@ -77,18 +77,14 @@
validateLink( data );
UserManager mgr = RollerFactory.getRoller().getUserManager();
- mgr.storePage( data );
- RollerFactory.getRoller().commit();
-
+ mgr.savePage( data );
+ RollerFactory.getRoller().flush();
+
ActionMessages uiMessages = new ActionMessages();
uiMessages.add(ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("pagesForm.addNewPage.success",
data.getName()));
saveMessages(request, uiMessages);
-
- UserData user = rses.getAuthenticatedUser();
- //PageCacheFilter.removeFromCache( request, website );
- //CacheManager.invalidate(data);
actionForm.reset(mapping,request);
@@ -129,12 +125,8 @@
pageModel.setWebsite(pd.getWebsite());
request.setAttribute("model", pageModel);
- UserData ud = rses.getAuthenticatedUser();
WeblogTemplateForm pf = (WeblogTemplateForm)actionForm;
pf.copyFrom(pd, request.getLocale());
-
- //PageCacheFilter.removeFromCache( request, pd.getWebsite() );
- //CacheManager.invalidate(pd);
addModelObjects(request, response, mapping, pd.getWebsite());
}
@@ -172,7 +164,7 @@
if (website == null && form.getId()!=null)
{
UserManager mgr = RollerFactory.getRoller().getUserManager();
- WeblogTemplate template = mgr.retrievePage(form.getId());
+ WeblogTemplate template = mgr.getPage(form.getId());
website = template.getWebsite();
}
@@ -208,19 +200,25 @@
{
UserManager mgr = RollerFactory.getRoller().getUserManager();
WeblogTemplateForm form = (WeblogTemplateForm)actionForm;
- WeblogTemplate template = mgr.retrievePage(form.getId());
+ WeblogTemplate template = mgr.getPage(form.getId());
WebsiteData website = template.getWebsite();
RollerSession rses = RollerSession.getRollerSession(request);
if ( rses.isUserAuthorizedToAdmin(website) )
{
- mgr.removePageSafely(template.getId());
- RollerFactory.getRoller().commit();
-
- UserData user = rses.getAuthenticatedUser();
- //PageCacheFilter.removeFromCache(request, template.getWebsite());
- CacheManager.invalidate(template);
+ if(!template.isRequired()) {
+ mgr.removePage(template);
+ RollerFactory.getRoller().flush();
+
+ // notify cache
+ CacheManager.invalidate(template);
+ } else {
+
+ // someone trying to remove a required template
+ throw new RollerException("Cannot remove required page");
+ }
+
addModelObjects(
request, response, mapping, template.getWebsite());
actionForm.reset(mapping, request);
@@ -303,7 +301,7 @@
RollerRequest rreq = RollerRequest.getRollerRequest(request);
WeblogTemplateForm form = (WeblogTemplateForm)actionForm;
UserManager mgr = RollerFactory.getRoller().getUserManager();
- WeblogTemplate data = mgr.retrievePage(form.getId());
+ WeblogTemplate data = mgr.getPage(form.getId());
WebsiteData website = data.getWebsite();
RollerSession rses = RollerSession.getRollerSession(request);
@@ -314,9 +312,9 @@
validateLink( data );
- mgr.storePage( data );
- RollerFactory.getRoller().commit();
-
+ mgr.savePage( data );
+ RollerFactory.getRoller().flush();
+
// set the (possibly) new link back into the Form bean
((WeblogTemplateForm)actionForm).setLink( data.getLink() );
@@ -326,8 +324,6 @@
data.getName()));
saveMessages(request, uiMessages);
- UserData user = rses.getAuthenticatedUser();
- //PageCacheFilter.removeFromCache(request, data.getWebsite());
CacheManager.invalidate(data);
BasePageModel pageModel = new BasePageModel(
Modified: incubator/roller/trunk/src/org/roller/presentation/website/actions/WebsiteFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/website/actions/WebsiteFormAction.java?rev=395393&r1=395392&r2=395393&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/website/actions/WebsiteFormAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/website/actions/WebsiteFormAction.java Wed Apr 19 13:53:01 2006
@@ -136,7 +136,7 @@
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
UserManager umgr = RollerFactory.getRoller().getUserManager();
- WebsiteData wd = umgr.retrieveWebsite(form.getId());
+ WebsiteData wd = umgr.getWebsite(form.getId());
// Set website in request, so subsequent action gets it
RollerRequest.getRollerRequest(request).setWebsite(wd);
@@ -149,9 +149,10 @@
form.setEnabled(wd.getEnabled());
form.copyTo(wd, request.getLocale());
- wd.save();
+ umgr.saveWebsite(wd);
RollerFactory.getRoller().getRefererManager().applyRefererFilters(wd);
- RollerFactory.getRoller().commit();
+
+ RollerFactory.getRoller().flush();
messages.add(null,
new ActionMessage("websiteSettings.savedChanges"));
@@ -225,7 +226,7 @@
throws Exception {
WebsiteFormEx form = (WebsiteFormEx)actionForm;
UserManager umgr = RollerFactory.getRoller().getUserManager();
- WebsiteData website = umgr.retrieveWebsite(form.getId());
+ WebsiteData website = umgr.getWebsite(form.getId());
ActionForward forward = mapping.findForward("removeWebsite.page");
request.setAttribute("model", new WebsitePageModel(
"websiteRemove.title", request, response, mapping, website));
@@ -255,14 +256,15 @@
try {
UserManager umgr = RollerFactory.getRoller().getUserManager();
WebsiteFormEx form = (WebsiteFormEx)actionForm;
- WebsiteData website = umgr.retrieveWebsite(form.getId());
+ WebsiteData website = umgr.getWebsite(form.getId());
RollerSession rses = RollerSession.getRollerSession(request);
if ( rses.isUserAuthorizedToAdmin(website) ) {
- website.remove();
- RollerFactory.getRoller().commit();
- //PageCacheFilter.removeFromCache(request, website);
+ // remove website
+ umgr.removeWebsite(website);
+ RollerFactory.getRoller().flush();
+
CacheManager.invalidate(website);
actionForm.reset(mapping, request);
Modified: incubator/roller/trunk/src/org/roller/presentation/website/actions/YourProfileAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/website/actions/YourProfileAction.java?rev=395393&r1=395392&r2=395393&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/website/actions/YourProfileAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/website/actions/YourProfileAction.java Wed Apr 19 13:53:01 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());
@@ -151,9 +148,8 @@
// save the updated profile
UserManager mgr = RollerFactory.getRoller().getUserManager();
- mgr.storeUser(data);
-
- RollerFactory.getRoller().commit();
+ mgr.saveUser(data);
+ RollerFactory.getRoller().flush();
request.setAttribute("model", new BasePageModel(
"yourProfile.title", request, response, mapping));
Modified: incubator/roller/trunk/src/org/roller/presentation/website/actions/YourWebsitesAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/website/actions/YourWebsitesAction.java?rev=395393&r1=395392&r2=395393&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/website/actions/YourWebsitesAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/website/actions/YourWebsitesAction.java Wed Apr 19 13:53:01 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,14 +75,16 @@
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.getPermissions(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.savePermissions(perms);
+ RollerFactory.getRoller().flush();
+
ActionMessages msgs = new ActionMessages();
msgs.add(null, new ActionMessage(
"yourWebsites.accepted", perms.getWebsite().getHandle()));
@@ -101,13 +104,14 @@
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.getPermissions(form.getInviteId());
+
+ // 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(
@@ -128,18 +132,21 @@
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);
+ RollerFactory.getRoller().flush();
}
ActionMessages msgs = new ActionMessages();
Modified: incubator/roller/trunk/src/org/roller/presentation/website/formbeans/WebsiteFormEx.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/website/formbeans/WebsiteFormEx.java?rev=395393&r1=395392&r2=395393&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/website/formbeans/WebsiteFormEx.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/website/formbeans/WebsiteFormEx.java Wed Apr 19 13:53:01 2006
@@ -168,14 +168,14 @@
if (getDefaultCategoryId() != null)
{
WeblogCategoryData defaultCat =
- wmgr.retrieveWeblogCategory(getDefaultCategoryId());
+ wmgr.getWeblogCategory(getDefaultCategoryId());
dataHolder.setDefaultCategory(defaultCat);
}
if (getBloggerCategoryId() != null)
{
WeblogCategoryData bloggerCat =
- wmgr.retrieveWeblogCategory(getBloggerCategoryId());
+ wmgr.getWeblogCategory(getBloggerCategoryId());
dataHolder.setBloggerCategory(bloggerCat);
}
}
Modified: incubator/roller/trunk/src/org/roller/presentation/xmlrpc/BaseAPIHandler.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/xmlrpc/BaseAPIHandler.java?rev=395393&r1=395392&r2=395393&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/xmlrpc/BaseAPIHandler.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/xmlrpc/BaseAPIHandler.java Wed Apr 19 13:53:01 2006
@@ -104,7 +104,7 @@
RollerRequest rreq = RollerRequest.getRollerRequest();
UserManager userMgr = RollerFactory.getRoller().getUserManager();
- user = userMgr.getUser(username);
+ user = userMgr.getUserByUsername(username);
userEnabled = user.getEnabled().booleanValue();
website = userMgr.getWebsiteByHandle(blogid);
@@ -131,7 +131,7 @@
authenticated= user.getPassword().equals(password);
if (authenticated)
{
- RollerFactory.getRoller().setUser(user);
+ //RollerFactory.getRoller().setUser(user);
}
}
}
@@ -186,7 +186,7 @@
RollerRequest rreq = RollerRequest.getRollerRequest();
UserManager userMgr = RollerFactory.getRoller().getUserManager();
- user = userMgr.getUser(username);
+ user = userMgr.getUserByUsername(username);
enabled = user.getEnabled().booleanValue();
if (enabled)
@@ -206,7 +206,7 @@
authenticated = user.getPassword().equals(password);
if (authenticated)
{
- RollerFactory.getRoller().setUser(user);
+ //RollerFactory.getRoller().setUser(user);
}
}
}
Modified: incubator/roller/trunk/src/org/roller/presentation/xmlrpc/BloggerAPIHandler.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/xmlrpc/BloggerAPIHandler.java?rev=395393&r1=395392&r2=395393&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/xmlrpc/BloggerAPIHandler.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/xmlrpc/BloggerAPIHandler.java Wed Apr 19 13:53:01 2006
@@ -68,20 +68,23 @@
Roller roller = RollerFactory.getRoller();
WeblogManager weblogMgr = roller.getWeblogManager();
- WeblogEntryData entry = weblogMgr.retrieveWeblogEntry(postid);
+ WeblogEntryData entry = weblogMgr.getWeblogEntry(postid);
validate(entry.getWebsite().getHandle(), userid, password);
try {
- entry.remove();
- roller.commit();
+ // delete the entry
+ weblogMgr.removeWeblogEntry(entry);
+ roller.flush();
+
+ // notify cache
flushPageCache(entry.getWebsite());
} catch (Exception e) {
String msg = "ERROR in blogger.deletePost: "+e.getClass().getName();
mLogger.error(msg,e);
- e.printStackTrace();
throw new XmlRpcException(UNKNOWN_EXCEPTION, msg);
}
+
return true;
}
@@ -121,9 +124,9 @@
Roller roller = RollerFactory.getRoller();
UserManager userMgr = roller.getUserManager();
- WeblogTemplate page = userMgr.retrievePage(templateType);
+ WeblogTemplate page = userMgr.getPage(templateType);
page.setContents(templateData);
- userMgr.storePage(page);
+ userMgr.savePage(page);
flushPageCache(page.getWebsite());
return true;
@@ -161,7 +164,7 @@
try {
Roller roller = RollerFactory.getRoller();
UserManager userMgr = roller.getUserManager();
- WeblogTemplate page = userMgr.retrievePage(templateType);
+ WeblogTemplate page = userMgr.getPage(templateType);
if ( null == page ) {
throw new XmlRpcException(UNKNOWN_EXCEPTION,"Template not found");
@@ -197,7 +200,7 @@
try {
Roller roller = RollerFactory.getRoller();
UserManager userMgr = roller.getUserManager();
- UserData user = userMgr.getUser(userid);
+ UserData user = userMgr.getUserByUsername(userid);
// parses full name into two strings, firstname and lastname
String firstname = "", lastname = "";
@@ -262,7 +265,7 @@
RollerContext.getRollerContext().getAbsoluteContextUrl(req);
UserManager umgr = RollerFactory.getRoller().getUserManager();
- UserData user = umgr.getUser(userid);
+ UserData user = umgr.getUserByUsername(userid);
// get list of user's enabled websites
List websites = umgr.getWebsites(user, Boolean.TRUE, null);
Iterator iter = websites.iterator();
@@ -313,7 +316,7 @@
Roller roller = RollerFactory.getRoller();
WeblogManager weblogMgr = roller.getWeblogManager();
- WeblogEntryData entry = weblogMgr.retrieveWeblogEntry(postid);
+ WeblogEntryData entry = weblogMgr.getWeblogEntry(postid);
entry.setText(content);
entry.setUpdateTime(current);
if (Boolean.valueOf(publish).booleanValue()) {
@@ -322,9 +325,13 @@
entry.setStatus(WeblogEntryData.DRAFT);
}
- entry.save();
- roller.commit();
+ // save the entry
+ weblogMgr.saveWeblogEntry(entry);
+ roller.flush();
+
+ // notify cache
flushPageCache(entry.getWebsite());
+
return true;
} catch (Exception e) {
String msg = "ERROR in BlooggerAPIHander.editPost";
@@ -374,6 +381,7 @@
try {
RollerRequest rreq = RollerRequest.getRollerRequest();
Roller roller = RollerFactory.getRoller();
+ WeblogManager weblogMgr = roller.getWeblogManager();
Timestamp current = new Timestamp(System.currentTimeMillis());
@@ -382,7 +390,8 @@
entry.setText(content);
entry.setPubTime(current);
entry.setUpdateTime(current);
- entry.setCreator(roller.getUser());
+ // TODO BACKEND: fix from backend refactoring
+ //entry.setCreator(roller.getUser());
entry.setWebsite(website);
entry.setCategory(website.getBloggerCategory());
if (Boolean.valueOf(publish).booleanValue()) {
@@ -390,8 +399,12 @@
} else {
entry.setStatus(WeblogEntryData.DRAFT);
}
- entry.save();
- roller.commit();
+
+ // save the entry
+ weblogMgr.saveWeblogEntry(entry);
+ roller.flush();
+
+ // notify cache
flushPageCache(entry.getWebsite());
/*
String blogUrl = Utilities.escapeHTML(
Modified: incubator/roller/trunk/src/org/roller/presentation/xmlrpc/MetaWeblogAPIHandler.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/xmlrpc/MetaWeblogAPIHandler.java?rev=395393&r1=395392&r2=395393&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/xmlrpc/MetaWeblogAPIHandler.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/xmlrpc/MetaWeblogAPIHandler.java Wed Apr 19 13:53:01 2006
@@ -113,7 +113,7 @@
Roller roller = RollerFactory.getRoller();
WeblogManager weblogMgr = roller.getWeblogManager();
- WeblogEntryData entry = weblogMgr.retrieveWeblogEntry(postid);
+ WeblogEntryData entry = weblogMgr.getWeblogEntry(postid);
validate(entry.getWebsite().getHandle(), userid,password);
@@ -157,8 +157,11 @@
entry.setCategory(cd);
}
- entry.save();
- roller.commit();
+ // save the entry
+ weblogMgr.saveWeblogEntry(entry);
+ roller.flush();
+
+ // notify cache
flushPageCache(entry.getWebsite());
// TODO: Roller timestamps need better than 1 second accuracy
@@ -225,7 +228,7 @@
try {
Roller roller = RollerFactory.getRoller();
WeblogManager weblogMgr = roller.getWeblogManager();
- UserData user = roller.getUserManager().getUser(userid);
+ UserData user = roller.getUserManager().getUserByUsername(userid);
Timestamp current =
new Timestamp(System.currentTimeMillis());
@@ -253,8 +256,11 @@
entry.setCategory(website.getBloggerCategory());
}
- entry.save();
- roller.commit();
+ // save the entry
+ weblogMgr.saveWeblogEntry(entry);
+ roller.flush();
+
+ // notify cache
flushPageCache(entry.getWebsite());
// TODO: Roller timestamps need better than 1 second accuracy
@@ -287,7 +293,7 @@
Roller roller = RollerFactory.getRoller();
WeblogManager weblogMgr = roller.getWeblogManager();
- WeblogEntryData entry = weblogMgr.retrieveWeblogEntry(postid);
+ WeblogEntryData entry = weblogMgr.getWeblogEntry(postid);
validate(entry.getWebsite().getHandle(), userid,password);
Modified: incubator/roller/trunk/testdata/WEB-INF/classes/hibernate.cfg.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/testdata/WEB-INF/classes/hibernate.cfg.xml?rev=395393&r1=395392&r2=395393&view=diff
==============================================================================
--- incubator/roller/trunk/testdata/WEB-INF/classes/hibernate.cfg.xml (original)
+++ incubator/roller/trunk/testdata/WEB-INF/classes/hibernate.cfg.xml Wed Apr 19 13:53:01 2006
@@ -10,6 +10,10 @@
<property name="connection.datasource">java:comp/env/jdbc/rollerdb</property>
<property name="dialect">org.hibernate.dialect.MySQLDialect</property>
-->
+
+ <!-- use thread local Session context -->
+ <property name="hibernate.current_session_context_class">thread</property>
+
<!--
If you want to use HSQLDB, PostgreSQL, DB2 or Derby, Oracle then use the right dialect
<property name="dialect">org.hibernate.dialect.HQLDBDialect</property>
@@ -42,7 +46,6 @@
<property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property>
-->
- <mapping resource="org/roller/business/HitCountData.hbm.xml" />
<mapping resource="org/roller/pojos/BookmarkData.hbm.xml" />
<mapping resource="org/roller/pojos/CommentData.hbm.xml" />
<mapping resource="org/roller/pojos/EntryAttributeData.hbm.xml" />
Modified: incubator/roller/trunk/testdata/WEB-INF/classes/log4j.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/testdata/WEB-INF/classes/log4j.properties?rev=395393&r1=395392&r2=395393&view=diff
==============================================================================
--- incubator/roller/trunk/testdata/WEB-INF/classes/log4j.properties (original)
+++ incubator/roller/trunk/testdata/WEB-INF/classes/log4j.properties Wed Apr 19 13:53:01 2006
@@ -1,57 +1,28 @@
# Properties for configuring Log4j for this application
# This is the configuring for logging displayed in the Application Server
-# log4j.rootCategory=INFO, stdout, R, mail
-log4j.rootCategory=INFO, stdout
+log4j.rootCategory=INFO, roller
+# log to console
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-
-# Pattern to output the caller's file name and line number.
-#log4j.appender.stdout.layout.ConversionPattern=%p [%t] [%c] %C{1}.%M(%L) | %m%n
log4j.appender.stdout.layout.ConversionPattern=%-5p %d{yyyy-MM-dd HH:mm:ss,SSS} | %C{1}:%M | %m%n
-log4j.appender.R=org.apache.log4j.RollingFileAppender
-log4j.appender.R.File=${catalina.base}/logs/roller.log
-
-# Keep two 1MB log backup files
-log4j.appender.R.MaxFileSize=1MB
-log4j.appender.R.MaxBackupIndex=2
-
-log4j.appender.R.layout=org.apache.log4j.PatternLayout
-#log4j.appender.R.layout.ConversionPattern=%5p %t %c - %m%n
-log4j.appender.R.layout.ConversionPattern=%-5p %d{yyyy-MM-dd HH:mm:ss,SSS} %C{1}:%M - %m%n
-
-# If programmed properly the most messages would be at DEBUG
-# and the least at FATAL.
-
-# Options are: DEBUG, INFO, WARN, ERROR, FATAL
-log4j.category.org.roller=ERROR
-log4j.category.com.ecyrd.jspwiki=ERROR
-log4j.category.com.opensymphony.oscache=ERROR
-log4j.category.org.hibernate=ERROR
-log4j.category.org.roller.business.utils=ERROR
-log4j.category.org.apache.struts=ERROR
-log4j.category.org.tuckey.web.filters.urlrewrite=DEBUG
-
-#log4j.category.org.roller.presentation.MainPageAction=DEBUG
-#log4j.category.org.roller.presentation.pagecache.rollercache.LRUCacheHandler=DEBUG
-#log4j.category.org.roller.presentation.filters.IfModifiedFilter=DEBUG
-#log4j.category.org.roller.persistence.hibernate.HibernateStrategy=DEBUG
-
-# Tomcat's ClientAbortExceptions cause Velocity to talk way
-# too much so by default Velocity is set to STFU mode.
-log4j.category.org.apache.velocity=FATAL
-
-# Configuration for receiving e-mails when ERROR messages occur.
-#log4j.appender.mail=org.apache.log4j.net.SMTPAppender
-#log4j.appender.mail.To=you@yours.com
-#log4j.appender.mail.From=you@yours.com
-#log4j.appender.mail.SMTPHost=127.0.0.1
-#log4j.appender.mail.Threshold=ERROR
-#log4j.appender.mail.BufferSize=1
-#log4j.appender.mail.Subject=Roller Exception
-
-#log4j.appender.mail.layout=org.apache.log4j.PatternLayout
-#log4j.appender.mail.layout.ConversionPattern=%p [%d{yyyy-MM-dd HH:mm:ss,SSS}] %C{1}.%M(%L) | %m%n
-
-
+# log to file
+log4j.appender.roller=org.apache.log4j.FileAppender
+log4j.appender.roller.File=${user.dir}/logs/roller-test.log
+log4j.appender.roller.layout=org.apache.log4j.PatternLayout
+log4j.appender.roller.layout.ConversionPattern=%-5p %d{yyyy-MM-dd HH:mm:ss,SSS} %C{1}:%M - %m%n
+
+# logging levels
+log4j.category.org.roller=INFO
+log4j.category.org.roller.business.FileManagerTest=DEBUG
+log4j.category.org.roller.business.PermissionTest=DEBUG
+log4j.category.org.roller.business.PingsTest=DEBUG
+log4j.category.org.roller.business.PropertiesTest=DEBUG
+log4j.category.org.roller.business.UserTest=DEBUG
+log4j.category.org.roller.business.WeblogEntryTest=DEBUG
+log4j.category.org.roller.business.WeblogPageTest=DEBUG
+log4j.category.org.roller.business.WeblogTest=DEBUG
+log4j.category.org.hibernate=WARN
+log4j.category.org.apache.struts=WARN
+log4j.category.org.apache.velocity=WARN
Modified: incubator/roller/trunk/tests/org/roller/RollerTestBase.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/tests/org/roller/RollerTestBase.java?rev=395393&r1=395392&r2=395393&view=diff
==============================================================================
--- incubator/roller/trunk/tests/org/roller/RollerTestBase.java (original)
+++ incubator/roller/trunk/tests/org/roller/RollerTestBase.java Wed Apr 19 13:53:01 2006
@@ -111,7 +111,7 @@
String FS = File.separator;
RollerConfig.setContextRealPath(".." + FS + "roller");
RollerConfig.setUploadsDir("." + FS + "roller_dat" + FS + "uploads");
- getRoller().begin(UserData.SYSTEM_USER);
+
mUser = createUser(
testUsername,
"password",
@@ -119,32 +119,25 @@
"testuser@example.com");
UserManager umgr = getRoller().getUserManager();
mWebsite = (WebsiteData)umgr.getWebsites(mUser, null, null).get(0);
- getRoller().commit();
- getRoller().begin(UserData.SYSTEM_USER);
PropertiesManager propmgr = getRoller().getPropertiesManager();
Map props = propmgr.getProperties();
RollerPropertyData prop =
(RollerPropertyData)props.get("site.absoluteurl");
prop.setValue("http://localhost:8080/roller");
- propmgr.store(props);
- getRoller().commit();
+ propmgr.saveProperties(props);
- getRoller().begin(UserData.SYSTEM_USER);
PlanetManager planet = getRoller().getPlanetManager();
PlanetConfigData config = config = new PlanetConfigData();
config.setCacheDir("");
config.setTitle("Test");
config.setAdminEmail("admin@example.com");
planet.saveConfiguration(config);
- getRoller().commit();
- getRoller().begin(UserData.SYSTEM_USER);
PlanetGroupData group = new PlanetGroupData();
group.setHandle("external");
group.setTitle("external");
planet.saveGroup(group);
- getRoller().commit();
}
//-----------------------------------------------------------------------
@@ -168,10 +161,31 @@
Boolean.TRUE);
umgr.addUser(ud);
- // Create website for user with those pages
- WebsiteData website = umgr.createWebsite(
- ud, new HashMap(), username, username, username,"dummy@example.com",
- "basic","en_US_WIN", "America/Los_Angeles");
+ WebsiteData website = new WebsiteData(
+ null, // id
+ username, // name
+ username, // handle
+ username, // description
+ ud, // userId
+ "dummy", // defaultPageId
+ "dummy", // weblogDayPageId
+ Boolean.TRUE, // enableBloggerApi
+ null, // bloggerCategory
+ null, // defaultCategory
+ "editor-text.jsp", // editorPage
+ "", // blacklist
+ Boolean.TRUE, // allowComments
+ Boolean.FALSE, // emailComments
+ "", // emailFromAddress
+ Boolean.TRUE, // isEnabled
+ "dummy@example.com", // emailAddress
+ new Date(), // dateCreated
+ Boolean.TRUE, // defaultAllowComments
+ 0, // defaultCommentDays
+ Boolean.FALSE); // moderateComments
+ website.setEditorTheme("basic");
+ website.setLocale("en_US_WIN");
+ website.setTimeZone("America/Los_Angeles");
ThemeManager themeMgr = getRoller().getThemeManager();
Theme usersTheme = themeMgr.getTheme(website.getEditorTheme());
@@ -188,7 +202,6 @@
// Loop to create weblogs
for (int i=0; i<mBlogCount; i++) {
- getRoller().begin(UserData.SYSTEM_USER);
UserData ud = createUser(
"testuser"+i, // userName
@@ -208,11 +221,10 @@
mCalendar.setTime(new Date());
// create categories
- website = umgr.retrieveWebsite(website.getId());
+ website = umgr.getWebsite(website.getId());
WeblogCategoryData rootCat = wmgr.getRootWeblogCategory(website);
createCategoryPostsAndComments(0, wmgr, ud, website, rootCat);
- getRoller().commit();
}
// commit all the objects
@@ -245,7 +257,7 @@
day, // pubTime
day, // updateTime
WeblogEntryData.PUBLISHED ); // publishEntry
- wd.save();
+ wmgr.saveWeblogEntry(wd);
// roll calendar back to today
mCalendar.roll(Calendar.DATE, false);
@@ -272,7 +284,7 @@
day, // pubTime
day, // updateTime
status ); // publishEntry
- wd.save();
+ wmgr.saveWeblogEntry(wd);
// add at beginning of list
mEntriesCreated.add(0, wd);
@@ -294,7 +306,7 @@
comment.setPending(Boolean.FALSE);
comment.setSpam(Boolean.FALSE);
comment.setNotify(Boolean.FALSE);
- comment.save();
+ wmgr.saveComment(comment);
mCommentsCreated.add(comment);
mLogger.debug(" Created comment ["
+comment.getId()+"]"+ comment.getName());
@@ -305,13 +317,14 @@
// create categories under the category passed in
for ( int j=0; j<mCatCount; j++ ) {
- WeblogCategoryData cat = wmgr.createWeblogCategory(
+ WeblogCategoryData cat = new WeblogCategoryData(
+ null, // id
website, // website
rootCat, // parent
rootCat.getName()+"-cat"+j, // name
"desc", // description
null ); // image
- cat.save();
+ wmgr.saveWeblogCategory(cat);
mCategoriesCreated.add(cat);
mLogger.debug(" Created cat ["+cat.getId()+"]"+cat.getName());
@@ -324,20 +337,20 @@
//-----------------------------------------------------------------------
/** Tear down weblogs created in setupTestWeblogs() */
public void tearDownTestWeblogs() throws Exception {
- getRoller().begin(UserData.SYSTEM_USER);
UserManager umgr = getRoller().getUserManager();
for (Iterator siteIter = mWebsitesCreated.iterator(); siteIter.hasNext();) {
WebsiteData site = (WebsiteData) siteIter.next();
- site = umgr.retrieveWebsite(site.getId());
- if (site != null) site.remove();
+ site = umgr.getWebsite(site.getId());
+ if (site != null) {
+ umgr.removeWebsite(site);
+ }
}
for (Iterator userIter = mUsersCreated.iterator(); userIter.hasNext();) {
UserData user = (UserData) userIter.next();
- user = umgr.retrieveUser(user.getId());
- if (user != null) user.remove();
+ user = umgr.getUser(user.getId());
+ if (user != null) umgr.removeUser(user);
}
- getRoller().commit();
}
//------------------------------------------------------------------------
@@ -351,13 +364,10 @@
*/
public void tearDown() throws Exception {
try {
- getRoller().begin(UserData.SYSTEM_USER);
PlanetManager planet = getRoller().getPlanetManager();
PlanetConfigData config = planet.getConfiguration();
PlanetGroupData group = planet.getGroup("external");
- group.remove();
- config.remove();
- getRoller().commit();
+ planet.deleteGroup(group);
deleteWebsite(testUsername);
} catch (RollerException e) {
@@ -373,17 +383,15 @@
*/
private void deleteWebsite(String deleteMe) throws RollerException {
mLogger.debug("try to delete " + deleteMe);
- getRoller().begin(UserData.SYSTEM_USER);
UserManager umgr = getRoller().getUserManager();
- UserData user = umgr.getUser(deleteMe);
+ UserData user = umgr.getUserByUsername(deleteMe);
WebsiteData website = (WebsiteData)umgr.getWebsites(user, null, null).get(0);
- website.remove();
+ umgr.removeWebsite(website);
- user.remove();
+ umgr.removeUser(user);
- getRoller().commit();
}
//------------------------------------------------------------------------