directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r962376 - in /directory/apacheds/trunk/core/src: main/java/org/apache/directory/server/core/authz/support/ main/java/org/apache/directory/server/core/normalization/ main/java/org/apache/directory/server/core/subtree/ test/java/org/apache/di...
Date Fri, 09 Jul 2010 00:37:07 GMT
Author: elecharny
Date: Fri Jul  9 00:37:06 2010
New Revision: 962376

URL: http://svn.apache.org/viewvc?rev=962376&view=rev
Log:
o The MaxImmSubFilter constructor now takes a SchemaManager parameter
o Removed useless imports

Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/FilterNormalizingVisitor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java?rev=962376&r1=962375&r2=962376&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
Fri Jul  9 00:37:06 2010
@@ -81,7 +81,7 @@ public class ACDFEngine
      * 
      * @throws LdapException if failed to initialize internal components
      */
-    public ACDFEngine( SchemaManager schemaManager ) throws LdapException
+    public ACDFEngine( SchemaManager schemaManager )
     {
         Evaluator entryEvaluator = new ExpressionEvaluator( schemaManager );
         SubtreeEvaluator subtreeEvaluator = new SubtreeEvaluator( schemaManager );
@@ -91,7 +91,7 @@ public class ACDFEngine
             new RelatedUserClassFilter( subtreeEvaluator ),
             new RelatedProtectedItemFilter( refinementEvaluator, entryEvaluator, schemaManager
),
             new MaxValueCountFilter(),
-            new MaxImmSubFilter(),
+            new MaxImmSubFilter( schemaManager ),
             new RestrictedByFilter(),
             new MicroOperationFilter(),
             new HighestPrecedenceFilter(),

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java?rev=962376&r1=962375&r2=962376&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
Fri Jul  9 00:37:06 2010
@@ -50,6 +50,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.filter.PresenceNode;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.schema.SchemaManager;
 
 
 
@@ -65,7 +66,7 @@ public class MaxImmSubFilter implements 
     private final SearchControls childrenSearchControls;
 
 
-    public MaxImmSubFilter()
+    public MaxImmSubFilter( SchemaManager schemaManager )
     {
         childrenFilter = new PresenceNode( SchemaConstants.OBJECT_CLASS_AT );
         childrenSearchControls = new SearchControls();

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/FilterNormalizingVisitor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/FilterNormalizingVisitor.java?rev=962376&r1=962375&r2=962376&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/FilterNormalizingVisitor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/FilterNormalizingVisitor.java
Fri Jul  9 00:37:06 2010
@@ -68,7 +68,7 @@ public class FilterNormalizingVisitor im
     /** the name component normalizer used by this visitor */
     private final NameComponentNormalizer ncn;
 
-    /** the global registries used to resolve OIDs for attributeType ids */
+    /** the SchemaManager instance used to resolve OIDs for attributeType ids */
     private final SchemaManager schemaManager;
 
     /**
@@ -113,7 +113,7 @@ public class FilterNormalizingVisitor im
      * Creates a new instance of NormalizingVisitor.
      *
      * @param ncn The name component normalizer to use
-     * @param registries The global registries
+     * @param schemaManager The schemaManager
      */
     public FilterNormalizingVisitor( NameComponentNormalizer ncn, SchemaManager schemaManager
)
     {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java?rev=962376&r1=962375&r2=962376&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java
Fri Jul  9 00:37:06 2010
@@ -29,7 +29,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.filter.EqualityNode;
 import org.apache.directory.shared.ldap.filter.SimpleNode;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
-import org.apache.directory.shared.ldap.schema.registries.OidRegistry;
 
 
 /**

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java?rev=962376&r1=962375&r2=962376&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
(original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
Fri Jul  9 00:37:06 2010
@@ -101,7 +101,7 @@ public class MaxImmSubFilterTest
     @Test
     public void testWrongScope() throws Exception
     {
-        MaxImmSubFilter filter = new MaxImmSubFilter();
+        MaxImmSubFilter filter = new MaxImmSubFilter( schemaManager );
         Collection<ACITuple> tuples = new ArrayList<ACITuple>();
         tuples.add( new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE,
             EMPTY_PROTECTED_ITEM_COLLECTION, EMPTY_MICRO_OPERATION_SET, true, 0 ) );
@@ -127,7 +127,7 @@ public class MaxImmSubFilterTest
     @Test
     public void testRootDSE() throws Exception
     {
-        MaxImmSubFilter filter = new MaxImmSubFilter();
+        MaxImmSubFilter filter = new MaxImmSubFilter( schemaManager );
 
         Collection<ACITuple> tuples = new ArrayList<ACITuple>();
         tuples.add( new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE,
@@ -147,7 +147,7 @@ public class MaxImmSubFilterTest
     @Test
     public void testZeroTuple() throws Exception
     {
-        MaxImmSubFilter filter = new MaxImmSubFilter();
+        MaxImmSubFilter filter = new MaxImmSubFilter( schemaManager );
 
         AciContext aciContext = new AciContext( null, null );
         aciContext.setEntryDn( ENTRY_NAME );
@@ -161,7 +161,7 @@ public class MaxImmSubFilterTest
     @Test
     public void testDenialTuple() throws Exception
     {
-        MaxImmSubFilter filter = new MaxImmSubFilter();
+        MaxImmSubFilter filter = new MaxImmSubFilter( schemaManager );
         Collection<ACITuple> tuples = new ArrayList<ACITuple>();
         tuples.add( new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE,
PROTECTED_ITEMS,
             EMPTY_MICRO_OPERATION_SET, false, 0 ) );
@@ -180,7 +180,7 @@ public class MaxImmSubFilterTest
     @Test
     public void testGrantTuple() throws Exception
     {
-        MaxImmSubFilter filter = new MaxImmSubFilter();
+        MaxImmSubFilter filter = new MaxImmSubFilter( schemaManager );
         Collection<ACITuple> tuples = new ArrayList<ACITuple>();
         tuples.add( new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE,
PROTECTED_ITEMS,
             EMPTY_MICRO_OPERATION_SET, true, 0 ) );

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java?rev=962376&r1=962375&r2=962376&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
(original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
Fri Jul  9 00:37:06 2010
@@ -596,7 +596,7 @@ public class SchemaCheckerTest
 
     class MockOidRegistry extends OidRegistry
     {
-        public String getOid( String name ) throws LdapException
+        public String getOid( String name )
         {
             return StringTools.deepTrimToLower( name );
         }

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java?rev=962376&r1=962375&r2=962376&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java
(original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java
Fri Jul  9 00:37:06 2010
@@ -37,7 +37,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.loader.ldif.JarLdifSchemaLoader;
 import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager;
-import org.apache.directory.shared.ldap.schema.registries.OidRegistry;
 import org.apache.directory.shared.ldap.schema.registries.Registries;
 import org.apache.directory.shared.ldap.util.LdapExceptionUtils;
 import org.junit.AfterClass;



Mime
View raw message