You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2012/08/07 14:37:45 UTC
svn commit: r1370210 - in /jackrabbit/trunk/jackrabbit-core/src:
main/java/org/apache/jackrabbit/core/security/user/AuthorizableImpl.java
test/java/org/apache/jackrabbit/core/security/user/AuthorizableImplTest.java
Author: angela
Date: Tue Aug 7 12:37:45 2012
New Revision: 1370210
URL: http://svn.apache.org/viewvc?rev=1370210&view=rev
Log:
JCR-3404 : AuthorizableImpl#isProtectedProperty doesn't include the disabled property
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/AuthorizableImpl.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/AuthorizableImplTest.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/AuthorizableImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/AuthorizableImpl.java?rev=1370210&r1=1370209&r2=1370210&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/AuthorizableImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/AuthorizableImpl.java Tue Aug 7 12:37:45 2012
@@ -430,7 +430,9 @@ abstract class AuthorizableImpl implemen
Name pName = getSession().getQName(propertyName);
return P_PRINCIPAL_NAME.equals(pName)
|| P_MEMBERS.equals(pName)
- || P_IMPERSONATORS.equals(pName) || P_PASSWORD.equals(pName);
+ || P_IMPERSONATORS.equals(pName)
+ || P_DISABLED.equals(pName)
+ || P_PASSWORD.equals(pName);
}
/**
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/AuthorizableImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/AuthorizableImplTest.java?rev=1370210&r1=1370209&r2=1370210&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/AuthorizableImplTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/AuthorizableImplTest.java Tue Aug 7 12:37:45 2012
@@ -60,8 +60,9 @@ public class AuthorizableImplTest extend
protectedUserProps.add(resolver.getJCRName(UserConstants.P_PASSWORD));
protectedUserProps.add(resolver.getJCRName(UserConstants.P_IMPERSONATORS));
protectedUserProps.add(resolver.getJCRName(UserConstants.P_PRINCIPAL_NAME));
+ protectedUserProps.add(resolver.getJCRName(UserConstants.P_DISABLED));
- protectedUserProps.add(resolver.getJCRName(UserConstants.P_MEMBERS));
+ protectedGroupProps.add(resolver.getJCRName(UserConstants.P_MEMBERS));
protectedGroupProps.add(resolver.getJCRName(UserConstants.P_PRINCIPAL_NAME));
} else {
throw new NotExecutableException();