Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargetAdd.java URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargetAdd.java?view=diff&rev=566200&r1=566199&r2=566200 ============================================================================== --- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargetAdd.java (original) +++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargetAdd.java Wed Aug 15 07:43:47 2007 @@ -11,7 +11,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.roller.weblogger.pojos.WeblogPermission; +import org.apache.roller.weblogger.pojos.WeblogUserPermission; import org.apache.roller.weblogger.pojos.PingTarget; import org.apache.roller.weblogger.ui.struts2.common.PingTargetAddBase; @@ -33,7 +33,7 @@ // admin perms required public short requiredWeblogPermission() { - return WeblogPermission.ADMIN; + return WeblogUserPermission.ADMIN; }
Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargetEdit.java URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargetEdit.java?view=diff&rev=566200&r1=566199&r2=566200 ============================================================================== --- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargetEdit.java (original) +++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargetEdit.java Wed Aug 15 07:43:47 2007 @@ -20,7 +20,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.roller.weblogger.pojos.WeblogPermission; +import org.apache.roller.weblogger.pojos.WeblogUserPermission; import org.apache.roller.weblogger.ui.struts2.common.PingTargetEditBase; @@ -41,7 +41,7 @@ // admin perms required public short requiredWeblogPermissions() { - return WeblogPermission.ADMIN; + return WeblogUserPermission.ADMIN; } Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargets.java URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargets.java?view=diff&rev=566200&r1=566199&r2=566200 ============================================================================== --- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargets.java (original) +++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargets.java Wed Aug 15 07:43:47 2007 @@ -24,7 +24,7 @@ import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.business.pings.PingTargetManager; import org.apache.roller.weblogger.config.PingConfig; -import org.apache.roller.weblogger.pojos.WeblogPermission; +import org.apache.roller.weblogger.pojos.WeblogUserPermission; import org.apache.roller.weblogger.ui.struts2.common.PingTargetsBase; @@ -49,7 +49,7 @@ } public short requiredWeblogPermissions() { - return WeblogPermission.ADMIN; + return WeblogUserPermission.ADMIN; } Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java?view=diff&rev=566200&r1=566199&r2=566200 ============================================================================== --- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java (original) +++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java Wed Aug 15 07:43:47 2007 @@ -30,7 +30,7 @@ import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.business.WeblogManager; import org.apache.roller.weblogger.pojos.WeblogCategory; -import org.apache.roller.weblogger.pojos.WeblogPermission; +import org.apache.roller.weblogger.pojos.WeblogUserPermission; import org.apache.roller.weblogger.pojos.WeblogEntry; import org.apache.roller.weblogger.ui.struts2.pagers.EntriesPager; import org.apache.roller.weblogger.ui.struts2.util.KeyValueObject; @@ -69,7 +69,7 @@ @Override public short requiredWeblogPermissions() { - return WeblogPermission.AUTHOR; + return WeblogUserPermission.AUTHOR; } Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java?view=diff&rev=566200&r1=566199&r2=566200 ============================================================================== --- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java (original) +++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java Wed Aug 15 07:43:47 2007 @@ -27,7 +27,7 @@ import org.apache.roller.weblogger.WebloggerException; import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.business.WeblogManager; -import org.apache.roller.weblogger.pojos.WeblogPermission; +import org.apache.roller.weblogger.pojos.WeblogUserPermission; import org.apache.roller.weblogger.pojos.WeblogEntry; import org.apache.roller.weblogger.util.MediacastException; import org.apache.roller.weblogger.util.cache.CacheManager; @@ -59,7 +59,7 @@ @Override public short requiredWeblogPermissions() { - return WeblogPermission.LIMITED; + return WeblogUserPermission.LIMITED; } @@ -72,7 +72,7 @@ public String execute() { // if user is an author then post status defaults to PUBLISHED, otherwise PENDING - if(getActionWeblog().hasUserPermissions(getAuthenticatedUser(),WeblogPermission.AUTHOR)) { + if(getActionWeblog().hasUserPermissions(getAuthenticatedUser(),WeblogUserPermission.AUTHOR)) { getBean().setStatus(WeblogEntry.PUBLISHED); } else { getBean().setStatus(WeblogEntry.PENDING); @@ -123,7 +123,7 @@ } // if user does not have author perms then force PENDING status - if(!getActionWeblog().hasUserPermissions(getAuthenticatedUser(),WeblogPermission.AUTHOR)) { + if(!getActionWeblog().hasUserPermissions(getAuthenticatedUser(),WeblogUserPermission.AUTHOR)) { entry.setStatus(WeblogEntry.PENDING); } } Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java?view=diff&rev=566200&r1=566199&r2=566200 ============================================================================== --- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java (original) +++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java Wed Aug 15 07:43:47 2007 @@ -29,7 +29,7 @@ import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin; import org.apache.roller.weblogger.business.search.IndexManager; -import org.apache.roller.weblogger.pojos.WeblogPermission; +import org.apache.roller.weblogger.pojos.WeblogUserPermission; import org.apache.roller.weblogger.pojos.WeblogEntry; import org.apache.roller.weblogger.ui.core.RollerContext; import org.apache.roller.weblogger.ui.core.plugins.UIPluginManager; @@ -202,7 +202,7 @@ public boolean isUserAnAuthor() { - return getActionWeblog().hasUserPermissions(getAuthenticatedUser(),WeblogPermission.AUTHOR); + return getActionWeblog().hasUserPermissions(getAuthenticatedUser(),WeblogUserPermission.AUTHOR); } Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java?view=diff&rev=566200&r1=566199&r2=566200 ============================================================================== --- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java (original) +++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java Wed Aug 15 07:43:47 2007 @@ -31,7 +31,7 @@ import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.business.WeblogManager; import org.apache.roller.weblogger.pojos.WeblogCategory; -import org.apache.roller.weblogger.pojos.WeblogPermission; +import org.apache.roller.weblogger.pojos.WeblogUserPermission; import org.apache.roller.weblogger.pojos.WeblogEntry; import org.apache.roller.weblogger.util.cache.CacheManager; import org.apache.roller.weblogger.util.MailUtil; @@ -71,7 +71,7 @@ @Override public short requiredWeblogPermissions() { - return WeblogPermission.LIMITED; + return WeblogUserPermission.LIMITED; } @@ -143,7 +143,7 @@ } // if user does not have author perms then force PENDING status - if(!getActionWeblog().hasUserPermissions(getAuthenticatedUser(),WeblogPermission.AUTHOR)) { + if(!getActionWeblog().hasUserPermissions(getAuthenticatedUser(),WeblogUserPermission.AUTHOR)) { entry.setStatus(WeblogEntry.PENDING); } } Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java?view=diff&rev=566200&r1=566199&r2=566200 ============================================================================== --- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java (original) +++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java Wed Aug 15 07:43:47 2007 @@ -25,7 +25,7 @@ import org.apache.roller.weblogger.business.BookmarkManager; import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder; -import org.apache.roller.weblogger.pojos.WeblogPermission; +import org.apache.roller.weblogger.pojos.WeblogUserPermission; import org.apache.roller.weblogger.ui.struts2.util.UIAction; import org.apache.roller.weblogger.util.cache.CacheManager; import org.apache.struts2.interceptor.validation.SkipValidation; @@ -56,7 +56,7 @@ public short requiredWeblogPermissions() { - return WeblogPermission.ADMIN; + return WeblogUserPermission.ADMIN; } Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java?view=diff&rev=566200&r1=566199&r2=566200 ============================================================================== --- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java (original) +++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java Wed Aug 15 07:43:47 2007 @@ -25,7 +25,7 @@ import org.apache.roller.weblogger.business.BookmarkManager; import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder; -import org.apache.roller.weblogger.pojos.WeblogPermission; +import org.apache.roller.weblogger.pojos.WeblogUserPermission; import org.apache.roller.weblogger.ui.struts2.util.UIAction; import org.apache.roller.weblogger.util.cache.CacheManager; import org.apache.struts2.interceptor.validation.SkipValidation; @@ -54,7 +54,7 @@ // author perms required public short requiredWeblogPermissions() { - return WeblogPermission.AUTHOR; + return WeblogUserPermission.AUTHOR; } Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java?view=diff&rev=566200&r1=566199&r2=566200 ============================================================================== --- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java (original) +++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java Wed Aug 15 07:43:47 2007 @@ -24,7 +24,7 @@ import org.apache.roller.weblogger.business.search.IndexManager; import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.business.UserManager; -import org.apache.roller.weblogger.pojos.WeblogPermission; +import org.apache.roller.weblogger.pojos.WeblogUserPermission; import org.apache.roller.weblogger.pojos.Weblog; import org.apache.roller.weblogger.ui.struts2.util.UIAction; import org.apache.roller.weblogger.util.cache.CacheManager; @@ -48,7 +48,7 @@ // admin perms required public short requiredWeblogPermissions() { - return WeblogPermission.ADMIN; + return WeblogUserPermission.ADMIN; } Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java?view=diff&rev=566200&r1=566199&r2=566200 ============================================================================== --- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java (original) +++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java Wed Aug 15 07:43:47 2007 @@ -26,7 +26,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.business.UserManager; -import org.apache.roller.weblogger.pojos.WeblogPermission; +import org.apache.roller.weblogger.pojos.WeblogUserPermission; import org.apache.roller.weblogger.pojos.User; import org.apache.roller.weblogger.ui.struts2.util.UIAction; import org.apache.struts2.interceptor.ParameterAware; @@ -57,7 +57,7 @@ // admin perms required public short requiredWeblogPermissions() { - return WeblogPermission.ADMIN; + return WeblogUserPermission.ADMIN; } @@ -75,19 +75,19 @@ UserManager userMgr = WebloggerFactory.getWeblogger().getUserManager(); - List<WeblogPermission> permissions = getActionWeblog().getPermissions(); + List<WeblogUserPermission> permissions = getActionWeblog().getPermissions(); // we have to copy the permissions list so that when we remove permissions // below we don't get ConcurrentModificationExceptions - List<WeblogPermission> permsList = new ArrayList(); - for( WeblogPermission perm : permissions ) { + List<WeblogUserPermission> permsList = new ArrayList(); + for( WeblogUserPermission perm : permissions ) { permsList.add(perm); } int removed = 0; int changed = 0; try { - for( WeblogPermission perms : permsList ) { + for( WeblogUserPermission perms : permsList ) { String sval = getParameter("perm-" + perms.getId()); if (sval != null) { Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java?view=diff&rev=566200&r1=566199&r2=566200 ============================================================================== --- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java (original) +++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java Wed Aug 15 07:43:47 2007 @@ -24,7 +24,7 @@ import org.apache.roller.weblogger.config.WebloggerConfig; import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.business.UserManager; -import org.apache.roller.weblogger.pojos.WeblogPermission; +import org.apache.roller.weblogger.pojos.WeblogUserPermission; import org.apache.roller.weblogger.pojos.User; import org.apache.roller.weblogger.ui.struts2.util.UIAction; import org.apache.roller.weblogger.util.MailUtil; @@ -55,7 +55,7 @@ // admin perms required public short requiredWeblogPermissions() { - return WeblogPermission.ADMIN; + return WeblogUserPermission.ADMIN; } @@ -110,7 +110,7 @@ // check for existing permissions or invitation try { - WeblogPermission perms = umgr.getPermissions(getActionWeblog(), user); + WeblogUserPermission perms = umgr.getPermissions(getActionWeblog(), user); if (perms != null && perms.isPending()) { addError("inviteMember.error.userAlreadyInvited"); Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java?view=diff&rev=566200&r1=566199&r2=566200 ============================================================================== --- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java (original) +++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java Wed Aug 15 07:43:47 2007 @@ -37,7 +37,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.roller.weblogger.pojos.WeblogPermission; +import org.apache.roller.weblogger.pojos.WeblogUserPermission; import org.apache.roller.weblogger.ui.struts2.util.UIAction; @@ -73,7 +73,7 @@ // admin perms required public short requireWeblogPermissions() { - return WeblogPermission.ADMIN; + return WeblogUserPermission.ADMIN; } Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Referrers.java URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Referrers.java?view=diff&rev=566200&r1=566199&r2=566200 ============================================================================== --- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Referrers.java (original) +++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Referrers.java Wed Aug 15 07:43:47 2007 @@ -24,7 +24,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.roller.weblogger.business.referrers.RefererManager; import org.apache.roller.weblogger.business.WebloggerFactory; -import org.apache.roller.weblogger.pojos.WeblogPermission; +import org.apache.roller.weblogger.pojos.WeblogUserPermission; import org.apache.roller.weblogger.pojos.WeblogReferrer; import org.apache.roller.weblogger.ui.struts2.util.UIAction; import org.apache.roller.weblogger.util.cache.CacheManager; @@ -56,7 +56,7 @@ @Override public short requiredWeblogPermissions() { - return WeblogPermission.ADMIN; + return WeblogUserPermission.ADMIN; } Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Resources.java URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Resources.java?view=diff&rev=566200&r1=566199&r2=566200 ============================================================================== --- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Resources.java (original) +++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Resources.java Wed Aug 15 07:43:47 2007 @@ -33,7 +33,7 @@ import org.apache.roller.weblogger.business.FileManager; import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.config.WebloggerRuntimeConfig; -import org.apache.roller.weblogger.pojos.WeblogPermission; +import org.apache.roller.weblogger.pojos.WeblogUserPermission; import org.apache.roller.weblogger.pojos.ThemeResource; import org.apache.roller.weblogger.ui.struts2.util.UIAction; @@ -82,7 +82,7 @@ // requires author role public short requiredWeblogPermissions() { - return WeblogPermission.AUTHOR; + return WeblogUserPermission.AUTHOR; } Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java?view=diff&rev=566200&r1=566199&r2=566200 ============================================================================== --- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java (original) +++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java Wed Aug 15 07:43:47 2007 @@ -27,7 +27,7 @@ import org.apache.roller.weblogger.business.themes.ThemeManager; import org.apache.roller.weblogger.pojos.Theme; import org.apache.roller.weblogger.pojos.ThemeTemplate; -import org.apache.roller.weblogger.pojos.WeblogPermission; +import org.apache.roller.weblogger.pojos.WeblogUserPermission; import org.apache.roller.weblogger.pojos.WeblogTemplate; import org.apache.roller.weblogger.pojos.WeblogTheme; import org.apache.roller.weblogger.ui.struts2.util.UIAction; @@ -57,7 +57,7 @@ @Override public short requiredWeblogPermissions() { - return WeblogPermission.ADMIN; + return WeblogUserPermission.ADMIN; } Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java?view=diff&rev=566200&r1=566199&r2=566200 ============================================================================== --- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java (original) +++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java Wed Aug 15 07:43:47 2007 @@ -28,7 +28,7 @@ import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.business.UserManager; import org.apache.roller.weblogger.config.WebloggerConfig; -import org.apache.roller.weblogger.pojos.WeblogPermission; +import org.apache.roller.weblogger.pojos.WeblogUserPermission; import org.apache.roller.weblogger.pojos.WeblogTemplate; import org.apache.roller.weblogger.ui.struts2.util.UIAction; import org.apache.roller.weblogger.util.Utilities; @@ -59,7 +59,7 @@ @Override public short requiredWeblogPermissions() { - return WeblogPermission.ADMIN; + return WeblogUserPermission.ADMIN; } Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java?view=diff&rev=566200&r1=566199&r2=566200 ============================================================================== --- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java (original) +++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java Wed Aug 15 07:43:47 2007 @@ -23,7 +23,7 @@ import org.apache.roller.weblogger.WebloggerException; import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.business.UserManager; -import org.apache.roller.weblogger.pojos.WeblogPermission; +import org.apache.roller.weblogger.pojos.WeblogUserPermission; import org.apache.roller.weblogger.pojos.WeblogTemplate; import org.apache.roller.weblogger.ui.struts2.util.UIAction; import org.apache.roller.weblogger.util.cache.CacheManager; @@ -52,7 +52,7 @@ // must be a weblog admin to use this action public short requiredWeblogPermissions() { - return WeblogPermission.ADMIN; + return WeblogUserPermission.ADMIN; } Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java?view=diff&rev=566200&r1=566199&r2=566200 ============================================================================== --- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java (original) +++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java Wed Aug 15 07:43:47 2007 @@ -28,7 +28,7 @@ import org.apache.roller.weblogger.WebloggerException; import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.business.UserManager; -import org.apache.roller.weblogger.pojos.WeblogPermission; +import org.apache.roller.weblogger.pojos.WeblogUserPermission; import org.apache.roller.weblogger.pojos.WeblogTemplate; import org.apache.roller.weblogger.pojos.WeblogTheme; import org.apache.roller.weblogger.ui.struts2.util.UIAction; @@ -60,7 +60,7 @@ public short requiredWeblogPermissions() { - return WeblogPermission.ADMIN; + return WeblogUserPermission.ADMIN; } Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java?view=diff&rev=566200&r1=566199&r2=566200 ============================================================================== --- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java (original) +++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java Wed Aug 15 07:43:47 2007 @@ -29,7 +29,7 @@ import org.apache.roller.weblogger.business.themes.SharedTheme; import org.apache.roller.weblogger.business.themes.ThemeManager; import org.apache.roller.weblogger.config.WebloggerRuntimeConfig; -import org.apache.roller.weblogger.pojos.WeblogPermission; +import org.apache.roller.weblogger.pojos.WeblogUserPermission; import org.apache.roller.weblogger.pojos.Theme; import org.apache.roller.weblogger.pojos.WeblogTheme; import org.apache.roller.weblogger.pojos.Weblog; @@ -69,7 +69,7 @@ public short requiredWeblogPermissions() { - return WeblogPermission.ADMIN; + return WeblogUserPermission.ADMIN; } Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java?view=diff&rev=566200&r1=566199&r2=566200 ============================================================================== --- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java (original) +++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java Wed Aug 15 07:43:47 2007 @@ -31,7 +31,7 @@ import org.apache.roller.weblogger.business.UserManager; import org.apache.roller.weblogger.business.WeblogManager; import org.apache.roller.weblogger.config.WebloggerRuntimeConfig; -import org.apache.roller.weblogger.pojos.WeblogPermission; +import org.apache.roller.weblogger.pojos.WeblogUserPermission; import org.apache.roller.weblogger.pojos.Weblog; import org.apache.roller.weblogger.ui.core.RollerContext; import org.apache.roller.weblogger.ui.core.plugins.UIPluginManager; @@ -70,7 +70,7 @@ // admin perms required public short requiredWeblogPermissions() { - return WeblogPermission.ADMIN; + return WeblogUserPermission.ADMIN; } Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java?view=diff&rev=566200&r1=566199&r2=566200 ============================================================================== --- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java (original) +++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java Wed Aug 15 07:43:47 2007 @@ -22,7 +22,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.business.UserManager; -import org.apache.roller.weblogger.pojos.WeblogPermission; +import org.apache.roller.weblogger.pojos.WeblogUserPermission; import org.apache.roller.weblogger.ui.struts2.util.UIAction; import org.apache.roller.weblogger.util.cache.CacheManager; @@ -44,7 +44,7 @@ // admin perms required public short requiredWeblogPermissions() { - return WeblogPermission.ADMIN; + return WeblogUserPermission.ADMIN; } Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java?view=diff&rev=566200&r1=566199&r2=566200 ============================================================================== --- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java (original) +++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java Wed Aug 15 07:43:47 2007 @@ -45,7 +45,7 @@ import org.apache.roller.weblogger.business.startup.WebloggerStartup; import org.apache.roller.weblogger.config.WebloggerConfig; import org.apache.roller.weblogger.config.WebloggerRuntimeConfig; -import org.apache.roller.weblogger.pojos.WeblogPermission; +import org.apache.roller.weblogger.pojos.WeblogUserPermission; import org.apache.roller.weblogger.pojos.User; import org.apache.roller.weblogger.pojos.WeblogEntry; import org.apache.roller.weblogger.pojos.Weblog; @@ -105,7 +105,7 @@ User websiteUser = (User)websiteUserIter.next(); if (entry.getWebsite().hasUserPermissions( - websiteUser,WeblogPermission.AUTHOR) + websiteUser,WeblogUserPermission.AUTHOR) && websiteUser.getEmailAddress() != null) { reviewers.add(websiteUser.getEmailAddress()); } Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java?view=diff&rev=566200&r1=566199&r2=566200 ============================================================================== --- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java (original) +++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java Wed Aug 15 07:43:47 2007 @@ -28,7 +28,7 @@ import org.jdom.JDOMException; import org.apache.roller.weblogger.WebloggerException; import org.apache.roller.weblogger.business.UserManager; -import org.apache.roller.weblogger.pojos.WeblogPermission; +import org.apache.roller.weblogger.pojos.WeblogUserPermission; import org.apache.roller.weblogger.pojos.User; import org.apache.roller.weblogger.pojos.Weblog; import org.apache.roller.weblogger.util.cache.CacheManager; @@ -145,11 +145,11 @@ User user = (User)i.next(); List permissions = getRoller().getUserManager().getAllPermissions(user); for (Iterator j = permissions.iterator(); j.hasNext(); ) { - WeblogPermission pd = (WeblogPermission)j.next(); + WeblogUserPermission pd = (WeblogUserPermission)j.next(); perms.add(pd); } } - EntrySet es = toMemberEntrySet((WeblogPermission[])perms.toArray(new WeblogPermission[0])); + EntrySet es = toMemberEntrySet((WeblogUserPermission[])perms.toArray(new WeblogUserPermission[0])); return es; } catch (WebloggerException re) { throw new InternalException("ERROR: Could not get member collection", re); @@ -180,14 +180,14 @@ if (ud == null) { throw new NotFoundException("ERROR: Unknown user name: " + username); } - WeblogPermission pd = getRoller().getUserManager().getPermissions(wd, ud); + WeblogUserPermission pd = getRoller().getUserManager().getPermissions(wd, ud); if (pd == null) { throw new NotFoundException("ERROR: Could not get permissions for user name: " + username + ", handle: " + handle); } perms = Collections.singletonList(pd); } - EntrySet es = toMemberEntrySet((WeblogPermission[])perms.toArray(new WeblogPermission[0])); + EntrySet es = toMemberEntrySet((WeblogUserPermission[])perms.toArray(new WeblogUserPermission[0])); return es; } catch (WebloggerException re) { throw new InternalException("ERROR: Could not get entry for handle: " + handle + ", username: " + username, re); @@ -265,23 +265,23 @@ List permissionsDatas= new ArrayList(); for (int i = 0; i < c.getEntries().length; i++) { MemberEntry entry = (MemberEntry)c.getEntries()[i]; - WeblogPermission pd = toPermissionsData(entry); + WeblogUserPermission pd = toPermissionsData(entry); mgr.savePermissions(pd); getRoller().flush(); CacheManager.invalidate(pd.getUser()); CacheManager.invalidate(pd.getWebsite()); permissionsDatas.add(pd); } - return toMemberEntrySet((WeblogPermission[])permissionsDatas.toArray(new WeblogPermission[0])); + return toMemberEntrySet((WeblogUserPermission[])permissionsDatas.toArray(new WeblogUserPermission[0])); } catch (WebloggerException re) { throw new InternalException("ERROR: Could not create members", re); } } - private WeblogPermission toPermissionsData(MemberEntry entry) throws HandlerException { + private WeblogUserPermission toPermissionsData(MemberEntry entry) throws HandlerException { User ud = getUserData(entry.getName()); Weblog wd = getWebsiteData(entry.getHandle()); - WeblogPermission pd = new WeblogPermission(); + WeblogUserPermission pd = new WeblogUserPermission(); pd.setUser(ud); pd.setWebsite(wd); pd.setPermissionMask(stringToMask(entry.getPermission())); @@ -290,15 +290,15 @@ return pd; } - private WeblogPermission getPermissionsData(MemberEntry entry) throws HandlerException { + private WeblogUserPermission getPermissionsData(MemberEntry entry) throws HandlerException { return getPermissionsData(entry.getHandle(), entry.getName()); } - private WeblogPermission getPermissionsData(String handle, String username) throws HandlerException { + private WeblogUserPermission getPermissionsData(String handle, String username) throws HandlerException { try { User ud = getUserData(username); Weblog wd = getWebsiteData(handle); - WeblogPermission pd = getRoller().getUserManager().getPermissions(wd, ud); + WeblogUserPermission pd = getRoller().getUserManager().getPermissions(wd, ud); return pd; } catch (WebloggerException re) { @@ -310,18 +310,18 @@ List permissionsDatas= new ArrayList(); for (int i = 0; i < c.getEntries().length; i++) { MemberEntry entry = (MemberEntry)c.getEntries()[i]; - WeblogPermission pd = getPermissionsData(entry); + WeblogUserPermission pd = getPermissionsData(entry); if (pd == null) { throw new NotFoundException("ERROR: Permissions do not exist for weblog handle: " + entry.getHandle() + ", user name: " + entry.getName()); } updatePermissionsData(pd, entry); permissionsDatas.add(pd); } - return toMemberEntrySet((WeblogPermission[])permissionsDatas.toArray(new WeblogPermission[0])); + return toMemberEntrySet((WeblogUserPermission[])permissionsDatas.toArray(new WeblogUserPermission[0])); } - private void updatePermissionsData(WeblogPermission pd, MemberEntry entry) throws HandlerException { + private void updatePermissionsData(WeblogUserPermission pd, MemberEntry entry) throws HandlerException { // only permission can be updated if (entry.getPermission() != null) { @@ -353,12 +353,12 @@ } try { - WeblogPermission pd = getPermissionsData(handle, username); - WeblogPermission[] pds; + WeblogUserPermission pd = getPermissionsData(handle, username); + WeblogUserPermission[] pds; if (pd == null) { throw new NotFoundException("ERROR: Permissions do not exist for weblog handle: " + handle + ", user name: " + username); } - pds = new WeblogPermission[] { pd }; + pds = new WeblogUserPermission[] { pd }; UserManager mgr = getRoller().getUserManager(); mgr.removePermissions(pd); @@ -376,7 +376,7 @@ } } - private MemberEntry toMemberEntry(WeblogPermission pd) { + private MemberEntry toMemberEntry(WeblogUserPermission pd) { if (pd == null) { throw new NullPointerException("ERROR: Null permission data not allowed"); } @@ -385,14 +385,14 @@ return me; } - private MemberEntrySet toMemberEntrySet(WeblogPermission[] pds) { + private MemberEntrySet toMemberEntrySet(WeblogUserPermission[] pds) { if (pds == null) { throw new NullPointerException("ERROR: Null permission data not allowed"); } List entries = new ArrayList(); for (int i = 0; i < pds.length; i++) { - WeblogPermission pd = pds[i]; + WeblogUserPermission pd = pds[i]; Entry entry = toMemberEntry(pd); entries.add(entry); } @@ -403,13 +403,13 @@ } private static String maskToString(short mask) { - if (mask == WeblogPermission.ADMIN) { + if (mask == WeblogUserPermission.ADMIN) { return MemberEntry.Permissions.ADMIN; } - if (mask == WeblogPermission.AUTHOR) { + if (mask == WeblogUserPermission.AUTHOR) { return MemberEntry.Permissions.AUTHOR; } - if (mask == WeblogPermission.LIMITED) { + if (mask == WeblogUserPermission.LIMITED) { return MemberEntry.Permissions.LIMITED; } return null; @@ -421,13 +421,13 @@ throw new NullPointerException("ERROR: Null string not allowed"); } if (s.equalsIgnoreCase(MemberEntry.Permissions.ADMIN)) { - return WeblogPermission.ADMIN; + return WeblogUserPermission.ADMIN; } if (s.equalsIgnoreCase(MemberEntry.Permissions.AUTHOR)) { - return WeblogPermission.AUTHOR; + return WeblogUserPermission.AUTHOR; } if (s.equalsIgnoreCase(MemberEntry.Permissions.LIMITED)) { - return WeblogPermission.LIMITED; + return WeblogUserPermission.LIMITED; } return 0; } Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java?view=diff&rev=566200&r1=566199&r2=566200 ============================================================================== --- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java (original) +++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java Wed Aug 15 07:43:47 2007 @@ -33,7 +33,7 @@ import org.apache.roller.weblogger.WebloggerException; import org.apache.roller.weblogger.config.WebloggerRuntimeConfig; import org.apache.roller.weblogger.business.UserManager; -import org.apache.roller.weblogger.pojos.WeblogPermission; +import org.apache.roller.weblogger.pojos.WeblogUserPermission; import org.apache.roller.weblogger.pojos.User; import org.apache.roller.weblogger.pojos.Weblog; import org.apache.roller.weblogger.util.cache.CacheManager; @@ -314,7 +314,7 @@ User ud = uds[i]; List permissions = ud.getPermissions(); for (Iterator j = permissions.iterator(); j.hasNext(); ) { - WeblogPermission pd = (WeblogPermission)j.next(); + WeblogUserPermission pd = (WeblogUserPermission)j.next(); Weblog wd = pd.getWebsite(); WeblogEntry we = toWeblogEntry(wd); entries.add(we); Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java?view=diff&rev=566200&r1=566199&r2=566200 ============================================================================== --- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java (original) +++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java Wed Aug 15 07:43:47 2007 @@ -38,7 +38,7 @@ import org.apache.roller.weblogger.business.Weblogger; import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.pojos.User; -import org.apache.roller.weblogger.pojos.WeblogPermission; +import org.apache.roller.weblogger.pojos.WeblogUserPermission; import org.apache.roller.weblogger.pojos.WeblogCategory; import org.apache.roller.weblogger.pojos.WeblogEntry; import org.apache.roller.weblogger.pojos.Weblog; @@ -185,7 +185,7 @@ } if (perms != null) { for (Iterator iter=perms.iterator(); iter.hasNext();) { - WeblogPermission perm = (WeblogPermission)iter.next(); + WeblogUserPermission perm = (WeblogUserPermission)iter.next(); String handle = perm.getWebsite().getHandle(); // Create workspace to represent weblog @@ -941,7 +941,7 @@ */ private boolean canEdit(Weblog website) { try { - return website.hasUserPermissions(this.user,WeblogPermission.AUTHOR); + return website.hasUserPermissions(this.user,WeblogUserPermission.AUTHOR); } catch (Exception e) { log.error("Checking website.hasUserPermissions()"); } Modified: roller/branches/roller_usermanagement/apps/weblogger/src/sql/createdb.vm URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/sql/createdb.vm?view=diff&rev=566200&r1=566199&r2=566200 ============================================================================== --- roller/branches/roller_usermanagement/apps/weblogger/src/sql/createdb.vm (original) +++ roller/branches/roller_usermanagement/apps/weblogger/src/sql/createdb.vm Wed Aug 15 07:43:47 2007 @@ -33,6 +33,18 @@ create index ur_userid_idx on userrole( userid ); create index ur_username_idx on userrole( username$!db.INDEXSIZE ); +-- actions: comma separated list of actions permitted by permission +-- objectid: for now this will always store weblogid +-- objectType: for now this will always be 'Weblog' +create table roller_permission ( + id varchar(48) not null primary key, + username varchar(255) not null, + actions varchar(255) not null, + objectid varchar(48), + objectType varchar(255), + datecreated timestamp not null +); + -- User permissions within a website -- permission_mask: bitmask 000 limited, 001 author, 011 admin -- pending: pending user acceptance of invitation to join website Modified: roller/branches/roller_usermanagement/apps/weblogger/test/java/org/apache/roller/weblogger/TestUtils.java URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/test/java/org/apache/roller/weblogger/TestUtils.java?view=diff&rev=566200&r1=566199&r2=566200 ============================================================================== --- roller/branches/roller_usermanagement/apps/weblogger/test/java/org/apache/roller/weblogger/TestUtils.java (original) +++ roller/branches/roller_usermanagement/apps/weblogger/test/java/org/apache/roller/weblogger/TestUtils.java Wed Aug 15 07:43:47 2007 @@ -39,7 +39,7 @@ import org.apache.roller.weblogger.pojos.WeblogEntryComment; import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder; import org.apache.roller.weblogger.pojos.WeblogHitCount; -import org.apache.roller.weblogger.pojos.WeblogPermission; +import org.apache.roller.weblogger.pojos.WeblogUserPermission; import org.apache.roller.weblogger.pojos.PingTarget; import org.apache.roller.weblogger.pojos.User; import org.apache.roller.weblogger.pojos.WeblogCategory; @@ -220,7 +220,7 @@ // lookup the permissions UserManager mgr = WebloggerFactory.getWeblogger().getUserManager(); - WeblogPermission perm = mgr.getPermissions(id); + WeblogUserPermission perm = mgr.getPermissions(id); // remove the permissions mgr.removePermissions(perm); Modified: roller/branches/roller_usermanagement/apps/weblogger/test/java/org/apache/roller/weblogger/business/PermissionTest.java URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/test/java/org/apache/roller/weblogger/business/PermissionTest.java?view=diff&rev=566200&r1=566199&r2=566200 ============================================================================== --- roller/branches/roller_usermanagement/apps/weblogger/test/java/org/apache/roller/weblogger/business/PermissionTest.java (original) +++ roller/branches/roller_usermanagement/apps/weblogger/test/java/org/apache/roller/weblogger/business/PermissionTest.java Wed Aug 15 07:43:47 2007 @@ -26,7 +26,7 @@ import org.apache.roller.weblogger.TestUtils; import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.business.UserManager; -import org.apache.roller.weblogger.pojos.WeblogPermission; +import org.apache.roller.weblogger.pojos.WeblogUserPermission; import org.apache.roller.weblogger.pojos.User; import org.apache.roller.weblogger.pojos.Weblog; @@ -99,7 +99,7 @@ log.info("BEGIN"); UserManager mgr = WebloggerFactory.getWeblogger().getUserManager(); - WeblogPermission perm = null; + WeblogUserPermission perm = null; // delete permissions testWeblog = TestUtils.getManagedWebsite(testWeblog); @@ -117,11 +117,11 @@ assertNull(perm); // create permissions - perm = new WeblogPermission(); + perm = new WeblogUserPermission(); perm.setUser(testUser); perm.setWebsite(testWeblog); perm.setPending(false); - perm.setPermissionMask(WeblogPermission.ADMIN); + perm.setPermissionMask(WeblogUserPermission.ADMIN); mgr.savePermissions(perm); TestUtils.endSession(true); @@ -131,10 +131,10 @@ perm = null; perm = mgr.getPermissions(testWeblog, testUser); assertNotNull(perm); - assertEquals(WeblogPermission.ADMIN, perm.getPermissionMask()); + assertEquals(WeblogUserPermission.ADMIN, perm.getPermissionMask()); // update permissions - perm.setPermissionMask(WeblogPermission.LIMITED); + perm.setPermissionMask(WeblogUserPermission.LIMITED); mgr.savePermissions(perm); TestUtils.endSession(true); @@ -144,7 +144,7 @@ perm = null; perm = mgr.getPermissions(testWeblog, testUser); assertNotNull(perm); - assertEquals(WeblogPermission.LIMITED, perm.getPermissionMask()); + assertEquals(WeblogUserPermission.LIMITED, perm.getPermissionMask()); log.info("END"); } @@ -163,7 +163,7 @@ TestUtils.endSession(true); UserManager mgr = WebloggerFactory.getWeblogger().getUserManager(); - WeblogPermission perm = null; + WeblogUserPermission perm = null; List perms = null; // get all permissions for a user @@ -176,11 +176,11 @@ perms = mgr.getAllPermissions(TestUtils.getManagedWebsite(testWeblog)); assertEquals(1, perms.size()); - perm = new WeblogPermission(); + perm = new WeblogUserPermission(); perm.setUser(TestUtils.getManagedUser(user)); perm.setWebsite(TestUtils.getManagedWebsite(testWeblog)); perm.setPending(true); - perm.setPermissionMask(WeblogPermission.AUTHOR); + perm.setPermissionMask(WeblogUserPermission.AUTHOR); mgr.savePermissions(perm); TestUtils.endSession(true); @@ -205,11 +205,11 @@ perm = null; perm = mgr.getPermissions(TestUtils.getManagedWebsite(testWeblog), TestUtils.getManagedUser(testUser)); assertNotNull(perm); - assertEquals(WeblogPermission.ADMIN, perm.getPermissionMask()); + assertEquals(WeblogUserPermission.ADMIN, perm.getPermissionMask()); perm = null; perm = mgr.getPermissions(TestUtils.getManagedWebsite(testWeblog), TestUtils.getManagedUser(user)); assertNotNull(perm); - assertEquals(WeblogPermission.AUTHOR, perm.getPermissionMask()); + assertEquals(WeblogUserPermission.AUTHOR, perm.getPermissionMask()); assertEquals(true, perm.isPending()); // cleanup @@ -237,11 +237,11 @@ TestUtils.endSession(true); UserManager mgr = WebloggerFactory.getWeblogger().getUserManager(); - WeblogPermission perm = null; + WeblogUserPermission perm = null; List perms = null; // invite user to weblog - perm = mgr.inviteUser(TestUtils.getManagedWebsite(testWeblog), user, WeblogPermission.LIMITED); + perm = mgr.inviteUser(TestUtils.getManagedWebsite(testWeblog), user, WeblogUserPermission.LIMITED); String id = perm.getId(); TestUtils.endSession(true);
