directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trus...@apache.org
Subject svn commit: r321002 - in /directory/apacheds/trunk/core/src: main/java/org/apache/ldap/server/authz/support/RelatedProtectedItemFilter.java test/org/apache/ldap/server/authz/support/RelatedProtectedItemFilterTest.java
Date Fri, 14 Oct 2005 04:52:58 GMT
Author: trustin
Date: Thu Oct 13 21:52:52 2005
New Revision: 321002

URL: http://svn.apache.org/viewcvs?rev=321002&view=rev
Log:
AllUserAttributeTypes and AllUserAttributeTypesAndValues now also covers operational attributes.


Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/support/RelatedProtectedItemFilter.java
    directory/apacheds/trunk/core/src/test/org/apache/ldap/server/authz/support/RelatedProtectedItemFilterTest.java

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/support/RelatedProtectedItemFilter.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/support/RelatedProtectedItemFilter.java?rev=321002&r1=321001&r2=321002&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/support/RelatedProtectedItemFilter.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/support/RelatedProtectedItemFilter.java
Thu Oct 13 21:52:52 2005
@@ -31,7 +31,6 @@
 import org.apache.ldap.common.aci.ProtectedItem;
 import org.apache.ldap.common.aci.ProtectedItem.MaxValueCountItem;
 import org.apache.ldap.common.aci.ProtectedItem.RestrictedByItem;
-import org.apache.ldap.common.schema.AttributeType;
 import org.apache.ldap.server.event.Evaluator;
 import org.apache.ldap.server.interceptor.NextInterceptor;
 import org.apache.ldap.server.schema.AttributeTypeRegistry;
@@ -256,6 +255,10 @@
     
     private final boolean isUserAttribute( String attrId )
     {
+        /* Not used anymore.  Just retaining in case of resurrection. */
+        return true;
+        
+        /*
         try
         {
             AttributeType type = attrTypeRegistry.lookup( attrId );
@@ -270,5 +273,6 @@
         }
         
         return false;
+        */
     }
 }

Modified: directory/apacheds/trunk/core/src/test/org/apache/ldap/server/authz/support/RelatedProtectedItemFilterTest.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/test/org/apache/ldap/server/authz/support/RelatedProtectedItemFilterTest.java?rev=321002&r1=321001&r2=321002&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/org/apache/ldap/server/authz/support/RelatedProtectedItemFilterTest.java
(original)
+++ directory/apacheds/trunk/core/src/test/org/apache/ldap/server/authz/support/RelatedProtectedItemFilterTest.java
Thu Oct 13 21:52:52 2005
@@ -137,11 +137,13 @@
                         null, null, null,
                         "userAttr", null, null, null ).size() );
         
+        /* Not used anymore
         Assert.assertEquals(
                 0, filterB.filter(
                         tuples, OperationScope.ATTRIBUTE_TYPE, null, null, USER_NAME,
                         null, null, null,
-                        "opAttr", null, null, null ).size() );  
+                        "opAttr", null, null, null ).size() );
+        */  
     }
     
     public void testAllUserAttributeTypesAndValues() throws Exception
@@ -163,11 +165,13 @@
                         null, null, null,
                         "userAttr", null, null, null ).size() );
         
+        /* Not used anymore
         Assert.assertEquals(
                 0, filterB.filter(
                         tuples, OperationScope.ATTRIBUTE_TYPE, null, null, USER_NAME,
                         null, null, null,
-                        "opAttr", null, null, null ).size() );  
+                        "opAttr", null, null, null ).size() );
+        */  
     }
     
     public void testAllAttributeValues() throws Exception



Mime
View raw message