You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by rw...@apache.org on 2006/01/07 07:07:48 UTC
svn commit: r366683 - in
/portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/components/page-manager/src/java/org/apache/jetspeed/om/page:
SecurityConstraintImpl.java impl/SecurityConstraintsImpl.java
Author: rwatler
Date: Fri Jan 6 22:07:46 2006
New Revision: 366683
URL: http://svn.apache.org/viewcvs?rev=366683&view=rev
Log:
contributed DB PageManager fixes from James Liao
Modified:
portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/components/page-manager/src/java/org/apache/jetspeed/om/page/SecurityConstraintImpl.java
portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsImpl.java
Modified: portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/components/page-manager/src/java/org/apache/jetspeed/om/page/SecurityConstraintImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/components/page-manager/src/java/org/apache/jetspeed/om/page/SecurityConstraintImpl.java?rev=366683&r1=366682&r2=366683&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/components/page-manager/src/java/org/apache/jetspeed/om/page/SecurityConstraintImpl.java (original)
+++ portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/components/page-manager/src/java/org/apache/jetspeed/om/page/SecurityConstraintImpl.java Fri Jan 6 22:07:46 2006
@@ -260,6 +260,9 @@
*/
public List getPermissions()
{
+ if (permissionsList != null && !permissionsList.isEmpty()) {
+ this.permissions = this.getPermissionsAsString();
+ }
return permissionsList;
}
@@ -293,7 +296,7 @@
*/
public boolean principalsMatch(List userPrincipals, List rolePrincipals, List groupPrincipals, boolean allowDefault)
{
- return ((allowDefault && (users == null) && (roles == null) && (groups == null)) ||
+ return ((allowDefault && (getUsersAsString() == null) && (getRolesAsString() == null) && (getGroupsAsString() == null)) ||
((users != null) && (userPrincipals != null) &&
(users.equals(WILD_CHAR) || containsAny(usersList, userPrincipals))) ||
((roles != null) && (rolePrincipals != null) &&
Modified: portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsImpl.java?rev=366683&r1=366682&r2=366683&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsImpl.java (original)
+++ portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsImpl.java Fri Jan 6 22:07:46 2006
@@ -375,6 +375,6 @@
*/
public boolean isEmpty()
{
- return ((owner == null) && (securityConstraints == null) && (securityConstraintsRefs == null));
+ return ((owner == null) && getSecurityConstraints().isEmpty() && getSecurityConstraintsRefs().isEmpty());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org