Modified: directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java (original)
+++ directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java Wed Apr 21 22:51:27 2010
@@ -42,13 +42,13 @@ import javax.naming.directory.BasicAttri
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.entry.BinaryValue;
+import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.entry.StringValue;
import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.ServerEntry;
import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
import org.apache.directory.shared.ldap.exception.LdapException;
import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
@@ -241,11 +241,11 @@ public class DefaultServerEntryTest
{
Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
- EntryAttribute oc = new DefaultClientAttribute( atObjectClass, "top", "person" );
- EntryAttribute cn = new DefaultClientAttribute( atCN, "test1", "test2" );
- EntryAttribute sn = new DefaultClientAttribute( atSN, "Test1", "Test2" );
- EntryAttribute up = new DefaultClientAttribute( atPwd, BYTES1, BYTES2 );
- EntryAttribute c = new DefaultClientAttribute( atC, "FR", "US" );
+ EntryAttribute oc = new DefaultEntryAttribute( atObjectClass, "top", "person" );
+ EntryAttribute cn = new DefaultEntryAttribute( atCN, "test1", "test2" );
+ EntryAttribute sn = new DefaultEntryAttribute( atSN, "Test1", "Test2" );
+ EntryAttribute up = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2 );
+ EntryAttribute c = new DefaultEntryAttribute( atC, "FR", "US" );
entry.add( oc, cn, sn, c );
@@ -258,7 +258,7 @@ public class DefaultServerEntryTest
EntryAttribute attr = entry.get( "objectclass" );
assertEquals( 2, attr.size() );
- EntryAttribute c2 = new DefaultClientAttribute( atC, "UK", "DE" );
+ EntryAttribute c2 = new DefaultEntryAttribute( atC, "UK", "DE" );
entry.add( c2, up );
assertEquals( 5, entry.size() );
@@ -1360,7 +1360,7 @@ public class DefaultServerEntryTest
assertFalse( entry.contains( (AttributeType )null, BYTES1 ) );
assertFalse( entry.contains( atPwd, BYTES1 ) );
- EntryAttribute attrPWD = new DefaultClientAttribute( atPwd, BYTES1, BYTES2 );
+ EntryAttribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2 );
assertFalse( entry.contains( attrPWD ) );
@@ -1383,7 +1383,7 @@ public class DefaultServerEntryTest
assertFalse( entry.contains( (AttributeType )null, "test" ) );
assertFalse( entry.contains( atCN, "test" ) );
- EntryAttribute attrCN = new DefaultClientAttribute( atCN, "test1", "test2" );
+ EntryAttribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
assertFalse( entry.contains( attrCN ) );
@@ -1416,8 +1416,8 @@ public class DefaultServerEntryTest
assertFalse( entry.contains( (String)null, strValue1 ) );
assertFalse( entry.contains( atCN, binValue1 ) );
- EntryAttribute attrCN = new DefaultClientAttribute( atCN, strValue1, strValue2 );
- EntryAttribute attrPWD = new DefaultClientAttribute( atPwd, binValue1, binValue2, binNullValue );
+ EntryAttribute attrCN = new DefaultEntryAttribute( atCN, strValue1, strValue2 );
+ EntryAttribute attrPWD = new DefaultEntryAttribute( atPwd, binValue1, binValue2, binNullValue );
entry.add( attrCN, attrPWD );
@@ -1438,10 +1438,10 @@ public class DefaultServerEntryTest
{
Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
- EntryAttribute attrOC = new DefaultClientAttribute( atOC, "top", "person" );
- EntryAttribute attrCN = new DefaultClientAttribute( atCN, "test1", "test2" );
- EntryAttribute attrSN = new DefaultClientAttribute( atSN, "Test1", "Test2" );
- EntryAttribute attrPWD = new DefaultClientAttribute( atPwd, BYTES1, BYTES2 );
+ EntryAttribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
+ EntryAttribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
+ EntryAttribute attrSN = new DefaultEntryAttribute( atSN, "Test1", "Test2" );
+ EntryAttribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2 );
assertFalse( entry.contains( attrOC, attrCN ) );
@@ -1471,7 +1471,7 @@ public class DefaultServerEntryTest
assertFalse( entry.contains( (String)null, BYTES3 ) );
assertFalse( entry.containsAttribute( "objectClass" ) );
- EntryAttribute attrPWD = new DefaultClientAttribute( atPwd, BYTES1, (byte[])null, BYTES2 );
+ EntryAttribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, (byte[])null, BYTES2 );
entry.add( attrPWD );
@@ -1495,7 +1495,7 @@ public class DefaultServerEntryTest
assertFalse( entry.contains( (String)null, "test" ) );
assertFalse( entry.containsAttribute( "objectClass" ) );
- EntryAttribute attrDC = new DefaultClientAttribute( atDC, "test1", (String)null, "test2" );
+ EntryAttribute attrDC = new DefaultEntryAttribute( atDC, "test1", (String)null, "test2" );
entry.add( attrDC );
@@ -1519,8 +1519,8 @@ public class DefaultServerEntryTest
assertFalse( entry.contains( (String)null, "test" ) );
assertFalse( entry.containsAttribute( "objectClass" ) );
- EntryAttribute attrDC = new DefaultClientAttribute( atDC, "test1", "test2", (String)null );
- EntryAttribute attrPWD = new DefaultClientAttribute( atPwd, BYTES1, BYTES2, (byte[])null );
+ EntryAttribute attrDC = new DefaultEntryAttribute( atDC, "test1", "test2", (String)null );
+ EntryAttribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2, (byte[])null );
entry.add( attrDC, attrPWD );
@@ -1553,10 +1553,10 @@ public class DefaultServerEntryTest
assertFalse( entry.containsAttribute( atOC ) );
- EntryAttribute attrOC = new DefaultClientAttribute( atOC, "top", "person" );
- EntryAttribute attrCN = new DefaultClientAttribute( atCN, "test1", "test2" );
- EntryAttribute attrSN = new DefaultClientAttribute( atSN, "Test1", "Test2" );
- EntryAttribute attrPWD = new DefaultClientAttribute( atPwd, BYTES1, BYTES2 );
+ EntryAttribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
+ EntryAttribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
+ EntryAttribute attrSN = new DefaultEntryAttribute( atSN, "Test1", "Test2" );
+ EntryAttribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2 );
entry.add( attrOC, attrCN, attrSN, attrPWD );
@@ -1584,10 +1584,10 @@ public class DefaultServerEntryTest
assertFalse( entry.containsAttribute( "objectClass" ) );
- EntryAttribute attrOC = new DefaultClientAttribute( atOC, "top", "person" );
- EntryAttribute attrCN = new DefaultClientAttribute( atCN, "test1", "test2" );
- EntryAttribute attrSN = new DefaultClientAttribute( atSN, "Test1", "Test2" );
- EntryAttribute attrPWD = new DefaultClientAttribute( atPwd, BYTES1, BYTES2 );
+ EntryAttribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
+ EntryAttribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
+ EntryAttribute attrSN = new DefaultEntryAttribute( atSN, "Test1", "Test2" );
+ EntryAttribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2 );
entry.add( attrOC, attrCN, attrSN, attrPWD );
@@ -1620,10 +1620,10 @@ public class DefaultServerEntryTest
entry2.setDn( EXAMPLE_DN );
assertEquals( entry1, entry2 );
- EntryAttribute attrOC = new DefaultClientAttribute( "objectClass", atOC, "top", "person" );
- EntryAttribute attrCN = new DefaultClientAttribute( "cn", atCN, "test1", "test2" );
- EntryAttribute attrSN = new DefaultClientAttribute( "sn", atSN, "Test1", "Test2" );
- EntryAttribute attrPWD = new DefaultClientAttribute( "userPassword", atPwd, BYTES1, BYTES2 );
+ EntryAttribute attrOC = new DefaultEntryAttribute( "objectClass", atOC, "top", "person" );
+ EntryAttribute attrCN = new DefaultEntryAttribute( "cn", atCN, "test1", "test2" );
+ EntryAttribute attrSN = new DefaultEntryAttribute( "sn", atSN, "Test1", "Test2" );
+ EntryAttribute attrPWD = new DefaultEntryAttribute( "userPassword", atPwd, BYTES1, BYTES2 );
entry1.put( attrOC, attrCN, attrSN, attrPWD );
entry2.put( attrOC, attrCN, attrSN );
@@ -1632,8 +1632,8 @@ public class DefaultServerEntryTest
entry2.put( attrPWD );
assertEquals( entry1, entry2 );
- EntryAttribute attrL1 = new DefaultClientAttribute( "l", atL, "Paris", "New-York" );
- EntryAttribute attrL2 = new DefaultClientAttribute( "l", atL, "Paris", "Tokyo" );
+ EntryAttribute attrL1 = new DefaultEntryAttribute( "l", atL, "Paris", "New-York" );
+ EntryAttribute attrL2 = new DefaultEntryAttribute( "l", atL, "Paris", "Tokyo" );
entry1.put( attrL1 );
entry2.put( attrL1 );
@@ -1661,10 +1661,10 @@ public class DefaultServerEntryTest
assertEquals( 0, entry.getAttributeTypes().size() );
- EntryAttribute attrOC = new DefaultClientAttribute( atOC, "top", "person" );
- EntryAttribute attrCN = new DefaultClientAttribute( atCN, "test1", "test2" );
- EntryAttribute attrSN = new DefaultClientAttribute( atSN, "Test1", "Test2" );
- EntryAttribute attrPWD = new DefaultClientAttribute( atPwd, BYTES1, BYTES2 );
+ EntryAttribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
+ EntryAttribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
+ EntryAttribute attrSN = new DefaultEntryAttribute( atSN, "Test1", "Test2" );
+ EntryAttribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2 );
entry.add( attrOC, attrCN, attrSN, attrPWD );
@@ -1690,10 +1690,10 @@ public class DefaultServerEntryTest
assertNull( entry.get( atCN ) );
assertNull( entry.get( (AttributeType)null ) );
- EntryAttribute attrOC = new DefaultClientAttribute( atOC, "top", "person" );
- EntryAttribute attrCN = new DefaultClientAttribute( atCN, "test1", "test2" );
- EntryAttribute attrSN = new DefaultClientAttribute( atSN, "Test1", "Test2" );
- EntryAttribute attrPWD = new DefaultClientAttribute( atPwd, BYTES1, BYTES2 );
+ EntryAttribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
+ EntryAttribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
+ EntryAttribute attrSN = new DefaultEntryAttribute( atSN, "Test1", "Test2" );
+ EntryAttribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2 );
entry.add( attrOC, attrCN, attrSN, attrPWD );
@@ -1717,10 +1717,10 @@ public class DefaultServerEntryTest
assertNull( entry.get( "cn" ) );
assertNull( entry.get( "badId" ) );
- EntryAttribute attrOC = new DefaultClientAttribute( atOC, "top", "person" );
- EntryAttribute attrCN = new DefaultClientAttribute( atCN, "test1", "test2" );
- EntryAttribute attrSN = new DefaultClientAttribute( atSN, "Test1", "Test2" );
- EntryAttribute attrPWD = new DefaultClientAttribute( atPwd, BYTES1, BYTES2 );
+ EntryAttribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
+ EntryAttribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
+ EntryAttribute attrSN = new DefaultEntryAttribute( atSN, "Test1", "Test2" );
+ EntryAttribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2 );
entry.add( attrOC, attrCN, attrSN, attrPWD );
@@ -1770,10 +1770,10 @@ public class DefaultServerEntryTest
assertEquals( entry1.hashCode(), entry2.hashCode() );
- EntryAttribute attrOC = new DefaultClientAttribute( "objectClass", atOC, "top", "person" );
- EntryAttribute attrCN = new DefaultClientAttribute( "cn", atCN, "test1", "test2" );
- EntryAttribute attrSN = new DefaultClientAttribute( "sn", atSN, "Test1", "Test2" );
- EntryAttribute attrPWD = new DefaultClientAttribute( "userPassword", atPwd, BYTES1, BYTES2 );
+ EntryAttribute attrOC = new DefaultEntryAttribute( "objectClass", atOC, "top", "person" );
+ EntryAttribute attrCN = new DefaultEntryAttribute( "cn", atCN, "test1", "test2" );
+ EntryAttribute attrSN = new DefaultEntryAttribute( "sn", atSN, "Test1", "Test2" );
+ EntryAttribute attrPWD = new DefaultEntryAttribute( "userPassword", atPwd, BYTES1, BYTES2 );
entry1.add( attrOC, attrCN, attrSN, attrPWD );
entry2.add( attrOC, attrCN, attrSN, attrPWD );
@@ -1795,7 +1795,7 @@ public class DefaultServerEntryTest
{
ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
- EntryAttribute attrOC = new DefaultClientAttribute( atOC, "top", "person" );
+ EntryAttribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
assertFalse( entry.contains( attrOC ) );
assertFalse( entry.hasObjectClass( attrOC ) );
@@ -1804,14 +1804,14 @@ public class DefaultServerEntryTest
assertTrue( entry.hasObjectClass( attrOC ) );
- EntryAttribute attrOC2 = new DefaultClientAttribute( atOC, "person" );
+ EntryAttribute attrOC2 = new DefaultEntryAttribute( atOC, "person" );
assertTrue( entry.hasObjectClass( attrOC2 ) );
- EntryAttribute attrOC3 = new DefaultClientAttribute( atOC, "inetOrgPerson" );
+ EntryAttribute attrOC3 = new DefaultEntryAttribute( atOC, "inetOrgPerson" );
assertFalse( entry.hasObjectClass( attrOC3 ) );
assertFalse( entry.hasObjectClass( (EntryAttribute)null ) );
- EntryAttribute attrCN = new DefaultClientAttribute( atCN, "top" );
+ EntryAttribute attrCN = new DefaultEntryAttribute( atCN, "top" );
assertFalse( entry.hasObjectClass( attrCN ) );
}
@@ -1827,7 +1827,7 @@ public class DefaultServerEntryTest
assertFalse( entry.containsAttribute( "objectClass" ) );
assertFalse( entry.hasObjectClass( "top" ) );
- entry.add( new DefaultClientAttribute( atOC, "top", "person" ) );
+ entry.add( new DefaultEntryAttribute( atOC, "top", "person" ) );
assertTrue( entry.hasObjectClass( "top" ) );
assertTrue( entry.hasObjectClass( "person" ) );
@@ -1878,10 +1878,10 @@ public class DefaultServerEntryTest
{
Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
- EntryAttribute attrOC = new DefaultClientAttribute( atOC, "top", "person" );
- EntryAttribute attrCN = new DefaultClientAttribute( atCN, "test1", "test2" );
- EntryAttribute attrSN = new DefaultClientAttribute( atSN, "Test1", "Test2" );
- EntryAttribute attrPWD = new DefaultClientAttribute( atPwd, BYTES1, BYTES2 );
+ EntryAttribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
+ EntryAttribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
+ EntryAttribute attrSN = new DefaultEntryAttribute( atSN, "Test1", "Test2" );
+ EntryAttribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2 );
entry.put( attrOC, attrCN, attrSN, attrPWD );
@@ -2050,11 +2050,11 @@ public class DefaultServerEntryTest
{
Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
- EntryAttribute oc = new DefaultClientAttribute( atObjectClass, "top", "person" );
- EntryAttribute cn = new DefaultClientAttribute( atCN, "test1", "test2" );
- EntryAttribute sn = new DefaultClientAttribute( atSN, "Test1", "Test2" );
- EntryAttribute up = new DefaultClientAttribute( atPwd, BYTES1, BYTES2 );
- EntryAttribute c = new DefaultClientAttribute( atC, "FR", "US" );
+ EntryAttribute oc = new DefaultEntryAttribute( atObjectClass, "top", "person" );
+ EntryAttribute cn = new DefaultEntryAttribute( atCN, "test1", "test2" );
+ EntryAttribute sn = new DefaultEntryAttribute( atSN, "Test1", "Test2" );
+ EntryAttribute up = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2 );
+ EntryAttribute c = new DefaultEntryAttribute( atC, "FR", "US" );
List<EntryAttribute> removed = entry.put( oc, cn, sn, c );
@@ -2068,7 +2068,7 @@ public class DefaultServerEntryTest
EntryAttribute attr = entry.get( "objectclass" );
assertEquals( 2, attr.size() );
- EntryAttribute c2 = new DefaultClientAttribute( atC, "UK", "DE" );
+ EntryAttribute c2 = new DefaultEntryAttribute( atC, "UK", "DE" );
removed = entry.put( c2, up );
assertEquals( 1, removed.size() );
assertEquals( c, removed.get( 0 ) );
@@ -2564,16 +2564,16 @@ public class DefaultServerEntryTest
AttributeType atGN = schemaManager.lookupAttributeTypeRegistry( "givenname" );
AttributeType atStreet = schemaManager.lookupAttributeTypeRegistry( "2.5.4.9" );
- EntryAttribute sa = new DefaultClientAttribute( atL, "france" );
+ EntryAttribute sa = new DefaultEntryAttribute( atL, "france" );
entry.put( sa );
assertEquals( 1, entry.size() );
assertNotNull( entry.get( "l" ) );
assertEquals( "france", entry.get( "l" ).get().getString() );
- EntryAttribute sb = new DefaultClientAttribute( atC, "countryTest" );
- EntryAttribute sc = new DefaultClientAttribute( atGN, "test" );
- EntryAttribute sd = new DefaultClientAttribute( atStreet, "testStreet" );
+ EntryAttribute sb = new DefaultEntryAttribute( atC, "countryTest" );
+ EntryAttribute sc = new DefaultEntryAttribute( atGN, "test" );
+ EntryAttribute sd = new DefaultEntryAttribute( atStreet, "testStreet" );
entry.put( sb, sc, sd );
assertEquals( 4, entry.size() );
@@ -2585,8 +2585,8 @@ public class DefaultServerEntryTest
assertEquals( "testStreet", entry.get( atStreet ).get().getString() );
// Test a replacement
- EntryAttribute sbb = new DefaultClientAttribute( atC, "countryTestTest" );
- EntryAttribute scc = new DefaultClientAttribute( atGN, "testtest" );
+ EntryAttribute sbb = new DefaultEntryAttribute( atC, "countryTestTest" );
+ EntryAttribute scc = new DefaultEntryAttribute( atGN, "testtest" );
List<EntryAttribute> result = entry.put( sbb, scc );
assertEquals( 2, result.size() );
@@ -2602,7 +2602,7 @@ public class DefaultServerEntryTest
// test an ObjectClass replacement
AttributeType OBJECT_CLASS_AT = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OBJECT_CLASS_AT );
- EntryAttribute oc = new DefaultClientAttribute( "OBJECTCLASS", OBJECT_CLASS_AT, "person", "inetorgperson" );
+ EntryAttribute oc = new DefaultEntryAttribute( "OBJECTCLASS", OBJECT_CLASS_AT, "person", "inetorgperson" );
List<EntryAttribute> oldOc = entry.put( oc );
assertNotNull( oldOc );
@@ -3202,7 +3202,7 @@ public class DefaultServerEntryTest
{
ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
- EntryAttribute attrPWD = new DefaultClientAttribute( atPwd, BYTES1, (byte[])null, BYTES2 );
+ EntryAttribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, (byte[])null, BYTES2 );
entry.put( attrPWD );
assertTrue( entry.remove( atPwd, (byte[])null ) );
@@ -3231,7 +3231,7 @@ public class DefaultServerEntryTest
{
ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
- EntryAttribute attrCN = new DefaultClientAttribute( atDC, "test1", (String)null, "test2" );
+ EntryAttribute attrCN = new DefaultEntryAttribute( atDC, "test1", (String)null, "test2" );
entry.put( attrCN );
assertTrue( entry.remove( atDC, (String)null ) );
@@ -3267,7 +3267,7 @@ public class DefaultServerEntryTest
Value<byte[]> binValue1 = new BinaryValue( atPwd, BYTES1 );
- EntryAttribute attrPWD = new DefaultClientAttribute( atDC, "test1", (String)null, "test2" );
+ EntryAttribute attrPWD = new DefaultEntryAttribute( atDC, "test1", (String)null, "test2" );
entry.put( attrPWD );
assertTrue( entry.remove( atDC, strNullValue ) );
@@ -3296,10 +3296,10 @@ public class DefaultServerEntryTest
{
ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
- EntryAttribute attrOC = new DefaultClientAttribute( atOC, "top", "person" );
- EntryAttribute attrCN = new DefaultClientAttribute( atCN, "test1", "test2" );
- EntryAttribute attrSN = new DefaultClientAttribute( atSN, "Test1", "Test2" );
- EntryAttribute attrPWD = new DefaultClientAttribute( atPwd, BYTES1, BYTES2 );
+ EntryAttribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
+ EntryAttribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
+ EntryAttribute attrSN = new DefaultEntryAttribute( atSN, "Test1", "Test2" );
+ EntryAttribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2 );
entry.put( attrOC, attrCN, attrSN, attrPWD );
@@ -3328,10 +3328,10 @@ public class DefaultServerEntryTest
{
ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
- EntryAttribute attrOC = new DefaultClientAttribute( atOC, "top", "person" );
- EntryAttribute attrCN = new DefaultClientAttribute( atCN, "test1", "test2" );
- EntryAttribute attrSN = new DefaultClientAttribute( atSN, "Test1", "Test2" );
- EntryAttribute attrPWD = new DefaultClientAttribute( atPwd, BYTES1, BYTES2 );
+ EntryAttribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
+ EntryAttribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
+ EntryAttribute attrSN = new DefaultEntryAttribute( atSN, "Test1", "Test2" );
+ EntryAttribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2 );
entry.put( attrOC, attrCN, attrSN, attrPWD );
@@ -3356,10 +3356,10 @@ public class DefaultServerEntryTest
{
Entry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
- EntryAttribute attrOC = new DefaultClientAttribute( atOC, "top", "person" );
- EntryAttribute attrCN = new DefaultClientAttribute( atCN, "test1", "test2" );
- EntryAttribute attrSN = new DefaultClientAttribute( atSN, "Test1", "Test2" );
- EntryAttribute attrPWD = new DefaultClientAttribute( atPwd, BYTES1, BYTES2 );
+ EntryAttribute attrOC = new DefaultEntryAttribute( atOC, "top", "person" );
+ EntryAttribute attrCN = new DefaultEntryAttribute( atCN, "test1", "test2" );
+ EntryAttribute attrSN = new DefaultEntryAttribute( atSN, "Test1", "Test2" );
+ EntryAttribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, BYTES2 );
entry.put( attrOC, attrCN, attrSN, attrPWD );
@@ -3387,7 +3387,7 @@ public class DefaultServerEntryTest
{
ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
- EntryAttribute attrPWD = new DefaultClientAttribute( atPwd, BYTES1, (byte[])null, BYTES2 );
+ EntryAttribute attrPWD = new DefaultEntryAttribute( atPwd, BYTES1, (byte[])null, BYTES2 );
assertFalse( entry.remove( (String)null, BYTES1 ) );
assertFalse( entry.remove( " ", BYTES1 ) );
@@ -3420,7 +3420,7 @@ public class DefaultServerEntryTest
{
ServerEntry entry = new DefaultServerEntry( schemaManager, EXAMPLE_DN );
- EntryAttribute attrCN = new DefaultClientAttribute( atDC, "test1", (String)null, "test2" );
+ EntryAttribute attrCN = new DefaultEntryAttribute( atDC, "test1", (String)null, "test2" );
assertFalse( entry.remove( (String)null, "test1" ) );
assertFalse( entry.remove( " ", "test1" ) );
@@ -3460,7 +3460,7 @@ public class DefaultServerEntryTest
Value<byte[]> binValue1 = new BinaryValue( atPwd, BYTES1 );
- EntryAttribute attrPWD = new DefaultClientAttribute( atDC, "test1", (String)null, "test2" );
+ EntryAttribute attrPWD = new DefaultEntryAttribute( atDC, "test1", (String)null, "test2" );
entry.put( attrPWD );
assertTrue( entry.remove( "DC", strNullValue ) );
Modified: directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerModificationTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerModificationTest.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerModificationTest.java (original)
+++ directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerModificationTest.java Wed Apr 21 22:51:27 2010
@@ -34,12 +34,12 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.List;
+import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
import org.apache.directory.shared.ldap.entry.ServerModification;
import org.apache.directory.shared.ldap.entry.client.ClientModification;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
import org.apache.directory.shared.ldap.exception.LdapException;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -181,7 +181,7 @@ public class ServerModificationTest
@Test public void testCreateServerModification()
{
- EntryAttribute attribute = new DefaultClientAttribute( atCN );
+ EntryAttribute attribute = new DefaultEntryAttribute( atCN );
attribute.add( "test1", "test2" );
Modification mod = new ServerModification( ModificationOperation.ADD_ATTRIBUTE, attribute );
@@ -207,7 +207,7 @@ public class ServerModificationTest
@Test
public void testCopyServerModification()
{
- EntryAttribute attribute = new DefaultClientAttribute( atC );
+ EntryAttribute attribute = new DefaultEntryAttribute( atC );
attribute.add( "test1", "test2" );
Modification serverModification = new ServerModification( ModificationOperation.ADD_ATTRIBUTE, attribute );
@@ -219,7 +219,7 @@ public class ServerModificationTest
serverModification.setOperation( ModificationOperation.REMOVE_ATTRIBUTE );
assertEquals( ModificationOperation.ADD_ATTRIBUTE, copy.getOperation() );
- EntryAttribute attribute2 = new DefaultClientAttribute( atCN, "t" );
+ EntryAttribute attribute2 = new DefaultEntryAttribute( atCN, "t" );
serverModification.setAttribute( attribute2 );
assertNotSame( attribute2, copy.getAttribute() );
}
@@ -232,7 +232,7 @@ public class ServerModificationTest
@Test
public void testCopyClientModification()
{
- EntryAttribute attribute = new DefaultClientAttribute( atC.getName() );
+ EntryAttribute attribute = new DefaultEntryAttribute( atC.getName() );
attribute.add( "test1", "test2" );
Modification clientModification = new ClientModification( ModificationOperation.ADD_ATTRIBUTE, attribute );
@@ -249,7 +249,7 @@ public class ServerModificationTest
clientModification.setOperation( ModificationOperation.REMOVE_ATTRIBUTE );
assertEquals( ModificationOperation.ADD_ATTRIBUTE, copy.getOperation() );
- EntryAttribute attribute2 = new DefaultClientAttribute( "cn", "t" );
+ EntryAttribute attribute2 = new DefaultEntryAttribute( "cn", "t" );
clientModification.setAttribute( attribute2 );
assertNotSame( attribute2, copy.getAttribute() );
}
@@ -258,7 +258,7 @@ public class ServerModificationTest
@Test
public void testSerializationModificationADD() throws ClassNotFoundException, IOException, LdapException
{
- EntryAttribute attribute = new DefaultClientAttribute( atCN );
+ EntryAttribute attribute = new DefaultEntryAttribute( atCN );
attribute.add( "test1", "test2" );
ServerModification mod = new ServerModification( ModificationOperation.ADD_ATTRIBUTE, attribute );
@@ -272,7 +272,7 @@ public class ServerModificationTest
@Test
public void testSerializationModificationREPLACE() throws ClassNotFoundException, IOException, LdapException
{
- EntryAttribute attribute = new DefaultClientAttribute( atCN );
+ EntryAttribute attribute = new DefaultEntryAttribute( atCN );
attribute.add( "test1", "test2" );
ServerModification mod = new ServerModification( ModificationOperation.REPLACE_ATTRIBUTE, attribute );
@@ -286,7 +286,7 @@ public class ServerModificationTest
@Test
public void testSerializationModificationREMOVE() throws ClassNotFoundException, IOException, LdapException
{
- EntryAttribute attribute = new DefaultClientAttribute( atCN );
+ EntryAttribute attribute = new DefaultEntryAttribute( atCN );
attribute.add( "test1", "test2" );
ServerModification mod = new ServerModification( ModificationOperation.REMOVE_ATTRIBUTE, attribute );
Modified: directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java (original)
+++ directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java Wed Apr 21 22:51:27 2010
@@ -43,9 +43,9 @@ import org.apache.directory.server.i18n.
import org.apache.directory.server.ldap.LdapServer;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
import org.apache.directory.shared.ldap.exception.LdapException;
import org.apache.directory.shared.ldap.ldif.ChangeType;
import org.apache.directory.shared.ldap.ldif.LdifEntry;
@@ -271,11 +271,11 @@ public class IntegrationUtils
ldif.setDn( dnstr );
ldif.setChangeType( ChangeType.Add );
- EntryAttribute attr = new DefaultClientAttribute( "objectClass",
+ EntryAttribute attr = new DefaultEntryAttribute( "objectClass",
"top", "person", "organizationalPerson", "inetOrgPerson" );
ldif.addAttribute( attr );
- attr = new DefaultClientAttribute( "ou", "Engineering", "People" );
+ attr = new DefaultEntryAttribute( "ou", "Engineering", "People" );
ldif.addAttribute( attr );
String uid = ( String ) dn.getRdn().getNormValue();
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java Wed Apr 21 22:51:27 2010
@@ -34,13 +34,13 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
+import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
import org.apache.directory.shared.ldap.entry.client.ClientModification;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.filter.FilterParser;
@@ -135,7 +135,7 @@ public class AuthorizationServiceAsNonAd
assertTrue( Arrays.equals( akarasulu.get( "userPassword" ).getBytes(), readEntry.get( "userPassword" ).getBytes() ) );
- EntryAttribute attribute = new DefaultClientAttribute( "userPassword", "replaced" );
+ EntryAttribute attribute = new DefaultEntryAttribute( "userPassword", "replaced" );
List<Modification> mods = new ArrayList<Modification>();
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java Wed Apr 21 22:51:27 2010
@@ -38,12 +38,12 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.server.core.integ.IntegrationUtils;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
import org.apache.directory.shared.ldap.entry.client.ClientModification;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.DN;
@@ -257,7 +257,7 @@ public class ModifyAuthorizationIT exten
createUser( "billyd", "billyd" );
// create the password modification
- Modification[] mods = toItems( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultClientAttribute(
+ Modification[] mods = toItems( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultEntryAttribute(
"userPassword", "williams" ) );
// try a modify operation which should fail without any ACI
@@ -291,7 +291,7 @@ public class ModifyAuthorizationIT exten
// ----------------------------------------------------------------------------------
// create the add modifications
- EntryAttribute attr = new DefaultClientAttribute( "registeredAddress", "100 Park Ave." );
+ EntryAttribute attr = new DefaultEntryAttribute( "registeredAddress", "100 Park Ave." );
Modification[] mods = toItems( ModificationOperation.ADD_ATTRIBUTE, attr );
// create the non-admin user
@@ -333,7 +333,7 @@ public class ModifyAuthorizationIT exten
// ----------------------------------------------------------------------------------
// now let's test to see if we can perform a modify with a delete op
- mods = toItems( ModificationOperation.REMOVE_ATTRIBUTE, new DefaultClientAttribute( "telephoneNumber",
+ mods = toItems( ModificationOperation.REMOVE_ATTRIBUTE, new DefaultEntryAttribute( "telephoneNumber",
"867-5309" ) );
// make sure we cannot remove the telephone number from the test entry
@@ -363,7 +363,7 @@ public class ModifyAuthorizationIT exten
// ----------------------------------------------------------------------------------
// now let's test to see if we can perform a modify with a delete op
- mods = toItems( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultClientAttribute( "telephoneNumber",
+ mods = toItems( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultEntryAttribute( "telephoneNumber",
"867-5309" ) );
// make sure we cannot remove the telephone number from the test entry
@@ -396,7 +396,7 @@ public class ModifyAuthorizationIT exten
// Modify with Attribute Addition
// ----------------------------------------------------------------------------------
// create the add modifications
- EntryAttribute changes = new DefaultClientAttribute( "registeredAddress", "100 Park Ave." );
+ EntryAttribute changes = new DefaultEntryAttribute( "registeredAddress", "100 Park Ave." );
// try a modify operation which should fail without any ACI
assertFalse( checkCanModifyAs( "billyd", "billyd", "ou=testou", ModificationOperation.ADD_ATTRIBUTE, changes ) );
@@ -425,7 +425,7 @@ public class ModifyAuthorizationIT exten
// ----------------------------------------------------------------------------------
// now let's test to see if we can perform a modify with a delete op
- changes = new DefaultClientAttribute( "telephoneNumber", "867-5309" );
+ changes = new DefaultEntryAttribute( "telephoneNumber", "867-5309" );
// make sure we cannot remove the telephone number from the test entry
assertFalse( checkCanModifyAs( "billyd", "billyd", "ou=testou", ModificationOperation.REMOVE_ATTRIBUTE, changes ) );
@@ -454,7 +454,7 @@ public class ModifyAuthorizationIT exten
// ----------------------------------------------------------------------------------
// now let's test to see if we can perform a modify with a delete op
- changes = new DefaultClientAttribute( "telephoneNumber", "867-5309" );
+ changes = new DefaultEntryAttribute( "telephoneNumber", "867-5309" );
// make sure we cannot remove the telephone number from the test entry
assertFalse( checkCanModifyAs( "billyd", "billyd", "ou=testou", ModificationOperation.REPLACE_ATTRIBUTE, changes ) );
@@ -571,7 +571,7 @@ public class ModifyAuthorizationIT exten
public void testPresciptiveACIModification() throws Exception
{
- Modification[] mods = toItems( ModificationOperation.ADD_ATTRIBUTE, new DefaultClientAttribute(
+ Modification[] mods = toItems( ModificationOperation.ADD_ATTRIBUTE, new DefaultEntryAttribute(
"registeredAddress", "100 Park Ave." ) );
createUser( "billyd", "billyd" );
@@ -589,7 +589,7 @@ public class ModifyAuthorizationIT exten
assertTrue( checkCanModifyAs( "billyd", "billyd", "ou=testou", mods ) );
- mods = toItems( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultClientAttribute( "registeredAddress",
+ mods = toItems( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultEntryAttribute( "registeredAddress",
"200 Park Ave." ) );
changePresciptiveACI( "modifyACI", "{ " + "identificationTag \"modifyAci\", " + "precedence 14, "
@@ -616,12 +616,12 @@ public class ModifyAuthorizationIT exten
+ " { type description, maxCount 1 }" + " }" + " }" + " ," + " grantsAndDenials" + " {" + " grantRemove,"
+ " grantAdd" + " }" + " }" + " }" + " }" + " }" );
- Modification[] mods = toItems( ModificationOperation.ADD_ATTRIBUTE, new DefaultClientAttribute( "description",
+ Modification[] mods = toItems( ModificationOperation.ADD_ATTRIBUTE, new DefaultEntryAttribute( "description",
"description 1" ) );
assertTrue( checkCanModifyAs( "billyd", "billyd", "ou=testou", mods ) );
- EntryAttribute attr = new DefaultClientAttribute( "description" );
+ EntryAttribute attr = new DefaultEntryAttribute( "description" );
attr.add( "description 1" );
attr.add( "description 2" );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java Wed Apr 21 22:51:27 2010
@@ -46,13 +46,13 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.annotations.ApplyLdifs;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
import org.apache.directory.shared.ldap.entry.ServerEntry;
import org.apache.directory.shared.ldap.entry.client.ClientModification;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException;
import org.apache.directory.shared.ldap.exception.LdapReferralException;
import org.apache.directory.shared.ldap.name.DN;
@@ -240,7 +240,7 @@ public class ModifyReferralIT extends Ab
try
{
- EntryAttribute attr = new DefaultClientAttribute( "Description", "this is a test" );
+ EntryAttribute attr = new DefaultEntryAttribute( "Description", "this is a test" );
Modification mod = new ClientModification(
ModificationOperation.ADD_ATTRIBUTE, attr );
List<Modification> mods = new ArrayList<Modification>();
@@ -268,7 +268,7 @@ public class ModifyReferralIT extends Ab
try
{
- EntryAttribute attr = new DefaultClientAttribute( "Description", "this is a test" );
+ EntryAttribute attr = new DefaultEntryAttribute( "Description", "this is a test" );
Modification mod = new ClientModification(
ModificationOperation.ADD_ATTRIBUTE, attr );
List<Modification> mods = new ArrayList<Modification>();
@@ -376,7 +376,7 @@ public class ModifyReferralIT extends Ab
try
{
- EntryAttribute attr = new DefaultClientAttribute( "Description", "this is a test" );
+ EntryAttribute attr = new DefaultEntryAttribute( "Description", "this is a test" );
Modification mod = new ClientModification(
ModificationOperation.ADD_ATTRIBUTE, attr );
List<Modification> mods = new ArrayList<Modification>();
@@ -415,7 +415,7 @@ public class ModifyReferralIT extends Ab
{
CoreSession session = service.getAdminSession();
- EntryAttribute attr = new DefaultClientAttribute( "Description", "This is a description" );
+ EntryAttribute attr = new DefaultEntryAttribute( "Description", "This is a description" );
Modification mod = new ClientModification(
ModificationOperation.ADD_ATTRIBUTE, attr );
List<Modification> mods = new ArrayList<Modification>();
Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java Wed Apr 21 22:51:27 2010
@@ -30,9 +30,9 @@ import javax.naming.NamingException;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.ServerEntry;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
import org.apache.directory.shared.ldap.exception.LdapException;
import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -198,7 +198,7 @@ class JavaLdapSupport
// Add all the class names this object can be cast to:
Class<?>[] classes = obj.getClass().getClasses();
AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( JCLASSNAMES_ATTR );
- EntryAttribute javaClassNames = new DefaultClientAttribute( attributeType, JCLASSNAMES_ATTR );
+ EntryAttribute javaClassNames = new DefaultEntryAttribute( attributeType, JCLASSNAMES_ATTR );
for ( int ii = 0; ii < classes.length; ii++ )
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java Wed Apr 21 22:51:27 2010
@@ -41,10 +41,10 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.partition.ByPassConstants;
import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.ServerEntry;
import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -262,7 +262,7 @@ public class CollectiveAttributeIntercep
*/
if ( entryColAttr == null )
{
- entryColAttr = new DefaultClientAttribute( attrId, schemaManager.lookupAttributeTypeRegistry( attrId ) );
+ entryColAttr = new DefaultEntryAttribute( attrId, schemaManager.lookupAttributeTypeRegistry( attrId ) );
entry.put( entryColAttr );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Wed Apr 21 22:51:27 2010
@@ -46,6 +46,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.interceptor.context.SearchingOperationContext;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Modification;
@@ -53,7 +54,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.ServerEntry;
import org.apache.directory.shared.ldap.entry.ServerModification;
import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.AVA;
@@ -271,7 +271,7 @@ public class OperationalAttributeInterce
}
// Inject the ModifiersName AT if it's not present
- EntryAttribute attribute = new DefaultClientAttribute(
+ EntryAttribute attribute = new DefaultEntryAttribute(
MODIFIERS_NAME_ATTRIBUTE_TYPE,
getPrincipal().getName());
@@ -280,7 +280,7 @@ public class OperationalAttributeInterce
mods.add( modifiersName );
// Inject the ModifyTimestamp AT if it's not present
- attribute = new DefaultClientAttribute(
+ attribute = new DefaultEntryAttribute(
MODIFY_TIMESTAMP_ATTRIBUTE_TYPE,
DateUtils.getGeneralizedTime() );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Wed Apr 21 22:51:27 2010
@@ -81,11 +81,11 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.cursor.EmptyCursor;
import org.apache.directory.shared.ldap.cursor.SingletonCursor;
+import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.ServerEntry;
import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeTypeException;
import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException;
import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException;
@@ -347,7 +347,7 @@ public class DefaultPartitionNexus exte
if ( namingContexts == null )
{
- namingContexts = new DefaultClientAttribute(
+ namingContexts = new DefaultEntryAttribute(
schemaManager.lookupAttributeTypeRegistry( SchemaConstants.NAMING_CONTEXTS_AT ),
system.getSuffixDn().getName() );
rootDSE.put( namingContexts );
@@ -932,7 +932,7 @@ public class DefaultPartitionNexus exte
if ( namingContexts == null )
{
- namingContexts = new DefaultClientAttribute(
+ namingContexts = new DefaultEntryAttribute(
schemaManager.lookupAttributeTypeRegistry( SchemaConstants.NAMING_CONTEXTS_AT ), partitionSuffix.getName() );
rootDSE.put( namingContexts );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java Wed Apr 21 22:51:27 2010
@@ -34,12 +34,12 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
import org.apache.directory.shared.ldap.entry.ServerEntry;
import org.apache.directory.shared.ldap.entry.ServerModification;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
import org.apache.directory.shared.ldap.exception.LdapException;
import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
@@ -272,7 +272,7 @@ public class ServerSystemPreferences ext
try
{
at = directoryService.getSchemaManager().lookupAttributeTypeRegistry( key );
- EntryAttribute attr = new DefaultClientAttribute( at );
+ EntryAttribute attr = new DefaultEntryAttribute( at );
Modification mi = new ServerModification( ModificationOperation.REMOVE_ATTRIBUTE, attr );
addDelta( mi );
}
@@ -346,7 +346,7 @@ public class ServerSystemPreferences ext
try
{
at = directoryService.getSchemaManager().lookupAttributeTypeRegistry( key );
- EntryAttribute attr = new DefaultClientAttribute( at, value );
+ EntryAttribute attr = new DefaultEntryAttribute( at, value );
Modification mi = new ServerModification( ModificationOperation.REPLACE_ATTRIBUTE, attr );
addDelta( mi );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java Wed Apr 21 22:51:27 2010
@@ -26,10 +26,10 @@ import org.apache.directory.server.const
import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.ServerEntry;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
import org.apache.directory.shared.ldap.exception.LdapException;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -124,7 +124,7 @@ public class DefaultSchemaService implem
*/
private EntryAttribute generateComparators() throws LdapException
{
- EntryAttribute attr = new DefaultClientAttribute(
+ EntryAttribute attr = new DefaultEntryAttribute(
getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.COMPARATORS_AT ) );
for ( LdapComparator<?> comparator : getSchemaManager().getComparatorRegistry() )
@@ -138,7 +138,7 @@ public class DefaultSchemaService implem
private EntryAttribute generateNormalizers() throws LdapException
{
- EntryAttribute attr = new DefaultClientAttribute(
+ EntryAttribute attr = new DefaultEntryAttribute(
getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.NORMALIZERS_AT ) );
NormalizerRegistry nr = getSchemaManager().getNormalizerRegistry();
@@ -154,7 +154,7 @@ public class DefaultSchemaService implem
private EntryAttribute generateSyntaxCheckers() throws LdapException
{
- EntryAttribute attr = new DefaultClientAttribute(
+ EntryAttribute attr = new DefaultEntryAttribute(
getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.SYNTAX_CHECKERS_AT ) );
for ( SyntaxChecker syntaxChecker : getSchemaManager().getSyntaxCheckerRegistry() )
@@ -168,7 +168,7 @@ public class DefaultSchemaService implem
private EntryAttribute generateObjectClasses() throws LdapException
{
- EntryAttribute attr = new DefaultClientAttribute(
+ EntryAttribute attr = new DefaultEntryAttribute(
getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.OBJECT_CLASSES_AT ) );
for ( ObjectClass objectClass : getSchemaManager().getObjectClassRegistry() )
@@ -182,7 +182,7 @@ public class DefaultSchemaService implem
private EntryAttribute generateAttributeTypes() throws LdapException
{
- EntryAttribute attr = new DefaultClientAttribute(
+ EntryAttribute attr = new DefaultEntryAttribute(
getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.ATTRIBUTE_TYPES_AT ) );
for ( AttributeType attributeType : getSchemaManager().getAttributeTypeRegistry() )
@@ -196,7 +196,7 @@ public class DefaultSchemaService implem
private EntryAttribute generateMatchingRules() throws LdapException
{
- EntryAttribute attr = new DefaultClientAttribute(
+ EntryAttribute attr = new DefaultEntryAttribute(
getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.MATCHING_RULES_AT ) );
for ( MatchingRule matchingRule : getSchemaManager().getMatchingRuleRegistry() )
@@ -210,7 +210,7 @@ public class DefaultSchemaService implem
private EntryAttribute generateMatchingRuleUses() throws LdapException
{
- EntryAttribute attr = new DefaultClientAttribute(
+ EntryAttribute attr = new DefaultEntryAttribute(
getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.MATCHING_RULE_USE_AT ) );
for ( MatchingRuleUse matchingRuleUse : getSchemaManager().getMatchingRuleUseRegistry() )
@@ -224,7 +224,7 @@ public class DefaultSchemaService implem
private EntryAttribute generateSyntaxes() throws LdapException
{
- EntryAttribute attr = new DefaultClientAttribute(
+ EntryAttribute attr = new DefaultEntryAttribute(
getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.LDAP_SYNTAXES_AT ) );
for ( LdapSyntax syntax : getSchemaManager().getLdapSyntaxRegistry() )
@@ -238,7 +238,7 @@ public class DefaultSchemaService implem
private EntryAttribute generateDitContextRules() throws LdapException
{
- EntryAttribute attr = new DefaultClientAttribute(
+ EntryAttribute attr = new DefaultEntryAttribute(
getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.DIT_CONTENT_RULES_AT ) );
for ( DITContentRule ditContentRule : getSchemaManager().getDITContentRuleRegistry() )
@@ -252,7 +252,7 @@ public class DefaultSchemaService implem
private EntryAttribute generateDitStructureRules() throws LdapException
{
- EntryAttribute attr = new DefaultClientAttribute(
+ EntryAttribute attr = new DefaultEntryAttribute(
getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.DIT_STRUCTURE_RULES_AT ) );
for ( DITStructureRule ditStructureRule : getSchemaManager().getDITStructureRuleRegistry() )
@@ -266,7 +266,7 @@ public class DefaultSchemaService implem
private EntryAttribute generateNameForms() throws LdapException
{
- EntryAttribute attr = new DefaultClientAttribute(
+ EntryAttribute attr = new DefaultEntryAttribute(
getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.NAME_FORMS_AT ) );
for ( NameForm nameForm : getSchemaManager().getNameFormRegistry() )
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Wed Apr 21 22:51:27 2010
@@ -55,6 +55,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.cursor.EmptyCursor;
import org.apache.directory.shared.ldap.cursor.SingletonCursor;
import org.apache.directory.shared.ldap.entry.BinaryValue;
+import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.entry.StringValue;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -63,7 +64,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.ServerEntry;
import org.apache.directory.shared.ldap.entry.ServerModification;
import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
import org.apache.directory.shared.ldap.exception.LdapAttributeInUseException;
import org.apache.directory.shared.ldap.exception.LdapException;
import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeTypeException;
@@ -900,7 +900,7 @@ public class SchemaInterceptor extends B
{
if ( ( changes == null ) && ( existing == null ) )
{
- return new DefaultClientAttribute( SchemaConstants.OBJECT_CLASS_AT, OBJECT_CLASS );
+ return new DefaultEntryAttribute( SchemaConstants.OBJECT_CLASS_AT, OBJECT_CLASS );
}
if ( changes == null )
@@ -914,7 +914,7 @@ public class SchemaInterceptor extends B
}
else if ( existing == null )
{
- return new DefaultClientAttribute( SchemaConstants.OBJECT_CLASS_AT, OBJECT_CLASS );
+ return new DefaultEntryAttribute( SchemaConstants.OBJECT_CLASS_AT, OBJECT_CLASS );
}
switch ( modOp )
@@ -1134,7 +1134,7 @@ public class SchemaInterceptor extends B
if ( !tmpEntry.contains( type, atav.getNormValue() ) )
{
- tmpEntry.add( new DefaultClientAttribute( type, atav.getUpValue() ) );
+ tmpEntry.add( new DefaultEntryAttribute( type, atav.getUpValue() ) );
}
}
@@ -1167,7 +1167,7 @@ public class SchemaInterceptor extends B
AttributeType attributeType = attribute.getAttributeType();
// Create the new Attribute
- EntryAttribute newAttribute = new DefaultClientAttribute( attribute.getUpId(), attributeType );
+ EntryAttribute newAttribute = new DefaultEntryAttribute( attribute.getUpId(), attributeType );
for ( Value<?> value : attribute )
{
@@ -1469,7 +1469,7 @@ public class SchemaInterceptor extends B
entry.removeAttributes( SchemaConstants.OBJECT_CLASS_AT );
- EntryAttribute newOc = new DefaultClientAttribute( oc.getAttributeType() );
+ EntryAttribute newOc = new DefaultEntryAttribute( oc.getAttributeType() );
for ( ObjectClass currentOC : objectClasses )
{
@@ -1576,7 +1576,7 @@ public class SchemaInterceptor extends B
// In this case, we create an new one, empty
if ( objectClassAttr == null )
{
- objectClassAttr = new DefaultClientAttribute( SchemaConstants.OBJECT_CLASS_AT, OBJECT_CLASS );
+ objectClassAttr = new DefaultEntryAttribute( SchemaConstants.OBJECT_CLASS_AT, OBJECT_CLASS );
}
List<ObjectClass> ocs = new ArrayList<ObjectClass>();
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=936557&r1=936556&r2=936557&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Wed Apr 21 22:51:27 2010
@@ -55,6 +55,7 @@ import org.apache.directory.server.i18n.
import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesControl;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.entry.StringValue;
import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -63,7 +64,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.ServerEntry;
import org.apache.directory.shared.ldap.entry.ServerModification;
import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException;
import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
@@ -346,7 +346,7 @@ public class SubentryInterceptor extends
if ( operational == null )
{
- operational = new DefaultClientAttribute( SchemaConstants.ACCESS_CONTROL_SUBENTRIES_AT,
+ operational = new DefaultEntryAttribute( SchemaConstants.ACCESS_CONTROL_SUBENTRIES_AT,
schemaManager.lookupAttributeTypeRegistry( SchemaConstants.ACCESS_CONTROL_SUBENTRIES_AT ) );
subentryAttrs.put( operational );
}
@@ -359,7 +359,7 @@ public class SubentryInterceptor extends
if ( operational == null )
{
- operational = new DefaultClientAttribute( SchemaConstants.SUBSCHEMA_SUBENTRY_AT, schemaManager
+ operational = new DefaultEntryAttribute( SchemaConstants.SUBSCHEMA_SUBENTRY_AT, schemaManager
.lookupAttributeTypeRegistry( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ) );
subentryAttrs.put( operational );
}
@@ -372,7 +372,7 @@ public class SubentryInterceptor extends
if ( operational == null )
{
- operational = new DefaultClientAttribute( SchemaConstants.COLLECTIVE_ATTRIBUTE_SUBENTRIES_AT,
+ operational = new DefaultEntryAttribute( SchemaConstants.COLLECTIVE_ATTRIBUTE_SUBENTRIES_AT,
schemaManager.lookupAttributeTypeRegistry( SchemaConstants.COLLECTIVE_ATTRIBUTE_SUBENTRIES_AT ) );
subentryAttrs.put( operational );
}
@@ -385,7 +385,7 @@ public class SubentryInterceptor extends
if ( operational == null )
{
- operational = new DefaultClientAttribute( SchemaConstants.TRIGGER_EXECUTION_SUBENTRIES_AT,
+ operational = new DefaultEntryAttribute( SchemaConstants.TRIGGER_EXECUTION_SUBENTRIES_AT,
schemaManager.lookupAttributeTypeRegistry( SchemaConstants.TRIGGER_EXECUTION_SUBENTRIES_AT ) );
subentryAttrs.put( operational );
}
@@ -520,7 +520,7 @@ public class SubentryInterceptor extends
if ( operational == null )
{
- operational = new DefaultClientAttribute( schemaManager
+ operational = new DefaultEntryAttribute( schemaManager
.lookupAttributeTypeRegistry( SchemaConstants.ACCESS_CONTROL_SUBENTRIES_AT ) );
entry.put( operational );
}
@@ -534,7 +534,7 @@ public class SubentryInterceptor extends
if ( operational == null )
{
- operational = new DefaultClientAttribute( schemaManager
+ operational = new DefaultEntryAttribute( schemaManager
.lookupAttributeTypeRegistry( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ) );
entry.put( operational );
}
@@ -548,7 +548,7 @@ public class SubentryInterceptor extends
if ( operational == null )
{
- operational = new DefaultClientAttribute( schemaManager
+ operational = new DefaultEntryAttribute( schemaManager
.lookupAttributeTypeRegistry( SchemaConstants.COLLECTIVE_ATTRIBUTE_SUBENTRIES_AT ) );
entry.put( operational );
}
@@ -562,7 +562,7 @@ public class SubentryInterceptor extends
if ( operational == null )
{
- operational = new DefaultClientAttribute( schemaManager
+ operational = new DefaultEntryAttribute( schemaManager
.lookupAttributeTypeRegistry( SchemaConstants.TRIGGER_EXECUTION_SUBENTRIES_AT ) );
entry.put( operational );
}
@@ -738,7 +738,7 @@ public class SubentryInterceptor extends
for ( String aSUBENTRY_OPATTRS : SUBENTRY_OPATTRS )
{
ModificationOperation op = ModificationOperation.ADD_ATTRIBUTE;
- EntryAttribute opAttr = new DefaultClientAttribute( aSUBENTRY_OPATTRS, schemaManager
+ EntryAttribute opAttr = new DefaultEntryAttribute( aSUBENTRY_OPATTRS, schemaManager
.lookupAttributeTypeRegistry( aSUBENTRY_OPATTRS ) );
opAttr.add( subentryDn );
modList.add( new ServerModification( op, opAttr ) );
@@ -1158,7 +1158,7 @@ public class SubentryInterceptor extends
if ( operational == null )
{
- operational = new DefaultClientAttribute( SchemaConstants.ACCESS_CONTROL_SUBENTRIES_AT, schemaManager
+ operational = new DefaultEntryAttribute( SchemaConstants.ACCESS_CONTROL_SUBENTRIES_AT, schemaManager
.lookupAttributeTypeRegistry( SchemaConstants.ACCESS_CONTROL_SUBENTRIES_AT ) );
operational.add( newName.toString() );
}
@@ -1177,7 +1177,7 @@ public class SubentryInterceptor extends
if ( operational == null )
{
- operational = new DefaultClientAttribute( SchemaConstants.SUBSCHEMA_SUBENTRY_AT, schemaManager
+ operational = new DefaultEntryAttribute( SchemaConstants.SUBSCHEMA_SUBENTRY_AT, schemaManager
.lookupAttributeTypeRegistry( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ) );
operational.add( newName.toString() );
}
@@ -1196,7 +1196,7 @@ public class SubentryInterceptor extends
if ( operational == null )
{
- operational = new DefaultClientAttribute( SchemaConstants.COLLECTIVE_ATTRIBUTE_SUBENTRIES_AT,
+ operational = new DefaultEntryAttribute( SchemaConstants.COLLECTIVE_ATTRIBUTE_SUBENTRIES_AT,
schemaManager.lookupAttributeTypeRegistry( SchemaConstants.COLLECTIVE_ATTRIBUTE_SUBENTRIES_AT ) );
operational.add( newName.toString() );
}
@@ -1215,7 +1215,7 @@ public class SubentryInterceptor extends
if ( operational == null )
{
- operational = new DefaultClientAttribute( SchemaConstants.TRIGGER_EXECUTION_SUBENTRIES_AT, schemaManager
+ operational = new DefaultEntryAttribute( SchemaConstants.TRIGGER_EXECUTION_SUBENTRIES_AT, schemaManager
.lookupAttributeTypeRegistry( SchemaConstants.TRIGGER_EXECUTION_SUBENTRIES_AT ) );
operational.add( newName.toString() );
}
@@ -1319,7 +1319,7 @@ public class SubentryInterceptor extends
if ( ( opAttr != null ) && opAttr.contains( dn ) )
{
AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( opAttrId );
- EntryAttribute attr = new DefaultClientAttribute( opAttrId, attributeType, dn );
+ EntryAttribute attr = new DefaultEntryAttribute( opAttrId, attributeType, dn );
modList.add( new ServerModification( ModificationOperation.REMOVE_ATTRIBUTE, attr ) );
}
}
@@ -1351,7 +1351,7 @@ public class SubentryInterceptor extends
for ( AttributeType attributeType : operational.getAttributeTypes() )
{
ModificationOperation op = ModificationOperation.REPLACE_ATTRIBUTE;
- EntryAttribute result = new DefaultClientAttribute( attributeType );
+ EntryAttribute result = new DefaultEntryAttribute( attributeType );
EntryAttribute opAttrAdditions = operational.get( attributeType );
EntryAttribute opAttrInEntry = entry.get( attributeType );
@@ -1491,7 +1491,7 @@ public class SubentryInterceptor extends
{
ModificationOperation op = ModificationOperation.ADD_ATTRIBUTE;
AttributeType type = schemaManager.lookupAttributeTypeRegistry( attribute );
- EntryAttribute opAttr = new DefaultClientAttribute( attribute, type );
+ EntryAttribute opAttr = new DefaultEntryAttribute( attribute, type );
opAttr.add( subentryDn );
modList.add( new ServerModification( op, opAttr ) );
}
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=936557&r1=936556&r2=936557&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 Wed Apr 21 22:51:27 2010
@@ -42,11 +42,11 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.aci.ProtectedItem.MaxValueCountItem;
import org.apache.directory.shared.ldap.aci.ProtectedItem.RestrictedByItem;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
+import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.entry.StringValue;
import org.apache.directory.shared.ldap.entry.DefaultServerEntry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.ServerEntry;
-import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -226,7 +226,7 @@ public class RelatedProtectedItemFilterT
public void testAttributeValue() throws Exception
{
Collection<EntryAttribute> attributes = new ArrayList<EntryAttribute>();
- attributes.add( new DefaultClientAttribute( "cn", CN_AT, "valueA" ) );
+ attributes.add( new DefaultEntryAttribute( "cn", CN_AT, "valueA" ) );
Collection<ACITuple> tuples = getTuples( new ProtectedItem.AttributeValue( convert( attributes ) ) );
// Test wrong scope
|