You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2007/08/15 16:43:50 UTC
svn commit: r566200 [1/2] - in
/roller/branches/roller_usermanagement/apps/weblogger: ./ nbproject/
src/java/META-INF/ src/java/org/apache/roller/weblogger/business/
src/java/org/apache/roller/weblogger/business/hibernate/
src/java/org/apache/roller/we...
Author: snoopdave
Date: Wed Aug 15 07:43:47 2007
New Revision: 566200
URL: http://svn.apache.org/viewvc?view=rev&rev=566200
Log:
Getting started with ROL-1534: externalizable user management
- Introduced new permissions classes
- Renamed old WeblogPermission class to WeblogUserPermission
- Introduced new role-permisson mapping properties
- Introduced new table in createdb.vm, but it's not stable (or used) yet
Added:
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/GlobalPermission.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/RollerPermission.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogUserPermission.java
- copied, changed from r565851, roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogPermission.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogUserPermission.orm.xml
- copied, changed from r565851, roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml
Removed:
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml
Modified:
roller/branches/roller_usermanagement/apps/weblogger/build.properties
roller/branches/roller_usermanagement/apps/weblogger/nbproject/project.xml
roller/branches/roller_usermanagement/apps/weblogger/src/java/META-INF/persistence.xml
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/business/UserManager.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateUserManagerImpl.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/User.orm.xml
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.orm.xml
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogPermission.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargetAdd.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargetEdit.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CustomPingTargets.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Referrers.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Resources.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java
roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
roller/branches/roller_usermanagement/apps/weblogger/src/sql/createdb.vm
roller/branches/roller_usermanagement/apps/weblogger/test/java/org/apache/roller/weblogger/TestUtils.java
roller/branches/roller_usermanagement/apps/weblogger/test/java/org/apache/roller/weblogger/business/PermissionTest.java
Modified: roller/branches/roller_usermanagement/apps/weblogger/build.properties
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/build.properties?view=diff&rev=566200&r1=566199&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/build.properties (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/build.properties Wed Aug 15 07:43:47 2007
@@ -3,7 +3,7 @@
basedir=.
# what version is this?
-ro.version=4.0-dev
+ro.version=4.1-dev
# compile time settings
build.debug=true
Modified: roller/branches/roller_usermanagement/apps/weblogger/nbproject/project.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/nbproject/project.xml?view=diff&rev=566200&r1=566199&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/nbproject/project.xml (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/nbproject/project.xml Wed Aug 15 07:43:47 2007
@@ -4,7 +4,7 @@
<configuration>
<general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
<!-- Do not use Project Properties customizer when editing this file manually. -->
- <name>roller_weblogger</name>
+ <name>roller_weblogger_usermanagement</name>
<properties>
<property name="ant.script">build.xml</property>
</properties>
@@ -15,6 +15,11 @@
<location>web</location>
</source-folder>
<source-folder>
+ <label>src/sql</label>
+ <type>java</type>
+ <location>src/sql</location>
+ </source-folder>
+ <source-folder>
<label>src</label>
<type>java</type>
<location>src/java</location>
@@ -77,6 +82,10 @@
<location>web</location>
</source-folder>
<source-folder style="packages">
+ <label>src/sql</label>
+ <location>src/sql</location>
+ </source-folder>
+ <source-folder style="packages">
<label>src</label>
<location>src/java</location>
</source-folder>
@@ -103,6 +112,7 @@
<compilation-unit>
<package-root>src/java</package-root>
<package-root>test/java</package-root>
+ <package-root>src/sql</package-root>
<classpath mode="compile">../../tools/lib/commons-betwixt-1.0-beta-1.jar:../../tools/lib/commons-codec-1.3.jar:../../tools/lib/commons-collections-3.2.jar:../../tools/lib/commons-digester-1.6.jar:../../tools/lib/commons-httpclient-2.0.2.jar:../../tools/lib/commons-id-0.1-SNAPSHOT.jar:../../tools/lib/commons-lang-2.1.jar:../../tools/lib/commons-logging-1.0.4.jar:../../tools/lib/concurrent-1.3.2.jar:../../tools/lib/guice-1.0.jar:../../tools/lib/jaxen-full.jar:../../tools/lib/jdom.jar:../../tools/lib/log4j-1.2.11.jar:../../tools/lib/lucene-1.4.3.jar:../../tools/lib/rome-0.9.jar:../../tools/lib/rome-fetcher-0.9.jar:../../tools/lib/saxpath.jar:../../tools/lib/taglibs-string.jar:../../tools/lib/velocity-1.5.jar:../../tools/hibernate-3.1/hibernate3.jar:../../tools/struts-2.0.6/lib/antlr-2.7.2.jar:../../tools/struts-2.0.6/lib/commons-beanutils-1.6.jar:../../tools/struts-2.0.6/lib/commons-chain-1.1.jar:../../tools/struts-2.0.6/lib/commons-fileupload-1.2.jar:../../tool
s/struts-2.0.6/lib/commons-io-1.3.1.jar:../../tools/struts-2.0.6/lib/commons-validator-1.3.0.jar:../../tools/struts-2.0.6/lib/freemarker-2.3.8.jar:../../tools/struts-2.0.6/lib/ognl-2.6.11.jar:../../tools/struts-2.0.6/lib/oro-2.0.8.jar:../../tools/struts-2.0.6/lib/struts2-core-2.0.6.jar:../../tools/struts-2.0.6/lib/struts2-spring-plugin-2.0.6.jar:../../tools/struts-2.0.6/lib/struts2-tiles-plugin-2.0.6.jar:../../tools/struts-2.0.6/lib/tiles-api-2.0-20070207.130156-4.jar:../../tools/struts-2.0.6/lib/tiles-core-2.0-20070207.130156-4.jar:../../tools/struts-2.0.6/lib/xwork-2.0.1.jar:../../tools/openjpa-0.9.7/geronimo-j2ee-connector_1.5_spec-1.0.1.jar:../../tools/openjpa-0.9.7/geronimo-jpa_3.0_spec-1.0.jar:../../tools/openjpa-0.9.7/geronimo-jta_1.0.1B_spec-1.0.1.jar:../../tools/openjpa-0.9.7/openjpa-0.9.7-incubating.jar:../../tools/openjpa-0.9.7/serp-1.11.0.jar:../../tools/xmlrpc-3.0/lib/ws-commons-util-1.0.1.jar:../../tools/xmlrpc-3.0/lib/xmlrpc-client-3.0.jar:../../tools/xmlrpc-3
.0/lib/xmlrpc-common-3.0.jar:../../tools/xmlrpc-3.0/lib/xmlrpc-server-3.0.jar:../../tools/spring-1.2/acegi-security-1.0.3.jar:../../tools/spring-1.2/spring.jar:../../tools/roller-core/roller-core.jar:../../tools/roller-planet/roller-planet-business.jar:../../tools/struts-1.2.4/lib/antlr.jar:../../tools/struts-1.2.4/lib/commons-beanutils.jar:../../tools/struts-1.2.4/lib/commons-digester.jar:../../tools/struts-1.2.4/lib/commons-validator.jar:../../tools/struts-1.2.4/lib/jakarta-oro.jar:../../tools/struts-1.2.4/lib/struts-el.jar:../../tools/struts-1.2.4/lib/struts.jar:../../tools/buildtime/tomcat-5.0.28/jsp-api.jar:../../tools/buildtime/tomcat-5.0.28/servlet-api.jar:../../tools/buildtime/activation.jar:../../tools/buildtime/mail.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/jstl.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/serializer.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/standard.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/xalan.jar:../../tools/hi
bernate-3.1/lib/asm-attrs.jar:../../tools/hibernate-3.1/lib/asm.jar:../../tools/hibernate-3.1/lib/cglib-2.1.3.jar:../../tools/hibernate-3.1/lib/dom4j-1.6.1.jar:../../tools/hibernate-3.1/lib/ehcache-1.1.jar:../../tools/hibernate-3.1/lib/jdbc2_0-stdext.jar:../../tools/hibernate-3.1/lib/jta.jar:../../tools/buildtime/junit-4.1.jar:../../tools/buildtime/ant-1.7.0/ant.jar:../../tools/buildtime/derbyclient.jar:../../tools/buildtime/derby.jar:../../tools/buildtime/derbyclient.jar:../../tools/buildtime/derbynet.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:../../tools/buildtime/mockrunner-0.35/lib/nekohtml.jar</classpath>
<source-level>1.5</source-level>
</compilation-unit>
@@ -112,8 +122,7 @@
<doc-root>web</doc-root>
<context-path>/roller</context-path>
<j2ee-spec-level>1.5</j2ee-spec-level>
- <web-inf>web/WEB-INF</web-inf>
-
+ <web-inf>web/WEB-INF</web-inf>
</web-module>
</web-data>
</configuration>
Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/META-INF/persistence.xml?view=diff&rev=566200&r1=566199&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/META-INF/persistence.xml (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/META-INF/persistence.xml Wed Aug 15 07:43:47 2007
@@ -12,7 +12,7 @@
<mapping-file>org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml </mapping-file>
<mapping-file>org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml </mapping-file>
<mapping-file>org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml </mapping-file>
- <mapping-file>org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/WeblogUserPermission.orm.xml </mapping-file>
<mapping-file>org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml </mapping-file>
<mapping-file>org/apache/roller/weblogger/pojos/PingTarget.orm.xml </mapping-file>
<mapping-file>org/apache/roller/weblogger/pojos/WeblogReferrer.orm.xml </mapping-file>
Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/business/UserManager.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/business/UserManager.java?view=diff&rev=566200&r1=566199&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/business/UserManager.java (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/business/UserManager.java Wed Aug 15 07:43:47 2007
@@ -23,7 +23,7 @@
import java.util.Map;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.pojos.WeblogTemplate;
-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;
@@ -249,19 +249,19 @@
/**
* Save permissions object.
*/
- public void savePermissions(WeblogPermission perms) throws WebloggerException;
+ public void savePermissions(WeblogUserPermission perms) throws WebloggerException;
/**
* Remove permissions object.
*/
- public void removePermissions(WeblogPermission perms) throws WebloggerException;
+ public void removePermissions(WeblogUserPermission perms) throws WebloggerException;
/**
* Get permissions object by id.
*/
- public WeblogPermission getPermissions(String id) throws WebloggerException;
+ public WeblogUserPermission getPermissions(String id) throws WebloggerException;
/**
@@ -286,7 +286,7 @@
* @param user User (not null)
* @return PermissionsData object
*/
- public WeblogPermission getPermissions(Weblog website, User user)
+ public WeblogUserPermission getPermissions(Weblog website, User user)
throws WebloggerException;
@@ -313,7 +313,7 @@
* @param perms Permissions mask (see statics in PermissionsData)
* @return New PermissionsData object, with pending=true
*/
- public WeblogPermission inviteUser(Weblog website, User user, short perms)
+ public WeblogUserPermission inviteUser(Weblog website, User user, short perms)
throws WebloggerException;
Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateUserManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateUserManagerImpl.java?view=diff&rev=566200&r1=566199&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateUserManagerImpl.java (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateUserManagerImpl.java Wed Aug 15 07:43:47 2007
@@ -53,7 +53,7 @@
import org.apache.roller.weblogger.pojos.TagStat;
import org.apache.roller.weblogger.pojos.WeblogEntryTag;
import org.apache.roller.weblogger.pojos.WeblogTemplate;
-import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.pojos.WeblogUserPermission;
import org.apache.roller.weblogger.pojos.PingQueueEntry;
import org.apache.roller.weblogger.pojos.PingTarget;
import org.apache.roller.weblogger.pojos.WeblogReferrer;
@@ -212,7 +212,7 @@
// remove permissions
List permissions = this.getAllPermissions(website);
for (Iterator iter = permissions.iterator(); iter.hasNext(); ) {
- this.removePermissions((WeblogPermission) iter.next());
+ this.removePermissions((WeblogUserPermission) iter.next());
}
// remove uploaded files
@@ -231,11 +231,11 @@
this.userNameToIdMap.remove(user.getUserName());
}
- public void savePermissions(WeblogPermission perms) throws WebloggerException {
+ public void savePermissions(WeblogUserPermission perms) throws WebloggerException {
this.strategy.store(perms);
}
- public void removePermissions(WeblogPermission perms) throws WebloggerException {
+ public void removePermissions(WeblogUserPermission perms) throws WebloggerException {
// make sure associations are broken
perms.getWebsite().getPermissions().remove(perms);
@@ -304,11 +304,11 @@
WeblogManager wmgr = roller.getWeblogManager();
// grant weblog creator ADMIN permissions
- WeblogPermission perms = new WeblogPermission();
+ WeblogUserPermission perms = new WeblogUserPermission();
perms.setUser(newWeblog.getCreator());
perms.setWebsite(newWeblog);
perms.setPending(false);
- perms.setPermissionMask(WeblogPermission.ADMIN);
+ perms.setPermissionMask(WeblogUserPermission.ADMIN);
this.strategy.store(perms);
// add default category
@@ -390,13 +390,13 @@
* Creates and stores a pending PermissionsData for user and website specified.
* TODO BACKEND: do we really need this? can't we just use storePermissions()?
*/
- public WeblogPermission inviteUser(Weblog website,
+ public WeblogUserPermission inviteUser(Weblog website,
User user, short mask) throws WebloggerException {
if (website == null) throw new WebloggerException("Website cannot be null");
if (user == null) throw new WebloggerException("User cannot be null");
- WeblogPermission perms = new WeblogPermission();
+ WeblogUserPermission perms = new WeblogUserPermission();
perms.setWebsite(website);
perms.setUser(user);
perms.setPermissionMask(mask);
@@ -420,9 +420,9 @@
if (user == null) throw new WebloggerException("User cannot be null");
Iterator perms = website.getPermissions().iterator();
- WeblogPermission target = null;
+ WeblogUserPermission target = null;
while (perms.hasNext()) {
- WeblogPermission pd = (WeblogPermission)perms.next();
+ WeblogUserPermission pd = (WeblogUserPermission)perms.next();
if (pd.getUser().getId().equals(user.getId())) {
target = pd;
break;
@@ -774,24 +774,24 @@
}
}
- public WeblogPermission getPermissions(String inviteId) throws WebloggerException {
- return (WeblogPermission)this.strategy.load(inviteId,WeblogPermission.class);
+ public WeblogUserPermission getPermissions(String inviteId) throws WebloggerException {
+ return (WeblogUserPermission)this.strategy.load(inviteId,WeblogUserPermission.class);
}
/**
* Return permissions for specified user in website
*/
- public WeblogPermission getPermissions(
+ public WeblogUserPermission getPermissions(
Weblog website, User user) throws WebloggerException {
try {
Session session = ((HibernatePersistenceStrategy)this.strategy).getSession();
- Criteria criteria = session.createCriteria(WeblogPermission.class);
+ Criteria criteria = session.createCriteria(WeblogUserPermission.class);
criteria.add(Expression.eq("website", website));
criteria.add(Expression.eq("user", user));
List list = criteria.list();
- return list.size()!=0 ? (WeblogPermission)list.get(0) : null;
+ return list.size()!=0 ? (WeblogUserPermission)list.get(0) : null;
} catch (HibernateException e) {
throw new WebloggerException(e);
}
@@ -804,7 +804,7 @@
try {
Session session = ((HibernatePersistenceStrategy)this.strategy).getSession();
- Criteria criteria = session.createCriteria(WeblogPermission.class);
+ Criteria criteria = session.createCriteria(WeblogUserPermission.class);
criteria.add(Expression.eq("user", user));
criteria.add(Expression.eq("pending", Boolean.TRUE));
@@ -821,7 +821,7 @@
try {
Session session = ((HibernatePersistenceStrategy)this.strategy).getSession();
- Criteria criteria = session.createCriteria(WeblogPermission.class);
+ Criteria criteria = session.createCriteria(WeblogUserPermission.class);
criteria.add(Expression.eq("website", website));
criteria.add(Expression.eq("pending", Boolean.TRUE));
@@ -838,7 +838,7 @@
try {
Session session = ((HibernatePersistenceStrategy)this.strategy).getSession();
- Criteria criteria = session.createCriteria(WeblogPermission.class);
+ Criteria criteria = session.createCriteria(WeblogUserPermission.class);
criteria.add(Expression.eq("website", website));
criteria.add(Expression.eq("pending", Boolean.FALSE));
@@ -855,7 +855,7 @@
try {
Session session = ((HibernatePersistenceStrategy)this.strategy).getSession();
- Criteria criteria = session.createCriteria(WeblogPermission.class);
+ Criteria criteria = session.createCriteria(WeblogUserPermission.class);
criteria.add(Expression.eq("user", user));
criteria.add(Expression.eq("pending", Boolean.FALSE));
Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java?view=diff&rev=566200&r1=566199&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java Wed Aug 15 07:43:47 2007
@@ -205,7 +205,7 @@
// remove permissions
// make sure that both sides of the relationship are maintained
for (Iterator iterator = website.getPermissions().iterator(); iterator.hasNext();) {
- WeblogPermission perms = (WeblogPermission) iterator.next();
+ WeblogUserPermission perms = (WeblogUserPermission) iterator.next();
//Remove it from website
iterator.remove();
@@ -248,7 +248,7 @@
//remove permissions
// make sure that both sides of the relationship are maintained
for (Iterator iterator = user.getPermissions().iterator(); iterator.hasNext();) {
- WeblogPermission perms = (WeblogPermission) iterator.next();
+ WeblogUserPermission perms = (WeblogUserPermission) iterator.next();
//Remove it from database
this.strategy.remove(perms);
//Remove it from website
@@ -264,7 +264,7 @@
this.userNameToIdMap.remove(user.getUserName());
}
- public void savePermissions(WeblogPermission perms)
+ public void savePermissions(WeblogUserPermission perms)
throws WebloggerException {
if (getPermissions(perms.getId()) == null) {
// This is a new object make sure that relationship is set on managed
@@ -278,7 +278,7 @@
this.strategy.store(perms);
}
- public void removePermissions(WeblogPermission perms)
+ public void removePermissions(WeblogUserPermission perms)
throws WebloggerException {
this.strategy.remove(perms);
// make sure that relationship is set on managed
@@ -350,11 +350,11 @@
throws WebloggerException {
// grant weblog creator ADMIN permissions
- WeblogPermission perms = new WeblogPermission();
+ WeblogUserPermission perms = new WeblogUserPermission();
perms.setUser(newWeblog.getCreator());
perms.setWebsite(newWeblog);
perms.setPending(false);
- perms.setPermissionMask(WeblogPermission.ADMIN);
+ perms.setPermissionMask(WeblogUserPermission.ADMIN);
savePermissions(perms);
// add default category
@@ -436,16 +436,16 @@
}
/**
- * Creates and stores a pending WeblogPermission for user and website specified.
+ * Creates and stores a pending WeblogUserPermission for user and website specified.
* TODO BACKEND: do we really need this? can't we just use storePermissions()?
*/
- public WeblogPermission inviteUser(Weblog website,
+ public WeblogUserPermission inviteUser(Weblog website,
User user, short mask) throws WebloggerException {
if (website == null) throw new WebloggerException("Website cannot be null");
if (user == null) throw new WebloggerException("User cannot be null");
- WeblogPermission perms = new WeblogPermission();
+ WeblogUserPermission perms = new WeblogUserPermission();
perms.setWebsite(website);
perms.setUser(user);
perms.setPermissionMask(mask);
@@ -465,9 +465,9 @@
if (user == null) throw new WebloggerException("User cannot be null");
Iterator perms = website.getPermissions().iterator();
- WeblogPermission target = null;
+ WeblogUserPermission target = null;
while (perms.hasNext()) {
- WeblogPermission pd = (WeblogPermission)perms.next();
+ WeblogUserPermission pd = (WeblogUserPermission)perms.next();
if (pd.getUser().getId().equals(user.getId())) {
target = pd;
break;
@@ -597,7 +597,7 @@
}
/*if (user != null) { // Toplink likes sub-selects
if (whereClause.length() > 0) whereClause.append(" AND ");
- whereClause.append(" EXISTS (SELECT p from WeblogPermission p WHERE p.website = w ");
+ whereClause.append(" EXISTS (SELECT p from WeblogUserPermission p WHERE p.website = w ");
params.add(size++, user);
whereClause.append(" AND p.user = ?" + size);
params.add(size++, Boolean.FALSE);
@@ -953,23 +953,23 @@
return q.getResultList();
}
- public WeblogPermission getPermissions(String inviteId)
+ public WeblogUserPermission getPermissions(String inviteId)
throws WebloggerException {
- return (WeblogPermission)this.strategy.load(
- WeblogPermission.class, inviteId);
+ return (WeblogUserPermission)this.strategy.load(
+ WeblogUserPermission.class, inviteId);
}
/**
* Return permissions for specified user in website
*/
- public WeblogPermission getPermissions(
+ public WeblogUserPermission getPermissions(
Weblog website, User user) throws WebloggerException {
Query q = strategy.getNamedQuery(
- "WeblogPermission.getByWebsiteAndUser");
+ "WeblogUserPermission.getByWebsiteAndUser");
q.setParameter(1, website);
q.setParameter(2, user);
try {
- return (WeblogPermission)q.getSingleResult();
+ return (WeblogUserPermission)q.getSingleResult();
} catch (NoResultException e) {
return null;
}
@@ -980,7 +980,7 @@
*/
public List getPendingPermissions(User user) throws WebloggerException {
Query q = strategy.getNamedQuery(
- "WeblogPermission.getByUserAndPending");
+ "WeblogUserPermission.getByUserAndPending");
q.setParameter(1, user);
q.setParameter(2, Boolean.TRUE);
return q.getResultList();
@@ -991,7 +991,7 @@
*/
public List getPendingPermissions(Weblog website) throws WebloggerException {
Query q = strategy.getNamedQuery(
- "WeblogPermission.getByWebsiteAndPending");
+ "WeblogUserPermission.getByWebsiteAndPending");
q.setParameter(1, website);
q.setParameter(2, Boolean.TRUE);
return q.getResultList();
@@ -1002,7 +1002,7 @@
*/
public List getAllPermissions(Weblog website) throws WebloggerException {
Query q = strategy.getNamedQuery(
- "WeblogPermission.getByWebsiteAndPending");
+ "WeblogUserPermission.getByWebsiteAndPending");
q.setParameter(1, website);
q.setParameter(2, Boolean.FALSE);
return q.getResultList();
@@ -1013,7 +1013,7 @@
*/
public List getAllPermissions(User user) throws WebloggerException {
Query q = strategy.getNamedQuery(
- "WeblogPermission.getByUserAndPending");
+ "WeblogUserPermission.getByUserAndPending");
q.setParameter(1, user);
q.setParameter(2, Boolean.FALSE);
return q.getResultList();
Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java?view=diff&rev=566200&r1=566199&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java Wed Aug 15 07:43:47 2007
@@ -31,7 +31,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.business.DatabaseProvider;
-import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.pojos.WeblogUserPermission;
/**
@@ -367,7 +367,7 @@
permsInsert.setString( 1, websiteid+"p");
permsInsert.setString( 2, websiteid);
permsInsert.setString( 3, userid);
- permsInsert.setShort( 4,WeblogPermission.ADMIN);
+ permsInsert.setShort( 4,WeblogUserPermission.ADMIN);
permsInsert.setBoolean(5, false);
permsInsert.executeUpdate();
}
Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties?view=diff&rev=566200&r1=566199&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties Wed Aug 15 07:43:47 2007
@@ -333,7 +333,7 @@
#-----------------------------------------------------------------------------
-# Security settings
+# User management and security settings
#-----------------------------------------------------------------------------
# Enables HTTPS for login page only
@@ -357,6 +357,12 @@
# Password security settings
passwds.encryption.enabled=true
passwds.encryption.algorithm=SHA
+
+# Role to permissions mappings
+role.names=anonymous,editor,admin
+role.actions.anonymous=comment
+role.actions.editor=login,comment,createWeblog
+role.actions.admin=login,comment,createWeblog,admin
#----------------------------------
# Single-Sign-On
Added: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/GlobalPermission.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/GlobalPermission.java?view=auto&rev=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/GlobalPermission.java (added)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/GlobalPermission.java Wed Aug 15 07:43:47 2007
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License. For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
+ */
+
+package org.apache.roller.weblogger.pojos;
+
+/**
+ *
+ */
+public class GlobalPermission extends RollerPermission {
+
+ public GlobalPermission(String action) {
+ super(action);
+ }
+
+}
Added: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/RollerPermission.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/RollerPermission.java?view=auto&rev=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/RollerPermission.java (added)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/RollerPermission.java Wed Aug 15 07:43:47 2007
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License. For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
+ */
+
+package org.apache.roller.weblogger.pojos;
+
+import java.security.Permission;
+
+/**
+ * Base permission class for Roller.
+ */
+public class RollerPermission extends java.security.Permission {
+
+ public RollerPermission(String action) {
+ super(action);
+ }
+
+ public boolean implies(Permission arg0) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public boolean equals(Object arg0) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public int hashCode() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public String getActions() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+}
Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/User.orm.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/User.orm.xml?view=diff&rev=566200&r1=566199&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/User.orm.xml (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/User.orm.xml Wed Aug 15 07:43:47 2007
@@ -106,7 +106,7 @@
<basic name="timeZone">
<column name="timeZone" insertable="true" updatable="true" unique="false"/>
</basic>
- <one-to-many name="permissions" mapped-by="user" target-entity="org.apache.roller.weblogger.pojos.WeblogPermission" fetch="LAZY">
+ <one-to-many name="permissions" mapped-by="user" target-entity="org.apache.roller.weblogger.pojos.WeblogUserPermission" fetch="LAZY">
</one-to-many>
<one-to-many name="roles" mapped-by="user" target-entity="org.apache.roller.weblogger.pojos.UserRole" fetch="LAZY">
<cascade>
Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java?view=diff&rev=566200&r1=566199&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java Wed Aug 15 07:43:47 2007
@@ -173,7 +173,7 @@
/**
* Remove permission from collection.
*/
- public void removePermission(WeblogPermission perms) {
+ public void removePermission(WeblogUserPermission perms) {
permissions.remove(perms);
}
@@ -650,10 +650,10 @@
*/
public boolean hasUserPermissions(User user, short mask) {
// look for user in website's permissions
- WeblogPermission userPerms = null;
+ WeblogUserPermission userPerms = null;
Iterator iter = getPermissions().iterator();
while (iter.hasNext()) {
- WeblogPermission perms = (WeblogPermission) iter.next();
+ WeblogUserPermission perms = (WeblogUserPermission) iter.next();
if (perms.getUser().getId().equals(user.getId())) {
userPerms = perms;
break;
@@ -683,11 +683,11 @@
public int getAdminUserCount() {
int count = 0;
- WeblogPermission userPerms = null;
+ WeblogUserPermission userPerms = null;
Iterator iter = getPermissions().iterator();
while (iter.hasNext()) {
- WeblogPermission perms = (WeblogPermission) iter.next();
- if (perms.getPermissionMask() == WeblogPermission.ADMIN) {
+ WeblogUserPermission perms = (WeblogUserPermission) iter.next();
+ if (perms.getPermissionMask() == WeblogUserPermission.ADMIN) {
count++;
}
}
Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.orm.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.orm.xml?view=diff&rev=566200&r1=566199&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.orm.xml (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.orm.xml Wed Aug 15 07:43:47 2007
@@ -23,7 +23,7 @@
<named-query name="Weblog.getByEndDate&StartDate&Enabled&Active&Permissions.user&Permissions.pendingOrderByDateCreatedDesc">
<query>SELECT w FROM Weblog w WHERE w.dateCreated < ?1 AND w.dateCreated > ?2
AND w.enabled = ?3 AND w.active = ?4
- AND EXISTS (SELECT p from WeblogPermission p where
+ AND EXISTS (SELECT p from WeblogUserPermission p where
p.website = w
AND p.user = ?5
AND p.pending = ?6 )
@@ -32,7 +32,7 @@
<named-query name="Weblog.getByEndDate&Enabled&Permissions.user&Permissions.pendingOrderByDateCreatedDesc">
<query>SELECT w FROM Weblog w WHERE w.dateCreated < ?1
AND w.enabled = ?2
- AND EXISTS (SELECT p from WeblogPermission p where
+ AND EXISTS (SELECT p from WeblogUserPermission p where
p.website = w
AND p.user = ?3
AND p.pending = ?4 )
@@ -40,7 +40,7 @@
</named-query>
<named-query name="Weblog.getByEndDate&StartDate&Permissions.user&Permissions.pendingOrderByDateCreatedDesc">
<query>SELECT w FROM Weblog w WHERE w.dateCreated < ?1 AND w.dateCreated > ?2
- AND EXISTS (SELECT p from WeblogPermission p where
+ AND EXISTS (SELECT p from WeblogUserPermission p where
p.website = w
AND p.user = ?3
AND p.pending = ?4 )
@@ -67,7 +67,7 @@
<named-query name="Weblog.getByEndDate&StartDate&Enabled&Permissions.user&Permissions.pendingOrderByDateCreatedDesc">
<query>SELECT w FROM Weblog w WHERE w.dateCreated < ?1 AND w.dateCreated > ?2
AND w.enabled = ?3
- AND EXISTS (SELECT p from WeblogPermission p where
+ AND EXISTS (SELECT p from WeblogUserPermission p where
p.website = w
AND p.user = ?4
AND p.pending = ?5 )
@@ -76,7 +76,7 @@
<named-query name="Weblog.getByEndDate&StartDate&Active&Permissions.user&Permissions.pendingOrderByDateCreatedDesc">
<query>SELECT w FROM Weblog w WHERE w.dateCreated < ?1 AND w.dateCreated > ?2
AND w.active = ?3
- AND EXISTS (SELECT p from WeblogPermission p where
+ AND EXISTS (SELECT p from WeblogUserPermission p where
p.website = w
AND p.user = ?4
AND p.pending = ?5 )
@@ -90,7 +90,7 @@
<named-query name="Weblog.getByEndDate&Enabled&Active&Permissions.user&Permissions.pendingOrderByDateCreatedDesc">
<query>SELECT w FROM Weblog w WHERE w.dateCreated < ?1
AND w.enabled = ?2 AND w.active = ?3
- AND EXISTS (SELECT p from WeblogPermission p where
+ AND EXISTS (SELECT p from WeblogUserPermission p where
p.website = w
AND p.user = ?4
AND p.pending = ?5 )
@@ -109,7 +109,7 @@
<named-query name="Weblog.getByEndDate&Active&Permissions.user&Permissions.pendingOrderByDateCreatedDesc">
<query>SELECT w FROM Weblog w WHERE w.dateCreated < ?1
AND w.active = ?2
- AND EXISTS (SELECT p from WeblogPermission p where
+ AND EXISTS (SELECT p from WeblogUserPermission p where
p.website = w
AND p.user = ?3
AND p.pending = ?4 )</query>
@@ -121,7 +121,7 @@
</named-query>
<named-query name="Weblog.getByEndDate&Permissions.user&Permissions.pendingOrderByDateCreatedDesc">
<query>SELECT w FROM Weblog w WHERE w.dateCreated < ?1
- AND EXISTS (SELECT p from WeblogPermission p where
+ AND EXISTS (SELECT p from WeblogUserPermission p where
p.website = w
AND p.user = ?2
AND p.pending = ?3 )
@@ -239,7 +239,7 @@
<many-to-one name="defaultCategory" target-entity="org.apache.roller.weblogger.pojos.WeblogCategory">
<join-column name="defaultcatid" insertable="true" updatable="true"/>
</many-to-one>
- <one-to-many name="permissions" mapped-by="website" target-entity="org.apache.roller.weblogger.pojos.WeblogPermission" fetch="LAZY">
+ <one-to-many name="permissions" mapped-by="website" target-entity="org.apache.roller.weblogger.pojos.WeblogUserPermission" fetch="LAZY">
</one-to-many>
<transient name="absoluteURL"/>
<transient name="adminUserCount"/>
Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java?view=diff&rev=566200&r1=566199&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java Wed Aug 15 07:43:47 2007
@@ -1120,10 +1120,10 @@
boolean author = getWebsite().hasUserPermissions(
- user,(short)(WeblogPermission.AUTHOR));
+ user,(short)(WeblogUserPermission.AUTHOR));
boolean limited = getWebsite().hasUserPermissions(
- user,(short)(WeblogPermission.LIMITED));
+ user,(short)(WeblogUserPermission.LIMITED));
if (author || (limited && isDraft()) || (limited && isPending())) {
return true;
Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogPermission.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogPermission.java?view=diff&rev=566200&r1=566199&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogPermission.java (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogPermission.java Wed Aug 15 07:43:47 2007
@@ -1,153 +1,13 @@
-/*
- * Copyright 2005 Sun Microsystems, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.roller.weblogger.pojos;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.roller.util.UUIDGenerator;
+package org.apache.roller.weblogger.pojos;
/**
- * Represents a user's permissions within a website.
- *
- * @ejb:bean name="WeblogPermission"
- * @struts.form include-all="true"
- * @hibernate.class lazy="true" table="roller_user_permissions"
- * @hibernate.cache usage="read-write"
*
- * @author Dave Johnson
*/
-public class WeblogPermission
-{
- private String id = UUIDGenerator.generateUUID();
- private Weblog website = null;
- private User user = null;
- private boolean pending = true;
- public static short LIMITED = 0x00; // 0000
- public static short AUTHOR = 0x01; // 0001
- public static short ADMIN = 0x03; // 0011
- private short permissionMask = LIMITED;
-
- /** Creates a new instance of PermissionsData */
- public WeblogPermission()
- {
- }
-
- /**
- * Check for specific permission.
- */
- public boolean has(short priv)
- {
- return (getPermissionMask() & priv) == priv;
- }
- /**
- * @ejb:persistent-field
- * @hibernate.id column="id"
- * generator-class="assigned"
- */
- public String getId()
- {
- return id;
- }
- /** @ejb:persistent-field */
- public void setId(String id)
- {
- // Form bean workaround: empty string is never a valid id
- if (id != null && id.trim().length() == 0) return;
- this.id = id;
- }
- /**
- * @hibernate.many-to-one column="website_id" cascade="none" not-null="false"
- */
- public Weblog getWebsite()
- {
- return website;
- }
- public void setWebsite(Weblog website)
- {
- this.website = website;
- }
- /**
- * @hibernate.many-to-one column="user_id" cascade="none" not-null="false"
- */
- public User getUser()
- {
- return user;
- }
- public void setUser(User user)
- {
- this.user = user;
- }
- /**
- * Bit mask that encodes user's permissions in website.
- * @ejb:persistent-field
- * @hibernate.property column="permission_mask" non-null="true" unique="false"
- */
- public short getPermissionMask()
- {
- return permissionMask;
- }
- /** @ejb:persistent-field */
- public void setPermissionMask(short permissionMask)
- {
- this.permissionMask = permissionMask;
- }
- /**
- * True if user has been invited to join site but has not yet accepted.
- * And false if user is member of website.
- * @ejb:persistent-field
- * @hibernate.property column="pending" non-null="true" unique="false"
- */
- public boolean isPending()
- {
- return pending;
- }
- /** @ejb:persistent-field */
- public void setPending(boolean pending)
- {
- this.pending = pending;
- }
-
- //------------------------------------------------------- Good citizenship
+public class WeblogPermission extends RollerPermission {
- public String toString() {
- StringBuffer buf = new StringBuffer();
- buf.append("{");
- buf.append(this.id);
- buf.append(", ").append(this.permissionMask);
- buf.append(", ").append(this.pending);
- buf.append("}");
- return buf.toString();
- }
-
- public boolean equals(Object other) {
- if (other == this) return true;
- if (other instanceof WeblogPermission != true) return false;
- WeblogPermission o = (WeblogPermission)other;
- return new EqualsBuilder()
- .append(user, o.user)
- .append(website, o.website)
- .isEquals();
+ public WeblogPermission(String action) {
+ super(action);
}
-
- public int hashCode() {
- return new HashCodeBuilder()
- .append(user)
- .append(website)
- .toHashCode();
- }
-
+
}
Copied: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogUserPermission.java (from r565851, roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogPermission.java)
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogUserPermission.java?view=diff&rev=566200&p1=roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogPermission.java&r1=565851&p2=roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogUserPermission.java&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogPermission.java (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogUserPermission.java Wed Aug 15 07:43:47 2007
@@ -30,7 +30,7 @@
*
* @author Dave Johnson
*/
-public class WeblogPermission
+public class WeblogUserPermission
{
private String id = UUIDGenerator.generateUUID();
private Weblog website = null;
@@ -42,7 +42,7 @@
private short permissionMask = LIMITED;
/** Creates a new instance of PermissionsData */
- public WeblogPermission()
+ public WeblogUserPermission()
{
}
@@ -135,8 +135,8 @@
public boolean equals(Object other) {
if (other == this) return true;
- if (other instanceof WeblogPermission != true) return false;
- WeblogPermission o = (WeblogPermission)other;
+ if (other instanceof WeblogUserPermission != true) return false;
+ WeblogUserPermission o = (WeblogUserPermission)other;
return new EqualsBuilder()
.append(user, o.user)
.append(website, o.website)
Copied: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogUserPermission.orm.xml (from r565851, roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml)
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogUserPermission.orm.xml?view=diff&rev=566200&p1=roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml&r1=565851&p2=roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogUserPermission.orm.xml&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogUserPermission.orm.xml Wed Aug 15 07:43:47 2007
@@ -9,17 +9,17 @@
</persistence-unit-defaults>
</persistence-unit-metadata>
<package>org.apache.roller.weblogger.pojos</package>
- <entity metadata-complete="true" name="WeblogPermission"
- class="org.apache.roller.weblogger.pojos.WeblogPermission">
+ <entity metadata-complete="true" name="WeblogUserPermission"
+ class="org.apache.roller.weblogger.pojos.WeblogUserPermission">
<table name="roller_user_permissions"/>
- <named-query name="WeblogPermission.getByWebsiteAndUser">
- <query>SELECT p FROM WeblogPermission p WHERE p.website = ?1 AND p.user = ?2</query>
+ <named-query name="WeblogUserPermission.getByWebsiteAndUser">
+ <query>SELECT p FROM WeblogUserPermission p WHERE p.website = ?1 AND p.user = ?2</query>
</named-query>
- <named-query name="WeblogPermission.getByUserAndPending">
- <query>SELECT p FROM WeblogPermission p WHERE p.user = ?1 AND p.pending = ?2</query>
+ <named-query name="WeblogUserPermission.getByUserAndPending">
+ <query>SELECT p FROM WeblogUserPermission p WHERE p.user = ?1 AND p.pending = ?2</query>
</named-query>
- <named-query name="WeblogPermission.getByWebsiteAndPending">
- <query>SELECT p FROM WeblogPermission p WHERE p.website = ?1 AND p.pending = ?2</query>
+ <named-query name="WeblogUserPermission.getByWebsiteAndPending">
+ <query>SELECT p FROM WeblogUserPermission p WHERE p.website = ?1 AND p.pending = ?2</query>
</named-query>
<attributes>
<id name="id">
Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java?view=diff&rev=566200&r1=566199&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java Wed Aug 15 07:43:47 2007
@@ -26,7 +26,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
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.User;
import org.apache.roller.weblogger.pojos.Weblog;
import org.jdom.Document;
@@ -195,11 +195,11 @@
if(perm == null) {
return true;
} else if("limited".equals(perm)) {
- permMask = WeblogPermission.LIMITED;
+ permMask = WeblogUserPermission.LIMITED;
} else if("author".equals(perm)) {
- permMask = WeblogPermission.AUTHOR;
+ permMask = WeblogUserPermission.AUTHOR;
} else if("admin".equals(perm)) {
- permMask = WeblogPermission.ADMIN;
+ permMask = WeblogUserPermission.ADMIN;
} else {
// unknown perm
return false;
Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java?view=diff&rev=566200&r1=566199&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java Wed Aug 15 07:43:47 2007
@@ -35,7 +35,7 @@
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogManager;
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.StatCount;
import org.apache.roller.weblogger.pojos.ThemeTemplate;
import org.apache.roller.weblogger.pojos.User;
@@ -324,7 +324,7 @@
User user = umgr.getUserByUserName(userName);
List perms = umgr.getAllPermissions(user);
for (Iterator it = perms.iterator(); it.hasNext();) {
- WeblogPermission perm = (WeblogPermission) it.next();
+ WeblogUserPermission perm = (WeblogUserPermission) it.next();
results.add(WeblogWrapper.wrap(perm.getWebsite(), urlStrategy));
}
} catch (Exception e) {
@@ -345,7 +345,7 @@
Weblog website = umgr.getWebsiteByHandle(handle);
List perms = umgr.getAllPermissions(website);
for (Iterator it = perms.iterator(); it.hasNext();) {
- WeblogPermission perm = (WeblogPermission) it.next();
+ WeblogUserPermission perm = (WeblogUserPermission) it.next();
results.add(UserWrapper.wrap(perm.getUser()));
}
} catch (Exception e) {
Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java?view=diff&rev=566200&r1=566199&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java Wed Aug 15 07:43:47 2007
@@ -29,7 +29,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.pojos.WeblogUserPermission;
import org.apache.roller.weblogger.pojos.wrapper.WeblogWrapper;
import org.apache.roller.weblogger.ui.core.RollerSession;
import org.apache.roller.weblogger.ui.rendering.util.WeblogRequest;
@@ -123,7 +123,7 @@
try {
if (parsedRequest.getAuthenticUser() != null) {
return weblog.getPojo().hasUserPermissions(
- parsedRequest.getUser(), WeblogPermission.AUTHOR);
+ parsedRequest.getUser(), WeblogUserPermission.AUTHOR);
}
} catch (Exception e) {
log.warn("ERROR: checking user authorization", e);
@@ -135,7 +135,7 @@
try {
if (parsedRequest.getAuthenticUser() != null) {
return weblog.getPojo().hasUserPermissions(
- parsedRequest.getUser(), WeblogPermission.ADMIN);
+ parsedRequest.getUser(), WeblogUserPermission.ADMIN);
}
} catch (Exception e) {
log.warn("ERROR: checking user authorization", e);
Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java?view=diff&rev=566200&r1=566199&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java Wed Aug 15 07:43:47 2007
@@ -37,7 +37,7 @@
import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.pojos.WeblogUserPermission;
import org.apache.roller.weblogger.pojos.wrapper.WeblogReferrerWrapper;
import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryWrapper;
import org.apache.roller.weblogger.ui.core.RollerSession;
@@ -143,7 +143,7 @@
if ( rses != null && rses.getAuthenticatedUser() != null
&& mWebsite != null) {
return mWebsite.hasUserPermissions(
- rses.getAuthenticatedUser(), WeblogPermission.ADMIN);
+ rses.getAuthenticatedUser(), WeblogUserPermission.ADMIN);
}
} catch (Exception e) {
mLogger.warn("PageHelper.isUserAuthorizedToEdit)", e);
Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java?view=diff&rev=566200&r1=566199&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java Wed Aug 15 07:43:47 2007
@@ -59,7 +59,7 @@
import org.apache.roller.weblogger.business.URLStrategy;
import org.apache.roller.weblogger.pojos.WeblogHitCount;
import org.apache.roller.weblogger.pojos.ThemeTemplate;
-import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.pojos.WeblogUserPermission;
/**
@@ -533,7 +533,7 @@
if ( StringUtils.isNotEmpty(title)
&& StringUtils.isNotEmpty(excerpt) ) {
if (referer.getVisible().booleanValue()
- || referer.getWebsite().hasUserPermissions(rses.getAuthenticatedUser(), WeblogPermission.ADMIN) ) {
+ || referer.getWebsite().hasUserPermissions(rses.getAuthenticatedUser(), WeblogUserPermission.ADMIN) ) {
referers.add(WeblogReferrerWrapper.wrap(referer, urlStrategy));
}
}
@@ -561,7 +561,7 @@
if ( StringUtils.isNotEmpty(title)
&& StringUtils.isNotEmpty(excerpt) ) {
if (referer.getVisible().booleanValue()
- || referer.getWebsite().hasUserPermissions(rses.getAuthenticatedUser(), WeblogPermission.ADMIN) ) {
+ || referer.getWebsite().hasUserPermissions(rses.getAuthenticatedUser(), WeblogUserPermission.ADMIN) ) {
referers.add(WeblogReferrerWrapper.wrap(referer, urlStrategy));
}
}
@@ -733,7 +733,7 @@
RollerSession rses =
RollerSession.getRollerSession(mRequest);
if (rses != null && rses.getAuthenticatedUser() != null && mWebsite != null) {
- return mWebsite.hasUserPermissions(rses.getAuthenticatedUser(), WeblogPermission.AUTHOR);
+ return mWebsite.hasUserPermissions(rses.getAuthenticatedUser(), WeblogUserPermission.AUTHOR);
}
} catch (Exception e) {
mLogger.warn("PageModel.isUserAuthorizedToEdit()", e);
@@ -748,7 +748,7 @@
RollerSession rses =
RollerSession.getRollerSession(mRequest);
if (rses != null && rses.getAuthenticatedUser() != null && mWebsite != null) {
- return mWebsite.hasUserPermissions(rses.getAuthenticatedUser(), WeblogPermission.ADMIN);
+ return mWebsite.hasUserPermissions(rses.getAuthenticatedUser(), WeblogUserPermission.ADMIN);
}
} catch (Exception e) {
mLogger.warn("PageModel.isUserAuthorizedToAdmin()", e);
Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java?view=diff&rev=566200&r1=566199&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java Wed Aug 15 07:43:47 2007
@@ -25,7 +25,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.User;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
@@ -63,7 +63,7 @@
try {
UserManager userMgr = WebloggerFactory.getWeblogger().getUserManager();
- WeblogPermission perms = userMgr.getPermissions(getInviteId());
+ WeblogUserPermission perms = userMgr.getPermissions(getInviteId());
if (perms != null) {
// TODO ROLLER_2.0: notify inviter that invitee has accepted invitation
// TODO EXCEPTIONS: better exception handling
@@ -89,7 +89,7 @@
try {
UserManager userMgr = WebloggerFactory.getWeblogger().getUserManager();
- WeblogPermission perms = userMgr.getPermissions(getInviteId());
+ WeblogUserPermission perms = userMgr.getPermissions(getInviteId());
if (perms != null) {
// TODO ROLLER_2.0: notify inviter that invitee has declined invitation
// TODO EXCEPTIONS: better exception handling here
@@ -119,7 +119,7 @@
Weblog website = mgr.getWebsite(getWebsiteId());
UserManager userMgr = WebloggerFactory.getWeblogger().getUserManager();
- WeblogPermission perms = userMgr.getPermissions(website, user);
+ WeblogUserPermission perms = userMgr.getPermissions(website, user);
if (perms != null) {
// TODO ROLLER_2.0: notify website members that user has resigned
Modified: roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java?view=diff&rev=566200&r1=566199&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java Wed Aug 15 07:43:47 2007
@@ -28,7 +28,7 @@
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.WeblogBookmark;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
-import org.apache.roller.weblogger.pojos.WeblogPermission;
+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;
@@ -59,7 +59,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/BookmarkEdit.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java?view=diff&rev=566200&r1=566199&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java Wed Aug 15 07:43:47 2007
@@ -27,7 +27,7 @@
import org.apache.roller.weblogger.business.BookmarkManager;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.WeblogBookmark;
-import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.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;
@@ -55,7 +55,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/Bookmarks.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java?view=diff&rev=566200&r1=566199&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java Wed Aug 15 07:43:47 2007
@@ -32,7 +32,7 @@
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.WeblogBookmark;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
-import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.pojos.WeblogUserPermission;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
import org.apache.roller.weblogger.util.cache.CacheManager;
@@ -75,7 +75,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/BookmarksImport.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java?view=diff&rev=566200&r1=566199&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java Wed Aug 15 07:43:47 2007
@@ -28,7 +28,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.business.BookmarkManager;
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.ui.struts2.util.UIAction;
import org.apache.roller.weblogger.util.cache.CacheManager;
@@ -59,7 +59,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/Categories.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java?view=diff&rev=566200&r1=566199&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java Wed Aug 15 07:43:47 2007
@@ -29,7 +29,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.WeblogCategory;
import org.apache.roller.weblogger.pojos.WeblogCategoryPathComparator;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
@@ -70,7 +70,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/CategoryAdd.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java?view=diff&rev=566200&r1=566199&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java Wed Aug 15 07:43:47 2007
@@ -25,7 +25,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.ui.struts2.util.UIAction;
import org.apache.roller.weblogger.util.cache.CacheManager;
import org.apache.struts2.interceptor.validation.SkipValidation;
@@ -57,7 +57,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/CategoryEdit.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java?view=diff&rev=566200&r1=566199&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java Wed Aug 15 07:43:47 2007
@@ -25,7 +25,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.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/CategoryRemove.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java?view=diff&rev=566200&r1=566199&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.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.WeblogManager;
-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.WeblogCategoryPathComparator;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
@@ -63,7 +63,7 @@
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/Comments.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java?view=diff&rev=566200&r1=566199&r2=566200
==============================================================================
--- roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java (original)
+++ roller/branches/roller_usermanagement/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java Wed Aug 15 07:43:47 2007
@@ -36,7 +36,7 @@
import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
-import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.pojos.WeblogUserPermission;
import org.apache.roller.weblogger.ui.struts2.pagers.CommentsPager;
import org.apache.roller.weblogger.ui.struts2.util.KeyValueObject;
import org.apache.roller.weblogger.util.cache.CacheManager;
@@ -85,7 +85,7 @@
@Override
public short requiredWeblogPermissions() {
- return WeblogPermission.AUTHOR;
+ return WeblogUserPermission.AUTHOR;
}