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 2010/07/01 18:22:26 UTC
svn commit: r959711 - in /directory:
apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/
apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/
shared/trunk/ldap-aci/src/main/antlr/ shared/trunk/...
Author: elecharny
Date: Thu Jul 1 16:22:25 2010
New Revision: 959711
URL: http://svn.apache.org/viewvc?rev=959711&view=rev
Log:
Exported the last classes from the ProtectedItem class
Added:
directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxImmSubItem.java
directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountItem.java
directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByItem.java
Modified:
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/authz/support/MaxValueCountFilter.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.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/authz/support/MaxValueCountFilterTest.java
directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java
directory/shared/trunk/ldap-aci/src/main/antlr/ACIItem.g
directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/ProtectedItem.java
directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItem.java
directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountElem.java
directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByElem.java
directory/shared/trunk/ldap-aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxImmSubTest.java
directory/shared/trunk/ldap-aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxValueCountTest.java
directory/shared/trunk/ldap-aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RestrictedByTest.java
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=959711&r1=959710&r2=959711&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 Thu Jul 1 16:22:25 2010
@@ -41,6 +41,7 @@ import org.apache.directory.server.core.
import org.apache.directory.shared.ldap.aci.ACITuple;
import org.apache.directory.shared.ldap.aci.MicroOperation;
import org.apache.directory.shared.ldap.aci.ProtectedItem;
+import org.apache.directory.shared.ldap.aci.protectedItem.MaxImmSubItem;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.entry.Entry;
@@ -120,14 +121,15 @@ public class MaxImmSubFilter implements
for ( ProtectedItem item : tuple.getProtectedItems() )
{
- if ( item instanceof ProtectedItem.MaxImmSub )
+ if ( item instanceof MaxImmSubItem )
{
if ( immSubCount < 0 )
{
immSubCount = getImmSubCount( opContext, entryName );
}
- ProtectedItem.MaxImmSub mis = ( ProtectedItem.MaxImmSub ) item;
+ MaxImmSubItem mis = ( MaxImmSubItem ) item;
+
if ( immSubCount >= mis.getValue() )
{
i.remove();
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java?rev=959711&r1=959710&r2=959711&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java Thu Jul 1 16:22:25 2010
@@ -28,6 +28,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.aci.MicroOperation;
import org.apache.directory.shared.ldap.aci.ProtectedItem;
import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountElem;
+import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountItem;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -85,9 +86,9 @@ public class MaxValueCountFilter impleme
{
ProtectedItem item = j.next();
- if ( item instanceof ProtectedItem.MaxValueCount )
+ if ( item instanceof MaxValueCountItem )
{
- ProtectedItem.MaxValueCount mvc = ( ProtectedItem.MaxValueCount ) item;
+ MaxValueCountItem mvc = ( MaxValueCountItem ) item;
if ( isRemovable( mvc, attrId, entryView ) )
{
@@ -102,7 +103,7 @@ public class MaxValueCountFilter impleme
}
- private boolean isRemovable( ProtectedItem.MaxValueCount mvc, String attrId, Entry entryView ) throws LdapException
+ private boolean isRemovable( MaxValueCountItem mvc, String attrId, Entry entryView ) throws LdapException
{
for ( Iterator<MaxValueCountElem> k = mvc.iterator(); k.hasNext(); )
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java?rev=959711&r1=959710&r2=959711&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java Thu Jul 1 16:22:25 2010
@@ -34,9 +34,12 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.aci.protectedItem.AttributeTypeItem;
import org.apache.directory.shared.ldap.aci.protectedItem.AttributeValueItem;
import org.apache.directory.shared.ldap.aci.protectedItem.ClassesItem;
+import org.apache.directory.shared.ldap.aci.protectedItem.MaxImmSubItem;
import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountElem;
+import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountItem;
import org.apache.directory.shared.ldap.aci.protectedItem.RangeOfValuesItem;
import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByElem;
+import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByItem;
import org.apache.directory.shared.ldap.aci.protectedItem.SelfValueItem;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
@@ -225,18 +228,19 @@ public class RelatedProtectedItemFilter
return true;
}
}
- else if ( item instanceof ProtectedItem.MaxImmSub )
+ else if ( item instanceof MaxImmSubItem )
{
return true;
}
- else if ( item instanceof ProtectedItem.MaxValueCount )
+ else if ( item instanceof MaxValueCountItem )
{
if ( scope != OperationScope.ATTRIBUTE_TYPE_AND_VALUE )
{
continue;
}
- ProtectedItem.MaxValueCount mvc = ( ProtectedItem.MaxValueCount ) item;
+ MaxValueCountItem mvc = ( MaxValueCountItem ) item;
+
for ( Iterator<MaxValueCountElem> j = mvc.iterator(); j.hasNext(); )
{
MaxValueCountElem mvcItem = j.next();
@@ -256,14 +260,15 @@ public class RelatedProtectedItemFilter
return true;
}
}
- else if ( item instanceof ProtectedItem.RestrictedBy )
+ else if ( item instanceof RestrictedByItem )
{
if ( scope != OperationScope.ATTRIBUTE_TYPE_AND_VALUE )
{
continue;
}
- ProtectedItem.RestrictedBy rb = ( ProtectedItem.RestrictedBy ) item;
+ RestrictedByItem rb = ( RestrictedByItem ) item;
+
for ( Iterator<RestrictedByElem> j = rb.iterator(); j.hasNext(); )
{
RestrictedByElem rbItem = j.next();
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java?rev=959711&r1=959710&r2=959711&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java Thu Jul 1 16:22:25 2010
@@ -28,6 +28,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.aci.MicroOperation;
import org.apache.directory.shared.ldap.aci.ProtectedItem;
import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByElem;
+import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByItem;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -39,7 +40,7 @@ import org.apache.directory.shared.ldap.
/**
* An {@link ACITupleFilter} that discards all tuples that doesn't satisfy
- * {@link org.apache.directory.shared.ldap.aci.ProtectedItem.RestrictedBy} constraint if available. (18.8.3.3, X.501)
+ * {@link org.apache.directory.shared.ldap.aci.ProtectedItem.RestrictedByItem} constraint if available. (18.8.3.3, X.501)
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@@ -95,9 +96,9 @@ public class RestrictedByFilter implemen
{
for ( ProtectedItem item : tuple.getProtectedItems() )
{
- if ( item instanceof ProtectedItem.RestrictedBy )
+ if ( item instanceof RestrictedByItem )
{
- ProtectedItem.RestrictedBy rb = ( ProtectedItem.RestrictedBy ) item;
+ RestrictedByItem rb = ( RestrictedByItem ) item;
for ( Iterator<RestrictedByElem> k = rb.iterator(); k.hasNext(); )
{
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=959711&r1=959710&r2=959711&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 Thu Jul 1 16:22:25 2010
@@ -36,6 +36,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.aci.MicroOperation;
import org.apache.directory.shared.ldap.aci.ProtectedItem;
import org.apache.directory.shared.ldap.aci.UserClass;
+import org.apache.directory.shared.ldap.aci.protectedItem.MaxImmSubItem;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.entry.DefaultEntry;
import org.apache.directory.shared.ldap.entry.Entry;
@@ -92,7 +93,7 @@ public class MaxImmSubFilterTest
}
ENTRY_NAME = new DN( "ou=test, ou=system" );
- PROTECTED_ITEMS.add( new ProtectedItem.MaxImmSub( 2 ) );
+ PROTECTED_ITEMS.add( new MaxImmSubItem( 2 ) );
ENTRY = new DefaultEntry( schemaManager, ENTRY_NAME );
}
Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java?rev=959711&r1=959710&r2=959711&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java Thu Jul 1 16:22:25 2010
@@ -36,6 +36,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.aci.ProtectedItem;
import org.apache.directory.shared.ldap.aci.UserClass;
import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountElem;
+import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountItem;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.entry.DefaultEntry;
import org.apache.directory.shared.ldap.entry.Entry;
@@ -72,7 +73,7 @@ public class MaxValueCountFilterTest
{
Set<MaxValueCountElem> mvcItems = new HashSet<MaxValueCountElem>();
mvcItems.add( new MaxValueCountElem( "cn", 2 ) );
- PROTECTED_ITEMS.add( new ProtectedItem.MaxValueCount( mvcItems ) );
+ PROTECTED_ITEMS.add( new MaxValueCountItem( mvcItems ) );
}
Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java?rev=959711&r1=959710&r2=959711&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java Thu Jul 1 16:22:25 2010
@@ -41,8 +41,11 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.aci.protectedItem.AllAttributeValuesItem;
import org.apache.directory.shared.ldap.aci.protectedItem.AttributeTypeItem;
import org.apache.directory.shared.ldap.aci.protectedItem.AttributeValueItem;
+import org.apache.directory.shared.ldap.aci.protectedItem.MaxImmSubItem;
import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountElem;
+import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountItem;
import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByElem;
+import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByItem;
import org.apache.directory.shared.ldap.aci.protectedItem.SelfValueItem;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.entry.DefaultEntry;
@@ -253,7 +256,7 @@ public class RelatedProtectedItemFilterT
@Test
public void testMaxImmSub() throws Exception
{
- Collection<ACITuple> tuples = getTuples( new ProtectedItem.MaxImmSub( 2 ) );
+ Collection<ACITuple> tuples = getTuples( new MaxImmSubItem( 2 ) );
// Should always retain tuples.
assertEquals( 1, filterA.filter( null, tuples, OperationScope.ENTRY, null, null, USER_NAME, null, null, null,
@@ -266,16 +269,16 @@ public class RelatedProtectedItemFilterT
{
Set<MaxValueCountElem> mvcItems = new HashSet<MaxValueCountElem>();
mvcItems.add( new MaxValueCountElem( "cn", 3 ) );
- Collection<ACITuple> tuples = getTuples( new ProtectedItem.MaxValueCount( mvcItems ) );
+ Collection<ACITuple> tuples = getTuples( new MaxValueCountItem( mvcItems ) );
// Test wrong scope
assertEquals( 0, filterA.filter( null, tuples, OperationScope.ENTRY, null, null, USER_NAME, null, null, null,
"cn", null, null, null, null ).size() );
- tuples = getTuples( new ProtectedItem.MaxValueCount( mvcItems ) );
+ tuples = getTuples( new MaxValueCountItem( mvcItems ) );
assertEquals( 0, filterA.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE, null, null, USER_NAME, null,
null, null, "cn", null, null, null, null ).size() );
- tuples = getTuples( new ProtectedItem.MaxValueCount( mvcItems ) );
+ tuples = getTuples( new MaxValueCountItem( mvcItems ) );
assertEquals( 1, filterA.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME,
null, null, null, "cn", null, null, null, null ).size() );
@@ -310,16 +313,16 @@ public class RelatedProtectedItemFilterT
{
Set<RestrictedByElem> rbItems = new HashSet<RestrictedByElem>();
rbItems.add( new RestrictedByElem( "cn", "sn" ) );
- Collection<ACITuple> tuples = getTuples( new ProtectedItem.RestrictedBy( rbItems ) );
+ Collection<ACITuple> tuples = getTuples( new RestrictedByItem( rbItems ) );
// Test wrong scope
assertEquals( 0, filterA.filter( null, tuples, OperationScope.ENTRY, null, null, USER_NAME, null, null, null,
"cn", null, null, null, null ).size() );
- tuples = getTuples( new ProtectedItem.RestrictedBy( rbItems ) );
+ tuples = getTuples( new RestrictedByItem( rbItems ) );
assertEquals( 0, filterA.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE, null, null, USER_NAME, null,
null, null, "cn", null, null, null, null ).size() );
- tuples = getTuples( new ProtectedItem.RestrictedBy( rbItems ) );
+ tuples = getTuples( new RestrictedByItem( rbItems ) );
assertEquals( 1, filterA.filter( null, tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME,
null, null, null, "cn", null, null, null, null ).size() );
Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java?rev=959711&r1=959710&r2=959711&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java Thu Jul 1 16:22:25 2010
@@ -35,7 +35,9 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.aci.MicroOperation;
import org.apache.directory.shared.ldap.aci.ProtectedItem;
import org.apache.directory.shared.ldap.aci.UserClass;
+import org.apache.directory.shared.ldap.aci.protectedItem.MaxImmSubItem;
import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByElem;
+import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByItem;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.entry.DefaultEntry;
import org.apache.directory.shared.ldap.entry.Entry;
@@ -71,7 +73,7 @@ public class RestrictedByFilterTest
{
Set<RestrictedByElem> mvcItems = new HashSet<RestrictedByElem>();
mvcItems.add( new RestrictedByElem( "sn", "cn" ) );
- PROTECTED_ITEMS.add( new ProtectedItem.RestrictedBy( mvcItems ) );
+ PROTECTED_ITEMS.add( new RestrictedByItem( mvcItems ) );
}
@@ -94,7 +96,7 @@ public class RestrictedByFilterTest
}
DN entryName = new DN( "ou=test, ou=system" );
- PROTECTED_ITEMS.add( new ProtectedItem.MaxImmSub( 2 ) );
+ PROTECTED_ITEMS.add( new MaxImmSubItem( 2 ) );
ENTRY = new DefaultEntry( schemaManager, entryName );
ENTRY.put( "cn", "1", "2" );
Modified: directory/shared/trunk/ldap-aci/src/main/antlr/ACIItem.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-aci/src/main/antlr/ACIItem.g?rev=959711&r1=959710&r2=959711&view=diff
==============================================================================
--- directory/shared/trunk/ldap-aci/src/main/antlr/ACIItem.g (original)
+++ directory/shared/trunk/ldap-aci/src/main/antlr/ACIItem.g Thu Jul 1 16:22:25 2010
@@ -65,8 +65,11 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.aci.protectedItem.ClassesItem;
import org.apache.directory.shared.ldap.aci.protectedItem.EntryItem;
import org.apache.directory.shared.ldap.aci.protectedItem.RangeOfValuesItem;
+import org.apache.directory.shared.ldap.aci.protectedItem.MaxImmSubItem;
import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountElem;
+import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountItem;
import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByElem;
+import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByItem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -569,7 +572,7 @@ maxValueCount
)*
CLOSE_CURLY
{
- protectedItemsMap.put( "maxValueCount", new ProtectedItem.MaxValueCount( maxValueCountSet ) );
+ protectedItemsMap.put( "maxValueCount", new MaxValueCountItem( maxValueCountSet ) );
}
;
@@ -606,7 +609,7 @@ maxImmSub
{
protectedItemsMap.put( "maxImmSub",
- new ProtectedItem.MaxImmSub(
+ new MaxImmSubItem(
token2Integer( token ) ) );
}
;
@@ -631,7 +634,7 @@ restrictedBy
)*
CLOSE_CURLY
{
- protectedItemsMap.put( "restrictedBy", new ProtectedItem.RestrictedBy( restrictedBy ) );
+ protectedItemsMap.put( "restrictedBy", new RestrictedByItem( restrictedBy ) );
}
;
Modified: directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/ProtectedItem.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/ProtectedItem.java?rev=959711&r1=959710&r2=959711&view=diff
==============================================================================
--- directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/ProtectedItem.java (original)
+++ directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/ProtectedItem.java Thu Jul 1 16:22:25 2010
@@ -20,21 +20,28 @@
package org.apache.directory.shared.ldap.aci;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Set;
-
import org.apache.directory.shared.ldap.aci.protectedItem.AllUserAttributeTypesAndValuesItem;
import org.apache.directory.shared.ldap.aci.protectedItem.AllUserAttributeTypesItem;
import org.apache.directory.shared.ldap.aci.protectedItem.EntryItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountElem;
-import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByElem;
/**
* Defines the items to which the access controls apply. It's one of the
* following elements :
- *
+ * <ul>
+ * <li>AllAttributeValuesItem</li>
+ * <li>AllUserAttributeTypesAndValuesItem</li>
+ * <li>AllUserAttributeTypesItem</li>
+ * <li>AttributeTypeItem</li>
+ * <li>AttributeValueItem</li>
+ * <li>ClassesItem</li>
+ * <li>EntryItem</li>
+ * <li>MaxImmSubItem</li>
+ * <li>MaxValueCountItem</li>
+ * <li>RangeOfValuesItem</li>
+ * <li>RestrictedByItem</li>
+ * <li>SelfValueItem</li>
+ * </ul>
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@@ -69,283 +76,4 @@ public abstract class ProtectedItem
protected ProtectedItem()
{
}
-
-
- /**
- * Restricts the maximum number of attribute values allowed for a specified
- * attribute type. It is examined if the protected item is an attribute
- * value of the specified type and the permission sought is add. Values of
- * that attribute in the entry are counted without regard to context or
- * access control and as though the operation which adds the values were
- * successful. If the number of values in the attribute exceeds maxCount,
- * the ACI item is treated as not granting add access.
- */
- public static class MaxValueCount extends ProtectedItem
- {
- private final Set<MaxValueCountElem> items;
-
-
- /**
- * Creates a new instance.
- *
- * @param items
- * the collection of {@link MaxValueCountElem}s.
- */
- public MaxValueCount( Set<MaxValueCountElem> items )
- {
- this.items = Collections.unmodifiableSet( items );
- }
-
-
- /**
- * Returns an iterator of all {@link MaxValueCountElem}s.
- */
- public Iterator<MaxValueCountElem> iterator()
- {
- return items.iterator();
- }
-
-
- /**
- * {@inheritDoc}
- */
- @Override
- public int hashCode()
- {
- int hash = 37;
- hash = hash * 17 + items.hashCode();
- return hash;
- }
-
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean equals( Object o )
- {
- if ( this == o )
- {
- return true;
- }
-
- if ( o == null )
- {
- return false;
- }
-
- if ( o instanceof MaxValueCount )
- {
- MaxValueCount that = ( MaxValueCount ) o;
- return this.items.equals( that.items );
- }
-
- return false;
- }
-
-
- public String toString()
- {
- StringBuilder buf = new StringBuilder();
-
- buf.append( "maxValueCount {" );
-
- boolean isFirst = true;
-
- for ( MaxValueCountElem item : items )
- {
- if ( isFirst )
- {
- isFirst = false;
- }
- else
- {
- buf.append( ", " );
- }
-
- buf.append( item.toString() );
- }
-
- buf.append( "}" );
-
- return buf.toString();
- }
- }
-
-
- /**
- * Restricts the maximum number of immediate subordinates of the superior
- * entry to an entry being added or imported. It is examined if the
- * protected item is an entry, the permission sought is add or import, and
- * the immediate superior entry is in the same DSA as the entry being added
- * or imported. Immediate subordinates of the superior entry are counted
- * without regard to context or access control as though the entry addition
- * or importing were successful. If the number of subordinates exceeds
- * maxImmSub, the ACI item is treated as not granting add or import access.
- */
- public static class MaxImmSub extends ProtectedItem
- {
- private final int value;
-
-
- /**
- * Creates a new instance.
- *
- * @param value
- * The maximum number of immediate subordinates
- */
- public MaxImmSub( int value )
- {
- this.value = value;
- }
-
-
- /**
- * Returns the maximum number of immediate subordinates.
- */
- public int getValue()
- {
- return value;
- }
-
-
- /**
- * {@inheritDoc}
- */
- @Override
- public int hashCode()
- {
- int hash = 37;
- hash = hash * 17 + value;
- return hash;
- }
-
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean equals( Object o )
- {
- if ( this == o )
- {
- return true;
- }
-
- if ( o instanceof MaxImmSub )
- {
- MaxImmSub that = ( MaxImmSub ) o;
- return this.value == that.value;
- }
-
- return false;
- }
-
-
- public String toString()
- {
- return "maxImmSub " + value;
- }
- }
-
- /**
- * Restricts values added to the attribute type to being values that are
- * already present in the same entry as values of the attribute valuesIn. It
- * is examined if the protected item is an attribute value of the specified
- * type and the permission sought is add. Values of the valuesIn attribute
- * are checked without regard to context or access control and as though the
- * operation which adds the values were successful. If the value to be added
- * is not present in valuesIn the ACI item is treated as not granting add
- * access.
- */
- public static class RestrictedBy extends ProtectedItem
- {
- private final Set<RestrictedByElem> items;
-
-
- /**
- * Creates a new instance.
- *
- * @param items the collection of {@link RestrictedByElem}s.
- */
- public RestrictedBy( Set<RestrictedByElem> items )
- {
- this.items = Collections.unmodifiableSet( items );
- }
-
-
- /**
- * Returns an iterator of all {@link RestrictedByElem}s.
- */
- public Iterator<RestrictedByElem> iterator()
- {
- return items.iterator();
- }
-
-
- /**
- * {@inheritDoc}
- */
- @Override
- public int hashCode()
- {
- int hash = 37;
- hash = hash * 17 + items.hashCode();
- return hash;
- }
-
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean equals( Object o )
- {
- if ( this == o )
- {
- return true;
- }
-
- if ( o == null )
- {
- return false;
- }
-
- if ( o instanceof RestrictedBy )
- {
- RestrictedBy that = ( RestrictedBy ) o;
- return this.items.equals( that.items );
- }
-
- return false;
- }
-
-
- public String toString()
- {
- StringBuilder buf = new StringBuilder();
-
- buf.append( "restrictedBy {" );
-
- boolean isFirst = true;
-
- for ( RestrictedByElem item : items )
- {
- if ( isFirst )
- {
- isFirst = false;
- }
- else
- {
- buf.append( ", " );
- }
-
- buf.append( item.toString() );
- }
-
- buf.append( '}' );
-
- return buf.toString();
- }
- }
}
Modified: directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItem.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItem.java?rev=959711&r1=959710&r2=959711&view=diff
==============================================================================
--- directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItem.java (original)
+++ directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItem.java Thu Jul 1 16:22:25 2010
@@ -33,6 +33,7 @@ import org.apache.directory.shared.ldap.
*/
public class AttributeValueItem extends ProtectedItem
{
+ /** The protected Attributes */
private final Set<EntryAttribute> attributes;
Added: directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxImmSubItem.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxImmSubItem.java?rev=959711&view=auto
==============================================================================
--- directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxImmSubItem.java (added)
+++ directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxImmSubItem.java Thu Jul 1 16:22:25 2010
@@ -0,0 +1,80 @@
+
+package org.apache.directory.shared.ldap.aci.protectedItem;
+
+import org.apache.directory.shared.ldap.aci.ProtectedItem;
+
+
+/**
+ * Restricts the maximum number of immediate subordinates of the superior
+ * entry to an entry being added or imported. It is examined if the
+ * protected item is an entry, the permission sought is add or import, and
+ * the immediate superior entry is in the same DSA as the entry being added
+ * or imported. Immediate subordinates of the superior entry are counted
+ * without regard to context or access control as though the entry addition
+ * or importing were successful. If the number of subordinates exceeds
+ * maxImmSub, the ACI item is treated as not granting add or import access.
+ */
+public class MaxImmSubItem extends ProtectedItem
+{
+ /** The maximum number of allowed subordinates */
+ private final int value;
+
+
+ /**
+ * Creates a new instance.
+ *
+ * @param value The maximum number of immediate subordinates
+ */
+ public MaxImmSubItem( int value )
+ {
+ this.value = value;
+ }
+
+
+ /**
+ * Returns the maximum number of immediate subordinates.
+ */
+ public int getValue()
+ {
+ return value;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public int hashCode()
+ {
+ int hash = 37;
+ hash = hash * 17 + value;
+ return hash;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean equals( Object o )
+ {
+ if ( this == o )
+ {
+ return true;
+ }
+
+ if ( o instanceof MaxImmSubItem )
+ {
+ MaxImmSubItem that = ( MaxImmSubItem ) o;
+ return this.value == that.value;
+ }
+
+ return false;
+ }
+
+
+ public String toString()
+ {
+ return "maxImmSub " + value;
+ }
+}
Modified: directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountElem.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountElem.java?rev=959711&r1=959710&r2=959711&view=diff
==============================================================================
--- directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountElem.java (original)
+++ directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountElem.java Thu Jul 1 16:22:25 2010
@@ -19,14 +19,13 @@
*/
package org.apache.directory.shared.ldap.aci.protectedItem;
-import org.apache.directory.shared.ldap.aci.ProtectedItem.MaxValueCount;
/**
* An element of {@link MaxValueCount}.
*/
public class MaxValueCountElem
{
- /** The targetted AttributeType */
+ /** The targeted AttributeType */
private String attributeType;
/** The maximum number of accepted values for this attributeType */
Added: directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountItem.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountItem.java?rev=959711&view=auto
==============================================================================
--- directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountItem.java (added)
+++ directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountItem.java Thu Jul 1 16:22:25 2010
@@ -0,0 +1,110 @@
+
+package org.apache.directory.shared.ldap.aci.protectedItem;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.apache.directory.shared.ldap.aci.ProtectedItem;
+
+/**
+ * Restricts the maximum number of attribute values allowed for a specified
+ * attribute type. It is examined if the protected item is an attribute
+ * value of the specified type and the permission sought is add. Values of
+ * that attribute in the entry are counted without regard to context or
+ * access control and as though the operation which adds the values were
+ * successful. If the number of values in the attribute exceeds maxCount,
+ * the ACI item is treated as not granting add access.
+ */
+public class MaxValueCountItem extends ProtectedItem
+{
+ /** The set of elements to protect */
+ private final Set<MaxValueCountElem> items;
+
+
+ /**
+ * Creates a new instance.
+ *
+ * @param items
+ * the collection of {@link MaxValueCountElem}s.
+ */
+ public MaxValueCountItem( Set<MaxValueCountElem> items )
+ {
+ this.items = Collections.unmodifiableSet( items );
+ }
+
+
+ /**
+ * Returns an iterator of all {@link MaxValueCountElem}s.
+ */
+ public Iterator<MaxValueCountElem> iterator()
+ {
+ return items.iterator();
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public int hashCode()
+ {
+ int hash = 37;
+ hash = hash * 17 + items.hashCode();
+ return hash;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean equals( Object o )
+ {
+ if ( this == o )
+ {
+ return true;
+ }
+
+ if ( o == null )
+ {
+ return false;
+ }
+
+ if ( o instanceof MaxValueCountItem )
+ {
+ MaxValueCountItem that = ( MaxValueCountItem ) o;
+ return this.items.equals( that.items );
+ }
+
+ return false;
+ }
+
+
+ public String toString()
+ {
+ StringBuilder buf = new StringBuilder();
+
+ buf.append( "maxValueCount {" );
+
+ boolean isFirst = true;
+
+ for ( MaxValueCountElem item : items )
+ {
+ if ( isFirst )
+ {
+ isFirst = false;
+ }
+ else
+ {
+ buf.append( ", " );
+ }
+
+ buf.append( item.toString() );
+ }
+
+ buf.append( "}" );
+
+ return buf.toString();
+ }
+}
Modified: directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByElem.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByElem.java?rev=959711&r1=959710&r2=959711&view=diff
==============================================================================
--- directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByElem.java (original)
+++ directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByElem.java Thu Jul 1 16:22:25 2010
@@ -19,10 +19,9 @@
*/
package org.apache.directory.shared.ldap.aci.protectedItem;
-import org.apache.directory.shared.ldap.aci.ProtectedItem.RestrictedBy;
/**
- * An element of {@link RestrictedBy}.
+ * An element of {@link RestrictedByItem}.
*/
public class RestrictedByElem
{
Added: directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByItem.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByItem.java?rev=959711&view=auto
==============================================================================
--- directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByItem.java (added)
+++ directory/shared/trunk/ldap-aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByItem.java Thu Jul 1 16:22:25 2010
@@ -0,0 +1,128 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.shared.ldap.aci.protectedItem;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.apache.directory.shared.ldap.aci.ProtectedItem;
+
+/**
+ * Restricts values added to the attribute type to being values that are
+ * already present in the same entry as values of the attribute valuesIn. It
+ * is examined if the protected item is an attribute value of the specified
+ * type and the permission sought is add. Values of the valuesIn attribute
+ * are checked without regard to context or access control and as though the
+ * operation which adds the values were successful. If the value to be added
+ * is not present in valuesIn the ACI item is treated as not granting add
+ * access.
+ */
+public class RestrictedByItem extends ProtectedItem
+{
+ /** The set of restricted elements */
+ private final Set<RestrictedByElem> items;
+
+
+ /**
+ * Creates a new instance.
+ *
+ * @param items the collection of {@link RestrictedByElem}s.
+ */
+ public RestrictedByItem( Set<RestrictedByElem> items )
+ {
+ this.items = Collections.unmodifiableSet( items );
+ }
+
+
+ /**
+ * Returns an iterator of all {@link RestrictedByElem}s.
+ */
+ public Iterator<RestrictedByElem> iterator()
+ {
+ return items.iterator();
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public int hashCode()
+ {
+ int hash = 37;
+ hash = hash * 17 + items.hashCode();
+ return hash;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean equals( Object o )
+ {
+ if ( this == o )
+ {
+ return true;
+ }
+
+ if ( o == null )
+ {
+ return false;
+ }
+
+ if ( o instanceof RestrictedByItem )
+ {
+ RestrictedByItem that = ( RestrictedByItem ) o;
+ return this.items.equals( that.items );
+ }
+
+ return false;
+ }
+
+
+ public String toString()
+ {
+ StringBuilder buf = new StringBuilder();
+
+ buf.append( "restrictedBy {" );
+
+ boolean isFirst = true;
+
+ for ( RestrictedByElem item : items )
+ {
+ if ( isFirst )
+ {
+ isFirst = false;
+ }
+ else
+ {
+ buf.append( ", " );
+ }
+
+ buf.append( item.toString() );
+ }
+
+ buf.append( '}' );
+
+ return buf.toString();
+ }
+}
Modified: directory/shared/trunk/ldap-aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxImmSubTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxImmSubTest.java?rev=959711&r1=959710&r2=959711&view=diff
==============================================================================
--- directory/shared/trunk/ldap-aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxImmSubTest.java (original)
+++ directory/shared/trunk/ldap-aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxImmSubTest.java Thu Jul 1 16:22:25 2010
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertFal
import org.apache.directory.junit.tools.Concurrent;
import org.apache.directory.junit.tools.ConcurrentJunitRunner;
-import org.apache.directory.shared.ldap.aci.ProtectedItem.MaxImmSub;
+import org.apache.directory.shared.ldap.aci.protectedItem.MaxImmSubItem;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -40,10 +40,10 @@ import org.junit.runner.RunWith;
@Concurrent()
public class ProtectedItem_MaxImmSubTest
{
- MaxImmSub maxValueCountA;
- MaxImmSub maxValueCountACopy;
- MaxImmSub maxValueCountB;
- MaxImmSub maxValueCountC;
+ MaxImmSubItem maxValueCountA;
+ MaxImmSubItem maxValueCountACopy;
+ MaxImmSubItem maxValueCountB;
+ MaxImmSubItem maxValueCountC;
/**
@@ -52,10 +52,9 @@ public class ProtectedItem_MaxImmSubTest
@Before
public void initNames() throws Exception
{
-
- MaxImmSub misA = new MaxImmSub( 1 );
- MaxImmSub misB = new MaxImmSub( 1 );
- MaxImmSub misC = new MaxImmSub( 2 );
+ MaxImmSubItem misA = new MaxImmSubItem( 1 );
+ MaxImmSubItem misB = new MaxImmSubItem( 1 );
+ MaxImmSubItem misC = new MaxImmSubItem( 2 );
maxValueCountA = misA;
maxValueCountACopy = misA;
Modified: directory/shared/trunk/ldap-aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxValueCountTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxValueCountTest.java?rev=959711&r1=959710&r2=959711&view=diff
==============================================================================
--- directory/shared/trunk/ldap-aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxValueCountTest.java (original)
+++ directory/shared/trunk/ldap-aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxValueCountTest.java Thu Jul 1 16:22:25 2010
@@ -28,8 +28,8 @@ import java.util.Set;
import org.apache.directory.junit.tools.Concurrent;
import org.apache.directory.junit.tools.ConcurrentJunitRunner;
-import org.apache.directory.shared.ldap.aci.ProtectedItem.MaxValueCount;
import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountElem;
+import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountItem;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -44,10 +44,10 @@ import org.junit.runner.RunWith;
@Concurrent()
public class ProtectedItem_MaxValueCountTest
{
- MaxValueCount maxValueCountA;
- MaxValueCount maxValueCountACopy;
- MaxValueCount maxValueCountB;
- MaxValueCount maxValueCountC;
+ MaxValueCountItem maxValueCountA;
+ MaxValueCountItem maxValueCountACopy;
+ MaxValueCountItem maxValueCountB;
+ MaxValueCountItem maxValueCountC;
/**
@@ -75,10 +75,10 @@ public class ProtectedItem_MaxValueCount
colC.add( mvciC );
colC.add( mvciD );
- maxValueCountA = new MaxValueCount( colA );
- maxValueCountACopy = new MaxValueCount( colA );
- maxValueCountB = new MaxValueCount( colB );
- maxValueCountC = new MaxValueCount( colC );
+ maxValueCountA = new MaxValueCountItem( colA );
+ maxValueCountACopy = new MaxValueCountItem( colA );
+ maxValueCountB = new MaxValueCountItem( colB );
+ maxValueCountC = new MaxValueCountItem( colC );
}
Modified: directory/shared/trunk/ldap-aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RestrictedByTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RestrictedByTest.java?rev=959711&r1=959710&r2=959711&view=diff
==============================================================================
--- directory/shared/trunk/ldap-aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RestrictedByTest.java (original)
+++ directory/shared/trunk/ldap-aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RestrictedByTest.java Thu Jul 1 16:22:25 2010
@@ -28,8 +28,8 @@ import java.util.Set;
import org.apache.directory.junit.tools.Concurrent;
import org.apache.directory.junit.tools.ConcurrentJunitRunner;
-import org.apache.directory.shared.ldap.aci.ProtectedItem.RestrictedBy;
import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByElem;
+import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByItem;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -44,10 +44,10 @@ import org.junit.runner.RunWith;
@Concurrent()
public class ProtectedItem_RestrictedByTest
{
- RestrictedBy restrictedByA;
- RestrictedBy restrictedByACopy;
- RestrictedBy restrictedByB;
- RestrictedBy restrictedByC;
+ RestrictedByItem restrictedByA;
+ RestrictedByItem restrictedByACopy;
+ RestrictedByItem restrictedByB;
+ RestrictedByItem restrictedByC;
/**
@@ -74,10 +74,10 @@ public class ProtectedItem_RestrictedByT
colC.add( rbiC );
colC.add( rbiD );
- restrictedByA = new RestrictedBy( colA );
- restrictedByACopy = new RestrictedBy( colA );
- restrictedByB = new RestrictedBy( colB );
- restrictedByC = new RestrictedBy( colC );
+ restrictedByA = new RestrictedByItem( colA );
+ restrictedByACopy = new RestrictedByItem( colA );
+ restrictedByB = new RestrictedByItem( colB );
+ restrictedByC = new RestrictedByItem( colC );
}