You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2007/12/29 12:42:44 UTC
svn commit: r607412 [4/4] - in /directory:
apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/
apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authn/
apacheds/branches/bigbang/core/src/main/java/...
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java?rev=607412&r1=607411&r2=607412&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java Sat Dec 29 03:42:29 2007
@@ -26,6 +26,7 @@
import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
+import org.apache.directory.server.schema.registries.Registries;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.filter.EqualityNode;
import org.apache.directory.shared.ldap.filter.ExprNode;
@@ -95,11 +96,11 @@
return registry.getNormalizerMapping();
}
});
- initialize( registry );
+ initialize( directoryService.getRegistries() );
}
- private void initialize( AttributeTypeRegistry registry ) throws NamingException
+ private void initialize( Registries registries ) throws NamingException
{
// search all naming contexts for trigger subentenries
// generate TriggerSpecification arrays for each subentry
@@ -114,7 +115,7 @@
SearchControls ctls = new SearchControls();
ctls.setSearchScope( SearchControls.SUBTREE_SCOPE );
NamingEnumeration<SearchResult> results =
- nexus.search( new SearchOperationContext( baseDn, AliasDerefMode.DEREF_ALWAYS, filter, ctls ) );
+ nexus.search( new SearchOperationContext( registries, baseDn, AliasDerefMode.DEREF_ALWAYS, filter, ctls ) );
while ( results.hasMore() )
{
@@ -129,7 +130,7 @@
}
LdapDN normSubentryName = new LdapDN( subentryDn );
- normSubentryName.normalize( registry.getNormalizerMapping() );
+ normSubentryName.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
subentryAdded( normSubentryName, result.getAttributes() );
}
Modified: directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilterTest.java?rev=607412&r1=607411&r2=607412&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilterTest.java (original)
+++ directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilterTest.java Sat Dec 29 03:42:29 2007
@@ -55,7 +55,7 @@
public void testZeroTuple() throws Exception
{
HighestPrecedenceFilter filter = new HighestPrecedenceFilter();
- Assert.assertEquals( 0, filter.filter( AT_EMPTY_COLLECTION, null, null, null, null, null, null, null, null, null,
+ Assert.assertEquals( 0, filter.filter( null, AT_EMPTY_COLLECTION, null, null, null, null, null, null, null, null, null,
null, null, null ).size() );
}
@@ -68,7 +68,7 @@
tuples.add( new ACITuple( UC_EMPTY_COLLECTION, AuthenticationLevel.NONE, PI_EMPTY_COLLECTION, MO_EMPTY_SET, true, 10 ) );
tuples = Collections.unmodifiableCollection( tuples );
- Assert.assertEquals( tuples, filter.filter( tuples, null, null, null, null, null, null, null, null, null, null,
+ Assert.assertEquals( tuples, filter.filter( null, tuples, null, null, null, null, null, null, null, null, null, null,
null, null ) );
}
@@ -88,7 +88,7 @@
tuples.add( new ACITuple( UC_EMPTY_COLLECTION, AuthenticationLevel.NONE, PI_EMPTY_COLLECTION, MO_EMPTY_SET, true,
MAX_PRECEDENCE / 3 ) );
- tuples = filter.filter( tuples, null, null, null, null, null, null, null, null, null, null, null, null );
+ tuples = filter.filter( null, tuples, null, null, null, null, null, null, null, null, null, null, null, null );
for ( ACITuple tuple:tuples )
{
Modified: directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java?rev=607412&r1=607411&r2=607412&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java (original)
+++ directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java Sat Dec 29 03:42:29 2007
@@ -103,10 +103,10 @@
tuples = Collections.unmodifiableCollection( tuples );
- Assert.assertEquals( tuples, filter.filter( tuples, OperationScope.ATTRIBUTE_TYPE, null, null, null, null,
+ Assert.assertEquals( tuples, filter.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE, null, null, null, null,
null, ENTRY_NAME, null, null, ENTRY, null, null ) );
- Assert.assertEquals( tuples, filter.filter( tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, null,
+ Assert.assertEquals( tuples, filter.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, null,
null, null, ENTRY_NAME, null, null, ENTRY, null, null ) );
}
@@ -121,7 +121,7 @@
tuples = Collections.unmodifiableCollection( tuples );
- Assert.assertEquals( tuples, filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null,
+ Assert.assertEquals( tuples, filter.filter( null, tuples, OperationScope.ENTRY, null, null, null, null, null,
ROOTDSE_NAME, null, null, ENTRY, null, null ) );
}
@@ -130,7 +130,7 @@
{
MaxImmSubFilter filter = new MaxImmSubFilter();
- Assert.assertEquals( 0, filter.filter( EMPTY_ACI_TUPLE_COLLECTION, OperationScope.ENTRY, null, null, null, null, null,
+ Assert.assertEquals( 0, filter.filter( null, EMPTY_ACI_TUPLE_COLLECTION, OperationScope.ENTRY, null, null, null, null, null,
ENTRY_NAME, null, null, ENTRY, null, null ).size() );
}
@@ -144,7 +144,7 @@
tuples = Collections.unmodifiableCollection( tuples );
- Assert.assertEquals( tuples, filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null,
+ Assert.assertEquals( tuples, filter.filter( null, tuples, OperationScope.ENTRY, null, null, null, null, null,
ENTRY_NAME, null, null, ENTRY, null, null ) );
}
@@ -156,10 +156,10 @@
tuples.add( new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE,
PROTECTED_ITEMS, EMPTY_MICRO_OPERATION_SET, true, 0 ) );
- Assert.assertEquals( 1, filter.filter( tuples, OperationScope.ENTRY, new MockProxy( 1 ), null, null, null,
+ Assert.assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, new MockProxy( 1 ), null, null, null,
null, ENTRY_NAME, null, null, ENTRY, null, null ).size() );
- Assert.assertEquals( 0, filter.filter( tuples, OperationScope.ENTRY, new MockProxy( 3 ), null, null, null,
+ Assert.assertEquals( 0, filter.filter( null, tuples, OperationScope.ENTRY, new MockProxy( 3 ), null, null, null,
null, ENTRY_NAME, null, null, ENTRY, null, null ).size() );
}
Modified: directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java?rev=607412&r1=607411&r2=607412&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java (original)
+++ directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java Sat Dec 29 03:42:29 2007
@@ -87,10 +87,10 @@
tuples = Collections.unmodifiableCollection( tuples );
- Assert.assertEquals( tuples, filter.filter( tuples, OperationScope.ATTRIBUTE_TYPE, null, null, null, null,
+ Assert.assertEquals( tuples, filter.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE, null, null, null, null,
null, null, null, null, null, null, null ) );
- Assert.assertEquals( tuples, filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null, null,
+ Assert.assertEquals( tuples, filter.filter( null, tuples, OperationScope.ENTRY, null, null, null, null, null, null,
null, null, null, null, null ) );
}
@@ -99,7 +99,7 @@
{
MaxValueCountFilter filter = new MaxValueCountFilter();
- Assert.assertEquals( 0, filter.filter( EMPTY_ACI_TUPLE_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE,
+ Assert.assertEquals( 0, filter.filter( null, EMPTY_ACI_TUPLE_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE,
null, null, null, null, null, null, null, null, null, null, null ).size() );
}
@@ -113,9 +113,9 @@
tuples = Collections.unmodifiableCollection( tuples );
- Assert.assertEquals( tuples, filter.filter( tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, null,
+ Assert.assertEquals( tuples, filter.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, null,
null, null, null, "testAttr", null, ENTRY, null, null ) );
- Assert.assertEquals( tuples, filter.filter( tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, null,
+ Assert.assertEquals( tuples, filter.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, null,
null, null, null, "testAttr", null, FULL_ENTRY, null, null ) );
}
@@ -127,10 +127,10 @@
tuples.add( new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE, PROTECTED_ITEMS,
EMPTY_MICRO_OPERATION_SET, true, 0 ) );
- Assert.assertEquals( 1, filter.filter( tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, null, null,
+ Assert.assertEquals( 1, filter.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, null, null,
null, null, "testAttr", null, ENTRY, null, ENTRY ).size() );
- Assert.assertEquals( 0, filter.filter( tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, null, null,
+ Assert.assertEquals( 0, filter.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, null, null,
null, null, "testAttr", null, FULL_ENTRY, null, FULL_ENTRY ).size() );
}
}
Modified: directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java?rev=607412&r1=607411&r2=607412&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java (original)
+++ directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java Sat Dec 29 03:42:29 2007
@@ -70,7 +70,7 @@
{
MicroOperationFilter filter = new MicroOperationFilter();
- Assert.assertEquals( 0, filter.filter( EMPTY_ACI_TUPLE_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE,
+ Assert.assertEquals( 0, filter.filter( null, EMPTY_ACI_TUPLE_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE,
null, null, null, null, null, null, null, null, null, null, null ).size() );
}
@@ -83,9 +83,9 @@
tuples.add( new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE, EMPTY_PROTECTED_ITEM_COLLECTION,
TUPLE_OPERATIONS, true, 0 ) );
- Assert.assertEquals( 1, filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null, null, null,
+ Assert.assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null, null, null, null, null, null, null,
null, null, USER_OPERATIONS_A, null ).size() );
- Assert.assertEquals( 0, filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null, null, null,
+ Assert.assertEquals( 0, filter.filter( null, tuples, OperationScope.ENTRY, null, null, null, null, null, null, null,
null, null, USER_OPERATIONS_B, null ).size() );
}
}
Modified: directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java?rev=607412&r1=607411&r2=607412&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java (original)
+++ directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java Sat Dec 29 03:42:29 2007
@@ -147,13 +147,13 @@
{
MostSpecificProtectedItemFilter filter = new MostSpecificProtectedItemFilter();
- Assert.assertEquals( 0, filter.filter( EMPTY_ACI_TUPLE_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null,
+ Assert.assertEquals( 0, filter.filter( null, EMPTY_ACI_TUPLE_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null,
null, null, null, null, null, null, null, null, null ).size() );
Collection<ACITuple> tuples = new ArrayList<ACITuple>();
tuples.add( new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE, EMPTY_PROTECTED_ITEM_COLLECTION, EMPTY_MICRO_OPERATION_SET, false, 0 ) );
- Assert.assertEquals( 1, filter.filter( tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, null, null,
+ Assert.assertEquals( 1, filter.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, null, null,
null, null, null, null, null, null, null ).size() );
}
@@ -163,7 +163,7 @@
MostSpecificProtectedItemFilter filter = new MostSpecificProtectedItemFilter();
List<ACITuple> tuples = new ArrayList<ACITuple>( TUPLES_A );
- tuples = ( List<ACITuple> ) filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
+ tuples = ( List<ACITuple> ) filter.filter( null, tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
null, null, null );
Assert.assertEquals( 4, tuples.size() );
@@ -179,7 +179,7 @@
MostSpecificProtectedItemFilter filter = new MostSpecificProtectedItemFilter();
List<ACITuple> tuples = new ArrayList<ACITuple>( TUPLES_B );
- tuples = ( List<ACITuple> ) filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
+ tuples = ( List<ACITuple> ) filter.filter( null, tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
null, null, null );
Assert.assertEquals( 3, tuples.size() );
@@ -194,7 +194,7 @@
MostSpecificProtectedItemFilter filter = new MostSpecificProtectedItemFilter();
List<ACITuple> tuples = new ArrayList<ACITuple>( TUPLES_C );
- tuples = ( List<ACITuple> ) filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
+ tuples = ( List<ACITuple> ) filter.filter( null, tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
null, null, null );
Assert.assertEquals( 2, tuples.size() );
@@ -208,7 +208,7 @@
MostSpecificProtectedItemFilter filter = new MostSpecificProtectedItemFilter();
List<ACITuple> tuples = new ArrayList<ACITuple>( TUPLES_D );
- tuples = ( List<ACITuple> ) filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
+ tuples = ( List<ACITuple> ) filter.filter( null, tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
null, null, null );
Assert.assertEquals( 1, tuples.size() );
@@ -221,7 +221,7 @@
MostSpecificProtectedItemFilter filter = new MostSpecificProtectedItemFilter();
List<ACITuple> tuples = new ArrayList<ACITuple>( TUPLES_E );
- tuples = ( List<ACITuple> ) filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
+ tuples = ( List<ACITuple> ) filter.filter( null, tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
null, null, null );
Assert.assertEquals( 2, tuples.size() );
Modified: directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java?rev=607412&r1=607411&r2=607412&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java (original)
+++ directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java Sat Dec 29 03:42:29 2007
@@ -110,13 +110,13 @@
{
MostSpecificUserClassFilter filter = new MostSpecificUserClassFilter();
- Assert.assertEquals( 0, filter.filter( EMPTY_ACI_TUPLE_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null,
+ Assert.assertEquals( 0, filter.filter( null, EMPTY_ACI_TUPLE_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null,
null, null, null, null, null, null, null, null, null ).size() );
Collection<ACITuple> tuples = new ArrayList<ACITuple>();
tuples.add( new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE, EMPTY_PROTECTED_ITEM_COLLECTION, EMPTY_MICRO_OPERATION_SET, false, 0 ) );
- Assert.assertEquals( 1, filter.filter( tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, null, null,
+ Assert.assertEquals( 1, filter.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, null, null,
null, null, null, null, null, null, null ).size() );
}
@@ -126,7 +126,7 @@
MostSpecificUserClassFilter filter = new MostSpecificUserClassFilter();
List<ACITuple> tuples = new ArrayList<ACITuple>( TUPLES_A );
- tuples = ( List<ACITuple> ) filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
+ tuples = ( List<ACITuple> ) filter.filter( null, tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
null, null, null );
Assert.assertEquals( 2, tuples.size() );
@@ -140,7 +140,7 @@
MostSpecificUserClassFilter filter = new MostSpecificUserClassFilter();
List<ACITuple> tuples = new ArrayList<ACITuple>( TUPLES_B );
- tuples = ( List<ACITuple> ) filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
+ tuples = ( List<ACITuple> ) filter.filter( null, tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
null, null, null );
Assert.assertEquals( 1, tuples.size() );
@@ -153,7 +153,7 @@
MostSpecificUserClassFilter filter = new MostSpecificUserClassFilter();
List<ACITuple> tuples = new ArrayList<ACITuple>( TUPLES_C );
- tuples = ( List<ACITuple> ) filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
+ tuples = ( List<ACITuple> ) filter.filter( null, tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
null, null, null );
Assert.assertEquals( 1, tuples.size() );
@@ -166,7 +166,7 @@
MostSpecificUserClassFilter filter = new MostSpecificUserClassFilter();
List<ACITuple> tuples = new ArrayList<ACITuple>( TUPLES_D );
- tuples = ( List<ACITuple> ) filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
+ tuples = ( List<ACITuple> ) filter.filter( null, tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
null, null, null );
Assert.assertEquals( 1, tuples.size() );
@@ -179,7 +179,7 @@
MostSpecificUserClassFilter filter = new MostSpecificUserClassFilter();
List<ACITuple> tuples = new ArrayList<ACITuple>( TUPLES_E );
- tuples = (List<ACITuple>)filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
+ tuples = (List<ACITuple>)filter.filter( null, tuples, OperationScope.ENTRY, null, null, null, null, null, null, null, null,
null, null, null );
Assert.assertEquals( 2, tuples.size() );
Modified: directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java?rev=607412&r1=607411&r2=607412&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java (original)
+++ directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java Sat Dec 29 03:42:29 2007
@@ -102,7 +102,7 @@
public void testZeroTuple() throws Exception
{
- Assert.assertEquals( 0, filterA.filter( EMPTY_ACI_TUPLE_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null,
+ Assert.assertEquals( 0, filterA.filter( null, EMPTY_ACI_TUPLE_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null,
null, null, null, null, null, null, null, null, null ).size() );
}
@@ -111,7 +111,7 @@
{
Collection<ACITuple> tuples = getTuples( ProtectedItem.ENTRY );
- Assert.assertEquals( 1, filterA.filter( tuples, OperationScope.ENTRY, null, null, null, null,
+ Assert.assertEquals( 1, filterA.filter( null, tuples, OperationScope.ENTRY, null, null, null, null,
AuthenticationLevel.NONE, null, "ou", null, null, null, null ).size() );
}
@@ -121,21 +121,13 @@
Collection<ACITuple> tuples = getTuples( ProtectedItem.ALL_USER_ATTRIBUTE_TYPES );
// Test wrong scope
- Assert.assertEquals( 0, filterA.filter( tuples, OperationScope.ENTRY, null, null, USER_NAME, null, null, null,
+ Assert.assertEquals( 0, filterA.filter( null, tuples, OperationScope.ENTRY, null, null, USER_NAME, null, null, null,
"userAttr", null, null, null, null ).size() );
tuples = getTuples( ProtectedItem.ALL_USER_ATTRIBUTE_TYPES );
- Assert.assertEquals( 1, filterA.filter( tuples, OperationScope.ATTRIBUTE_TYPE, null, null, USER_NAME, null,
+ Assert.assertEquals( 1, filterA.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE, null, null, USER_NAME, null,
null, null, "userAttr", null, 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() );
- */
}
@@ -144,21 +136,13 @@
Collection<ACITuple> tuples = getTuples( ProtectedItem.ALL_USER_ATTRIBUTE_TYPES_AND_VALUES );
// Test wrong scope
- Assert.assertEquals( 0, filterA.filter( tuples, OperationScope.ENTRY, null, null, USER_NAME, null, null, null,
+ Assert.assertEquals( 0, filterA.filter( null, tuples, OperationScope.ENTRY, null, null, USER_NAME, null, null, null,
"userAttr", null, null, null, null ).size() );
tuples = getTuples( ProtectedItem.ALL_USER_ATTRIBUTE_TYPES_AND_VALUES );
- Assert.assertEquals( 1, filterA.filter( tuples, OperationScope.ATTRIBUTE_TYPE, null, null, USER_NAME, null,
+ Assert.assertEquals( 1, filterA.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE, null, null, USER_NAME, null,
null, null, "userAttr", null, 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() );
- */
}
@@ -169,15 +153,15 @@
Collection<ACITuple> tuples = getTuples( new ProtectedItem.AllAttributeValues( attrTypes ) );
// Test wrong scope
- Assert.assertEquals( 0, filterA.filter( tuples, OperationScope.ENTRY, null, null, USER_NAME, null, null, null,
+ Assert.assertEquals( 0, filterA.filter( null, tuples, OperationScope.ENTRY, null, null, USER_NAME, null, null, null,
"attrA", null, null, null, null ).size() );
tuples = getTuples( new ProtectedItem.AllAttributeValues( attrTypes ) );
- Assert.assertEquals( 1, filterA.filter( tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME, null,
+ Assert.assertEquals( 1, filterA.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME, null,
null, null, "attrA", null, null, null, null ).size() );
- Assert.assertEquals( 0, filterB.filter( tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME, null,
+ Assert.assertEquals( 0, filterB.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME, null,
null, null, "attrB", null, null, null, null ).size() );
}
@@ -189,15 +173,15 @@
Collection<ACITuple> tuples = getTuples( new ProtectedItem.AttributeType( attrTypes ) );
// Test wrong scope
- Assert.assertEquals( 0, filterA.filter( tuples, OperationScope.ENTRY, null, null, USER_NAME, null, null, null,
+ Assert.assertEquals( 0, filterA.filter( null, tuples, OperationScope.ENTRY, null, null, USER_NAME, null, null, null,
"attrA", null, null, null, null ).size() );
tuples = getTuples( new ProtectedItem.AttributeType( attrTypes ) );
- Assert.assertEquals( 1, filterA.filter( tuples, OperationScope.ATTRIBUTE_TYPE, null, null, USER_NAME, null,
+ Assert.assertEquals( 1, filterA.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE, null, null, USER_NAME, null,
null, null, "attrA", null, null, null, null ).size() );
- Assert.assertEquals( 0, filterA.filter( tuples, OperationScope.ATTRIBUTE_TYPE, null, null, USER_NAME, null,
+ Assert.assertEquals( 0, filterA.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE, null, null, USER_NAME, null,
null, null, "attrB", null, null, null, null ).size() );
}
@@ -209,23 +193,23 @@
Collection<ACITuple> tuples = getTuples( new ProtectedItem.AttributeValue( attributes ) );
// Test wrong scope
- Assert.assertEquals( 0, filterA.filter( tuples, OperationScope.ENTRY, null, null, USER_NAME, null, null, null,
+ Assert.assertEquals( 0, filterA.filter( null, tuples, OperationScope.ENTRY, null, null, USER_NAME, null, null, null,
"attrA", null, null, null, null ).size() );
tuples = getTuples( new ProtectedItem.AttributeValue( attributes ) );
- Assert.assertEquals( 0, filterA.filter( tuples, OperationScope.ATTRIBUTE_TYPE, null, null, USER_NAME, null,
+ Assert.assertEquals( 0, filterA.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE, null, null, USER_NAME, null,
null, null, "attrA", null, null, null, null ).size() );
tuples = getTuples( new ProtectedItem.AttributeValue( attributes ) );
- Assert.assertEquals( 1, filterA.filter( tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME,
+ Assert.assertEquals( 1, filterA.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME,
null, null, null, "attrA", "valueA", null, null, null ).size() );
- Assert.assertEquals( 0, filterA.filter( tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME,
+ Assert.assertEquals( 0, filterA.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME,
null, null, null, "attrA", "valueB", null, null, null ).size() );
tuples = getTuples( new ProtectedItem.AttributeValue( attributes ) );
- Assert.assertEquals( 0, filterA.filter( tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME,
+ Assert.assertEquals( 0, filterA.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME,
null, null, null, "attrB", "valueA", null, null, null ).size() );
}
@@ -241,7 +225,7 @@
Collection<ACITuple> tuples = getTuples( new ProtectedItem.MaxImmSub( 2 ) );
// Should always retain ruples.
- Assert.assertEquals( 1, filterA.filter( tuples, OperationScope.ENTRY, null, null, USER_NAME, null, null, null,
+ Assert.assertEquals( 1, filterA.filter( null, tuples, OperationScope.ENTRY, null, null, USER_NAME, null, null, null,
"attrA", null, null, null, null ).size() );
}
@@ -253,18 +237,18 @@
Collection<ACITuple> tuples = getTuples( new ProtectedItem.MaxValueCount( mvcItems ) );
// Test wrong scope
- Assert.assertEquals( 0, filterA.filter( tuples, OperationScope.ENTRY, null, null, USER_NAME, null, null, null,
+ Assert.assertEquals( 0, filterA.filter( null, tuples, OperationScope.ENTRY, null, null, USER_NAME, null, null, null,
"attrA", null, null, null, null ).size() );
tuples = getTuples( new ProtectedItem.MaxValueCount( mvcItems ) );
- Assert.assertEquals( 0, filterA.filter( tuples, OperationScope.ATTRIBUTE_TYPE, null, null, USER_NAME, null,
+ Assert.assertEquals( 0, filterA.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE, null, null, USER_NAME, null,
null, null, "attrA", null, null, null, null ).size() );
tuples = getTuples( new ProtectedItem.MaxValueCount( mvcItems ) );
- Assert.assertEquals( 1, filterA.filter( tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME,
+ Assert.assertEquals( 1, filterA.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME,
null, null, null, "attrA", null, null, null, null ).size() );
- Assert.assertEquals( 0, filterA.filter( tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME,
+ Assert.assertEquals( 0, filterA.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME,
null, null, null, "attrB", null, null, null, null ).size() );
}
@@ -295,18 +279,18 @@
Collection<ACITuple> tuples = getTuples( new ProtectedItem.RestrictedBy( rbItems ) );
// Test wrong scope
- Assert.assertEquals( 0, filterA.filter( tuples, OperationScope.ENTRY, null, null, USER_NAME, null, null, null,
+ Assert.assertEquals( 0, filterA.filter( null, tuples, OperationScope.ENTRY, null, null, USER_NAME, null, null, null,
"attrA", null, null, null, null ).size() );
tuples = getTuples( new ProtectedItem.RestrictedBy( rbItems ) );
- Assert.assertEquals( 0, filterA.filter( tuples, OperationScope.ATTRIBUTE_TYPE, null, null, USER_NAME, null,
+ Assert.assertEquals( 0, filterA.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE, null, null, USER_NAME, null,
null, null, "attrA", null, null, null, null ).size() );
tuples = getTuples( new ProtectedItem.RestrictedBy( rbItems ) );
- Assert.assertEquals( 1, filterA.filter( tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME,
+ Assert.assertEquals( 1, filterA.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME,
null, null, null, "attrA", null, null, null, null ).size() );
- Assert.assertEquals( 0, filterA.filter( tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME,
+ Assert.assertEquals( 0, filterA.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME,
null, null, null, "attrB", null, null, null, null ).size() );
}
@@ -321,20 +305,20 @@
entry.put( "attrA", USER_NAME.toNormName() );
// Test wrong scope
- Assert.assertEquals( 0, filterA.filter( tuples, OperationScope.ENTRY, null, null, USER_NAME, null, null, null,
+ Assert.assertEquals( 0, filterA.filter( null, tuples, OperationScope.ENTRY, null, null, USER_NAME, null, null, null,
"attrA", null, entry, null, null ).size() );
tuples = getTuples( new ProtectedItem.SelfValue( attrTypes ) );
- Assert.assertEquals( 1, filterA.filter( tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME,
+ Assert.assertEquals( 1, filterA.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME,
null, null, null, "attrA", null, entry, null, null ).size() );
entry.remove( "attrA" );
- Assert.assertEquals( 0, filterA.filter( tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME,
+ Assert.assertEquals( 0, filterA.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME,
null, null, null, "attrA", null, entry, null, null ).size() );
tuples = getTuples( new ProtectedItem.SelfValue( attrTypes ) );
- Assert.assertEquals( 0, filterA.filter( tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME,
+ Assert.assertEquals( 0, filterA.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME,
null, null, null, "attrB", null, entry, null, null ).size() );
}
Modified: directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java?rev=607412&r1=607411&r2=607412&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java (original)
+++ directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java Sat Dec 29 03:42:29 2007
@@ -87,7 +87,7 @@
public void testZeroTuple() throws Exception
{
- Assert.assertEquals( 0, filter.filter( EMPTY_ACI_TUPLE_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null,
+ Assert.assertEquals( 0, filter.filter( null, EMPTY_ACI_TUPLE_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null,
null, null, null, null, null, null, null, null, null ).size() );
}
@@ -96,7 +96,7 @@
{
Collection<ACITuple> tuples = getTuples( UserClass.ALL_USERS );
- Assert.assertEquals( 1, filter.filter( tuples, OperationScope.ENTRY, null, null, null, null,
+ Assert.assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null, null, null, null,
AuthenticationLevel.NONE, null, null, null, null, null, null ).size() );
}
@@ -105,9 +105,9 @@
{
Collection<ACITuple> tuples = getTuples( UserClass.THIS_ENTRY );
- Assert.assertEquals( 1, filter.filter( tuples, OperationScope.ENTRY, null, null, USER_NAME, null,
+ Assert.assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null, null, USER_NAME, null,
AuthenticationLevel.NONE, USER_NAME, null, null, null, null, null ).size() );
- Assert.assertEquals( 0, filter.filter( tuples, OperationScope.ENTRY, null, null, USER_NAME, null,
+ Assert.assertEquals( 0, filter.filter( null, tuples, OperationScope.ENTRY, null, null, USER_NAME, null,
AuthenticationLevel.NONE, new LdapDN( "ou=unrelated" ), null, null, null, null, null ).size() );
}
@@ -115,9 +115,9 @@
public void testName() throws Exception
{
Collection<ACITuple> tuples = getTuples( new UserClass.Name( USER_NAMES ) );
- Assert.assertEquals( 1, filter.filter( tuples, OperationScope.ENTRY, null, null, USER_NAME, null,
+ Assert.assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null, null, USER_NAME, null,
AuthenticationLevel.NONE, null, null, null, null, null, null ).size() );
- Assert.assertEquals( 0, filter.filter( tuples, OperationScope.ENTRY, null, null,
+ Assert.assertEquals( 0, filter.filter( null, tuples, OperationScope.ENTRY, null, null,
new LdapDN( "ou=unrelateduser, ou=users" ), null, AuthenticationLevel.NONE, USER_NAME, null, null, null,
null, null ).size() );
}
@@ -126,13 +126,13 @@
public void testUserGroup() throws Exception
{
Collection<ACITuple> tuples = getTuples( new UserClass.UserGroup( GROUP_NAMES ) );
- Assert.assertEquals( 1, filter.filter( tuples, OperationScope.ENTRY, null, GROUP_NAMES, USER_NAME, null,
+ Assert.assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null, GROUP_NAMES, USER_NAME, null,
AuthenticationLevel.NONE, null, null, null, null, null, null ).size() );
Set<Name> wrongGroupNames = new HashSet<Name>();
wrongGroupNames.add( new LdapDN( "ou=unrelatedgroup" ) );
- Assert.assertEquals( 0, filter.filter( tuples, OperationScope.ENTRY, null, wrongGroupNames, USER_NAME, null,
+ Assert.assertEquals( 0, filter.filter( null, tuples, OperationScope.ENTRY, null, wrongGroupNames, USER_NAME, null,
AuthenticationLevel.NONE, USER_NAME, null, null, null, null, null ).size() );
}
@@ -147,24 +147,24 @@
{
Collection<ACITuple> tuples = getTuples( AuthenticationLevel.SIMPLE, true );
- Assert.assertEquals( 1, filter.filter( tuples, OperationScope.ENTRY, null, null, null, null,
+ Assert.assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null, null, null, null,
AuthenticationLevel.STRONG, null, null, null, null, null, null ).size() );
- Assert.assertEquals( 1, filter.filter( tuples, OperationScope.ENTRY, null, null, null, null,
+ Assert.assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null, null, null, null,
AuthenticationLevel.SIMPLE, null, null, null, null, null, null ).size() );
- Assert.assertEquals( 0, filter.filter( tuples, OperationScope.ENTRY, null, null, null, null,
+ Assert.assertEquals( 0, filter.filter( null, tuples, OperationScope.ENTRY, null, null, null, null,
AuthenticationLevel.NONE, null, null, null, null, null, null ).size() );
tuples = getTuples( AuthenticationLevel.SIMPLE, false );
- Assert.assertEquals( 1, filter.filter( tuples, OperationScope.ENTRY, null, null, null, null,
+ Assert.assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null, null, null, null,
AuthenticationLevel.NONE, null, null, null, null, null, null ).size() );
- Assert.assertEquals( 0, filter.filter( tuples, OperationScope.ENTRY, null, null, null, null,
+ Assert.assertEquals( 0, filter.filter( null, tuples, OperationScope.ENTRY, null, null, null, null,
AuthenticationLevel.STRONG, null, null, null, null, null, null ).size() );
tuples = getTuples( AuthenticationLevel.SIMPLE, false );
- Assert.assertEquals( 0, filter.filter( tuples, OperationScope.ENTRY, null, null, null, null,
+ Assert.assertEquals( 0, filter.filter( null, tuples, OperationScope.ENTRY, null, null, null, null,
AuthenticationLevel.SIMPLE, null, null, null, null, null, null ).size() );
}
Modified: directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java?rev=607412&r1=607411&r2=607412&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java (original)
+++ directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java Sat Dec 29 03:42:29 2007
@@ -82,10 +82,10 @@
tuples = Collections.unmodifiableCollection( tuples );
- Assert.assertEquals( tuples, filter.filter( tuples, OperationScope.ATTRIBUTE_TYPE, null, null, null, null,
+ Assert.assertEquals( tuples, filter.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE, null, null, null, null,
null, null, null, null, null, null, null ) );
- Assert.assertEquals( tuples, filter.filter( tuples, OperationScope.ENTRY, null, null, null, null, null, null,
+ Assert.assertEquals( tuples, filter.filter( null, tuples, OperationScope.ENTRY, null, null, null, null, null, null,
null, null, null, null, null ) );
}
@@ -94,7 +94,7 @@
{
RestrictedByFilter filter = new RestrictedByFilter();
- Assert.assertEquals( 0, filter.filter( AT_EMPTY_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null,
+ Assert.assertEquals( 0, filter.filter( null, AT_EMPTY_COLLECTION, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null,
null, null, null, null, null, null, null, null, null ).size() );
}
@@ -107,7 +107,7 @@
tuples = Collections.unmodifiableCollection( tuples );
- Assert.assertEquals( tuples, filter.filter( tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, null,
+ Assert.assertEquals( tuples, filter.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, null,
null, null, null, "testAttr", null, ENTRY, null, null ) );
}
@@ -118,13 +118,13 @@
Collection<ACITuple> tuples = new ArrayList<ACITuple>();
tuples.add( new ACITuple( UC_EMPTY_COLLECTION, AuthenticationLevel.NONE, PROTECTED_ITEMS, MO_EMPTY_SET, true, 0 ) );
- Assert.assertEquals( 1, filter.filter( tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, null, null,
+ Assert.assertEquals( 1, filter.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, null, null,
null, null, "choice", "1", ENTRY, null, null ).size() );
- Assert.assertEquals( 1, filter.filter( tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, null, null,
+ Assert.assertEquals( 1, filter.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, null, null,
null, null, "choice", "2", ENTRY, null, null ).size() );
- Assert.assertEquals( 0, filter.filter( tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, null, null,
+ Assert.assertEquals( 0, filter.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, null, null,
null, null, "choice", "3", ENTRY, null, null ).size() );
}
}
Modified: directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java?rev=607412&r1=607411&r2=607412&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java (original)
+++ directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java Sat Dec 29 03:42:29 2007
@@ -101,7 +101,7 @@
try
{
- chain.lookup( new LookupOperationContext( dn ) );
+ chain.lookup( new LookupOperationContext( ds.getRegistries(), dn ) );
}
catch ( Exception e )
{
@@ -127,7 +127,7 @@
try
{
- chain.lookup( new LookupOperationContext( dn ) );
+ chain.lookup( new LookupOperationContext( ds.getRegistries(), dn ) );
}
catch ( Exception e )
{
@@ -156,7 +156,7 @@
try
{
- chain.lookup( new LookupOperationContext( dn ) );
+ chain.lookup( new LookupOperationContext( ds.getRegistries(), dn ) );
}
catch ( Exception e )
{
@@ -185,7 +185,7 @@
try
{
- chain.lookup( new LookupOperationContext( dn ) );
+ chain.lookup( new LookupOperationContext( ds.getRegistries(), dn ) );
}
catch ( Exception e )
{
@@ -213,7 +213,7 @@
try
{
- chain.lookup( new LookupOperationContext( dn ) );
+ chain.lookup( new LookupOperationContext( ds.getRegistries(), dn ) );
}
catch ( Exception e )
{
@@ -238,7 +238,7 @@
try
{
- chain.lookup( new LookupOperationContext( dn ) );
+ chain.lookup( new LookupOperationContext(ds.getRegistries(), dn ) );
}
catch ( Exception e )
{
Modified: directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java?rev=607412&r1=607411&r2=607412&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java (original)
+++ directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java Sat Dec 29 03:42:29 2007
@@ -297,8 +297,15 @@
PartitionNexusProxy proxy = invocation.getProxy();
Attributes userEntry;
- LookupOperationContext lookupContext = new LookupOperationContext( new String[]
- { SchemaConstants.OBJECT_CLASS_AT, KerberosAttribute.KRB5_PRINCIPAL_NAME_AT, KerberosAttribute.KRB5_KEY_VERSION_NUMBER_AT } );
+ LookupOperationContext lookupContext =
+ new LookupOperationContext( modContext.getRegistries(),
+ new String[]
+ {
+ SchemaConstants.OBJECT_CLASS_AT,
+ KerberosAttribute.KRB5_PRINCIPAL_NAME_AT,
+ KerberosAttribute.KRB5_KEY_VERSION_NUMBER_AT
+ } );
+
lookupContext.setDn( principalDn );
userEntry = proxy.lookup( lookupContext, USERLOOKUP_BYPASS );
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/AddEntryOperation.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/AddEntryOperation.java?rev=607412&r1=607411&r2=607412&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/AddEntryOperation.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/AddEntryOperation.java Sat Dec 29 03:42:29 2007
@@ -77,7 +77,7 @@
protected void execute0( PartitionNexus nexus, ReplicationStore store, Registries registries )
throws NamingException
{
- if ( !EntryUtil.isEntryUpdatable( nexus, normalizedName, getCSN() ) )
+ if ( !EntryUtil.isEntryUpdatable( registries, nexus, normalizedName, getCSN() ) )
{
return;
}
@@ -85,7 +85,7 @@
EntryUtil.createGlueEntries( registries, nexus, normalizedName, false );
// Replace the entry if an entry with the same name exists.
- Attributes oldEntry = nexus.lookup( new LookupOperationContext( normalizedName ) );
+ Attributes oldEntry = nexus.lookup( new LookupOperationContext( registries, normalizedName ) );
if ( oldEntry != null )
{
@@ -100,10 +100,10 @@
private void recursiveDelete( PartitionNexus nexus, LdapDN normalizedName, Registries registries )
throws NamingException
{
- NamingEnumeration<SearchResult> ne = nexus.list( new ListOperationContext( normalizedName ) );
+ NamingEnumeration<SearchResult> ne = nexus.list( new ListOperationContext( registries, normalizedName ) );
if ( !ne.hasMore() )
{
- nexus.delete( new DeleteOperationContext( normalizedName ) );
+ nexus.delete( new DeleteOperationContext( registries, normalizedName ) );
return;
}
@@ -115,6 +115,6 @@
recursiveDelete( nexus, dn, registries );
}
- nexus.delete( new DeleteOperationContext( normalizedName ) );
+ nexus.delete( new DeleteOperationContext( registries, normalizedName ) );
}
}
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/AttributeOperation.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/AttributeOperation.java?rev=607412&r1=607411&r2=607412&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/AttributeOperation.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/AttributeOperation.java Sat Dec 29 03:42:29 2007
@@ -81,7 +81,7 @@
protected final void execute0( PartitionNexus nexus, ReplicationStore store, Registries registries )
throws NamingException
{
- if ( !EntryUtil.isEntryUpdatable( nexus, name, getCSN() ) )
+ if ( !EntryUtil.isEntryUpdatable( registries, nexus, name, getCSN() ) )
{
return;
}
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/OperationFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/OperationFactory.java?rev=607412&r1=607411&r2=607412&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/OperationFactory.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/OperationFactory.java Sat Dec 29 03:42:29 2007
@@ -33,6 +33,7 @@
import org.apache.directory.server.core.partition.Partition;
import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
+import org.apache.directory.server.schema.registries.Registries;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.filter.PresenceNode;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
@@ -84,16 +85,21 @@
private final PartitionNexus nexus;
private final UUIDFactory uuidFactory;
private final CSNFactory csnFactory;
+
+ /** The attributeType registry */
private final AttributeTypeRegistry attributeRegistry;
+ /** The global registries */
+ private Registries registries;
public OperationFactory( DirectoryService directoryService, ReplicationConfiguration cfg )
{
- this.replicaId = cfg.getReplicaId();
- this.nexus = directoryService.getPartitionNexus();
- this.uuidFactory = cfg.getUuidFactory();
- this.csnFactory = cfg.getCsnFactory();
- this.attributeRegistry = directoryService.getRegistries().getAttributeTypeRegistry();
+ replicaId = cfg.getReplicaId();
+ nexus = directoryService.getPartitionNexus();
+ uuidFactory = cfg.getUuidFactory();
+ csnFactory = cfg.getCsnFactory();
+ registries = directoryService.getRegistries();
+ attributeRegistry = registries.getAttributeTypeRegistry();
}
@@ -248,7 +254,7 @@
SearchControls ctrl = new SearchControls();
ctrl.setSearchScope( SearchControls.SUBTREE_SCOPE );
NamingEnumeration<SearchResult> e = nexus.search(
- new SearchOperationContext( oldName, AliasDerefMode.DEREF_ALWAYS,
+ new SearchOperationContext( registries, oldName, AliasDerefMode.DEREF_ALWAYS,
new PresenceNode( SchemaConstants.OBJECT_CLASS_AT_OID ), ctrl ) );
while ( e.hasMore() )
@@ -327,9 +333,9 @@
*/
private void checkBeforeAdd( LdapDN newEntryName ) throws NamingException
{
- if ( nexus.hasEntry( new EntryOperationContext( newEntryName ) ) )
+ if ( nexus.hasEntry( new EntryOperationContext( registries, newEntryName ) ) )
{
- Attributes entry = nexus.lookup( new LookupOperationContext( newEntryName ) );
+ Attributes entry = nexus.lookup( new LookupOperationContext( registries, newEntryName ) );
Attribute deleted = entry.get( Constants.ENTRY_DELETED );
Object value = deleted == null ? null : deleted.get();
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/support/EntryUtil.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/support/EntryUtil.java?rev=607412&r1=607411&r2=607412&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/support/EntryUtil.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/operation/support/EntryUtil.java Sat Dec 29 03:42:29 2007
@@ -45,9 +45,9 @@
public class EntryUtil
{
@SuppressWarnings("unchecked")
- public static boolean isEntryUpdatable( PartitionNexus nexus, LdapDN name, CSN newCSN ) throws NamingException
+ public static boolean isEntryUpdatable( Registries registries, PartitionNexus nexus, LdapDN name, CSN newCSN ) throws NamingException
{
- Attributes entry = nexus.lookup( new LookupOperationContext( name ) );
+ Attributes entry = nexus.lookup( new LookupOperationContext( registries, name ) );
if ( entry == null )
{
@@ -108,7 +108,7 @@
{
try
{
- if ( nexus.hasEntry( new EntryOperationContext( name ) ) )
+ if ( nexus.hasEntry( new EntryOperationContext( registries, name ) ) )
{
return;
}
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java?rev=607412&r1=607411&r2=607412&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java Sat Dec 29 03:42:29 2007
@@ -358,7 +358,7 @@
ctrl.setReturningAttributes( new String[] { "entryCSN", "entryDeleted" } );
NamingEnumeration<SearchResult> e = nexus.search(
- new SearchOperationContext( contextName, AliasDerefMode.DEREF_ALWAYS, filter, ctrl ) );
+ new SearchOperationContext( registries, contextName, AliasDerefMode.DEREF_ALWAYS, filter, ctrl ) );
List<LdapDN> names = new ArrayList<LdapDN>();
try
@@ -384,9 +384,9 @@
try
{
name.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
- Attributes entry = nexus.lookup( new LookupOperationContext( name ) );
+ Attributes entry = nexus.lookup( new LookupOperationContext( registries, name ) );
LOG.info( "[Replica-{}] Purge: " + name + " (" + entry + ')', configuration.getReplicaId() );
- nexus.delete( new DeleteOperationContext( name ) );
+ nexus.delete( new DeleteOperationContext( registries, name ) );
}
catch ( NamingException ex )
{
@@ -455,7 +455,7 @@
// Check DELETED attribute.
try
{
- Attributes entry = nextInterceptor.lookup( new LookupOperationContext( entryContext.getDn() ) );
+ Attributes entry = nextInterceptor.lookup( new LookupOperationContext( registries, entryContext.getDn() ) );
hasEntry = !isDeleted( entry );
}
catch ( NameNotFoundException e )
@@ -510,7 +510,7 @@
NamingEnumeration<SearchResult> result = nextInterceptor.search(
new SearchOperationContext(
- opContext.getDn(), opContext.getAliasDerefMode(),
+ registries, opContext.getDn(), opContext.getAliasDerefMode(),
new PresenceNode( SchemaConstants.OBJECT_CLASS_AT_OID ),
new SearchControls() ) );
@@ -534,7 +534,7 @@
}
NamingEnumeration<SearchResult> result = nextInterceptor.search(
- new SearchOperationContext( opContext.getDn(), opContext.getAliasDerefMode(), opContext.getFilter(), searchControls ) );
+ new SearchOperationContext( registries, opContext.getDn(), opContext.getAliasDerefMode(), opContext.getFilter(), searchControls ) );
return new SearchResultFilteringEnumeration( result, searchControls, InvocationStack.getInstance().peek(),
Constants.DELETED_ENTRIES_FILTER, "Search Replication filter" );
}
@@ -544,7 +544,7 @@
if ( isDeleted( entry ) )
{
LdapNameNotFoundException e = new LdapNameNotFoundException( "Deleted entry: " + name.getUpName() );
- e.setResolvedName( nexus.getMatchedName( new GetMatchedNameOperationContext( name ) ) );
+ e.setResolvedName( nexus.getMatchedName( new GetMatchedNameOperationContext( registries, name ) ) );
throw e;
}
}
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java?rev=607412&r1=607411&r2=607412&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java Sat Dec 29 03:42:29 2007
@@ -392,7 +392,7 @@
SearchControls ctrl = new SearchControls();
ctrl.setSearchScope( SearchControls.SUBTREE_SCOPE );
NamingEnumeration<SearchResult> e = ctx.getDirectoryService().getPartitionNexus().search(
- new SearchOperationContext( contextName, AliasDerefMode.DEREF_ALWAYS,
+ new SearchOperationContext( ctx.getDirectoryService().getRegistries(), contextName, AliasDerefMode.DEREF_ALWAYS,
new PresenceNode( SchemaConstants.OBJECT_CLASS_AT_OID ), ctrl ) );
try
Modified: directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LaunchDiagnosticUiHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LaunchDiagnosticUiHandler.java?rev=607412&r1=607411&r2=607412&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LaunchDiagnosticUiHandler.java (original)
+++ directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LaunchDiagnosticUiHandler.java Sat Dec 29 03:42:29 2007
@@ -97,7 +97,7 @@
requestor.write( new LaunchDiagnosticUiResponse( req.getMessageId() ) );
PartitionNexus nexus = service.getPartitionNexus();
- Iterator<String> list = nexus.listSuffixes( new ListSuffixOperationContext() );
+ Iterator<String> list = nexus.listSuffixes( new ListSuffixOperationContext( service.getRegistries() ) );
int launchedWindowCount = 0;
while ( list.hasNext() )
Modified: directory/shared/branches/bigbang/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java?rev=607412&r1=607411&r2=607412&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java (original)
+++ directory/shared/branches/bigbang/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java Sat Dec 29 03:42:29 2007
@@ -156,6 +156,11 @@
String UNIQUE_MEMBER_AT = "uniqueMember";
String UNIQUE_MEMBER_AT_OID = "2.5.4.50";
+ // ExcludeAllColectiveAttributes
+ String EXCLUDE_ALL_COLLECTIVE_ATTRIBUTES_AT = "excludeAllCollectiveAttributes";
+ String EXCLUDE_ALL_COLLECTIVE_ATTRIBUTES_AT_OID = "2.5.18.0";
+
+
// CreateTimestamp
String CREATE_TIMESTAMP_AT = "createTimestamp";
String CREATE_TIMESTAMP_AT_OID = "2.5.18.1";