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 2011/04/01 02:05:18 UTC
svn commit: r1087515 [1/2] - in /directory/shared/trunk:
dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/
dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/
integ/src/test/java/org/apache/directory/shared/ldap/en...
Author: elecharny
Date: Fri Apr 1 00:05:17 2011
New Revision: 1087515
URL: http://svn.apache.org/viewvc?rev=1087515&view=rev
Log:
o Renamed the DefaultEntryAttribute interface to DefaultAttribute
Added:
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultAttribute.java
- copied, changed from r1087508, directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttribute.java
Removed:
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttribute.java
Modified:
directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java
directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java
directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java
directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/EntryTest.java
directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareEntryAttributeSerializationTest.java
directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareModificationSerializationTest.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java
directory/shared/trunk/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeValueTest.java
directory/shared/trunk/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItemTest.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AttributeUtils.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultModification.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifEntry.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifReader.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertor.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifUtils.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequestImpl.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/AttributeUtilsTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttributeTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/EntryAttributeSerializationTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/ModificationTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertorTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/AddRequestImplTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImplTest.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResultEntryImplTest.java
directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java
directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java
Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java Fri Apr 1 00:05:17 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.dsml
import org.apache.directory.shared.dsmlv2.ParserUtils;
import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.Value;
@@ -89,7 +89,7 @@ public class SearchResultEntryDsml
*/
public void addAttribute( String type ) throws LdapException
{
- currentAttribute = new DefaultEntryAttribute( type );
+ currentAttribute = new DefaultAttribute( type );
getDecorated().getEntry().put( currentAttribute );
}
Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java Fri Apr 1 00:05:17 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.dsml
import org.apache.directory.shared.dsmlv2.ParserUtils;
import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.Value;
@@ -89,7 +89,7 @@ public class AddRequestDsml
}
// fix this to use AttributeImpl(type.getString().toLowerCase())
- currentAttribute = new DefaultEntryAttribute( type );
+ currentAttribute = new DefaultAttribute( type );
getDecorated().getEntry().put( currentAttribute );
}
Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java Fri Apr 1 00:05:17 2011
@@ -25,7 +25,7 @@ import java.util.Iterator;
import org.apache.directory.shared.dsmlv2.ParserUtils;
import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.DefaultModification;
import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.Modification;
@@ -107,7 +107,7 @@ public class ModifyRequestDsml
*/
public void addAttributeTypeAndValues( String type )
{
- currentAttribute = new DefaultEntryAttribute( type );
+ currentAttribute = new DefaultAttribute( type );
Modification modification = new DefaultModification( currentOperation, currentAttribute );
getDecorated().addModification( modification );
Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/EntryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/EntryTest.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/EntryTest.java (original)
+++ directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/EntryTest.java Fri Apr 1 00:05:17 2011
@@ -39,7 +39,7 @@ import java.util.Set;
import org.apache.directory.shared.ldap.model.entry.BinaryValue;
import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.StringValue;
@@ -81,10 +81,10 @@ public class EntryTest
{
Entry entry = new DefaultEntry( EXAMPLE_DN );
- Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
- Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
- Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
- Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
+ Attribute attrOC = new DefaultAttribute( "objectClass", "top", "person" );
+ Attribute attrCN = new DefaultAttribute( "cn", "test1", "test2" );
+ Attribute attrSN = new DefaultAttribute( "sn", "Test1", "Test2" );
+ Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, BYTES2 );
entry.put( attrOC, attrCN, attrSN, attrPWD );
@@ -256,9 +256,9 @@ public class EntryTest
@Test
public void testDefaultClientEntryLdapDNEntryAttributeArray()
{
- Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
- Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
- Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
+ Attribute attrOC = new DefaultAttribute( "objectClass", "top", "person" );
+ Attribute attrCN = new DefaultAttribute( "cn", "test1", "test2" );
+ Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, BYTES2 );
Entry entry = new DefaultEntry( EXAMPLE_DN, attrOC, attrCN, attrPWD );
@@ -304,7 +304,7 @@ public class EntryTest
Attribute attr = entry.get( "objectclass" );
assertEquals( 2, attr.size() );
- Attribute attrCN2 = new DefaultEntryAttribute( "cn", "test1", "test3" );
+ Attribute attrCN2 = new DefaultAttribute( "cn", "test1", "test3" );
entry.add( attrCN2 );
assertEquals( 4, entry.size() );
attr = entry.get( "cn" );
@@ -483,10 +483,10 @@ public class EntryTest
{
Entry entry = new DefaultEntry( EXAMPLE_DN );
- Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
- Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
- Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
- Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
+ Attribute attrOC = new DefaultAttribute( "objectClass", "top", "person" );
+ Attribute attrCN = new DefaultAttribute( "cn", "test1", "test2" );
+ Attribute attrSN = new DefaultAttribute( "sn", "Test1", "Test2" );
+ Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, BYTES2 );
assertFalse( entry.contains( attrOC, attrCN ) );
@@ -511,7 +511,7 @@ public class EntryTest
assertFalse( entry.containsAttribute( "objectClass" ) );
- Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, (byte[])null, BYTES2 );
+ Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, (byte[])null, BYTES2 );
entry.add( attrPWD );
@@ -535,10 +535,10 @@ public class EntryTest
assertFalse( entry.containsAttribute( "objectClass" ) );
- Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
- Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
- Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2", (String)null );
- Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
+ Attribute attrOC = new DefaultAttribute( "objectClass", "top", "person" );
+ Attribute attrCN = new DefaultAttribute( "cn", "test1", "test2" );
+ Attribute attrSN = new DefaultAttribute( "sn", "Test1", "Test2", (String)null );
+ Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, BYTES2 );
entry.add( attrOC, attrCN, attrSN, attrPWD );
@@ -564,8 +564,8 @@ public class EntryTest
assertFalse( entry.containsAttribute( "objectClass" ) );
- Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2", (String)null );
- Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2, (byte[])null );
+ Attribute attrCN = new DefaultAttribute( "cn", "test1", "test2", (String)null );
+ Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, BYTES2, (byte[])null );
entry.add( attrCN, attrPWD );
@@ -597,10 +597,10 @@ public class EntryTest
assertFalse( entry.containsAttribute( "objectClass" ) );
- Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
- Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
- Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
- Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
+ Attribute attrOC = new DefaultAttribute( "objectClass", "top", "person" );
+ Attribute attrCN = new DefaultAttribute( "cn", "test1", "test2" );
+ Attribute attrSN = new DefaultAttribute( "sn", "Test1", "Test2" );
+ Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, BYTES2 );
entry.add( attrOC, attrCN, attrSN, attrPWD );
@@ -635,10 +635,10 @@ public class EntryTest
entry2.setDn( EXAMPLE_DN );
assertEquals( entry1, entry2 );
- Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
- Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
- Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
- Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
+ Attribute attrOC = new DefaultAttribute( "objectClass", "top", "person" );
+ Attribute attrCN = new DefaultAttribute( "cn", "test1", "test2" );
+ Attribute attrSN = new DefaultAttribute( "sn", "Test1", "Test2" );
+ Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, BYTES2 );
entry1.put( attrOC, attrCN, attrSN, attrPWD );
entry2.put( attrOC, attrCN, attrSN );
@@ -647,8 +647,8 @@ public class EntryTest
entry2.put( attrPWD );
assertEquals( entry1, entry2 );
- Attribute attrL1 = new DefaultEntryAttribute( "l", "Paris", "New-York" );
- Attribute attrL2 = new DefaultEntryAttribute( "l", "Paris", "Tokyo" );
+ Attribute attrL1 = new DefaultAttribute( "l", "Paris", "New-York" );
+ Attribute attrL2 = new DefaultAttribute( "l", "Paris", "Tokyo" );
entry1.put( attrL1 );
entry2.put( attrL1 );
@@ -676,10 +676,10 @@ public class EntryTest
assertNull( entry.get( "objectClass" ) );
- Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
- Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
- Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
- Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
+ Attribute attrOC = new DefaultAttribute( "objectClass", "top", "person" );
+ Attribute attrCN = new DefaultAttribute( "cn", "test1", "test2" );
+ Attribute attrSN = new DefaultAttribute( "sn", "Test1", "Test2" );
+ Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, BYTES2 );
entry.add( attrOC, attrCN, attrSN, attrPWD );
@@ -729,10 +729,10 @@ public class EntryTest
assertEquals( entry1.hashCode(), entry2.hashCode() );
- Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
- Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
- Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
- Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
+ Attribute attrOC = new DefaultAttribute( "objectClass", "top", "person" );
+ Attribute attrCN = new DefaultAttribute( "cn", "test1", "test2" );
+ Attribute attrSN = new DefaultAttribute( "sn", "Test1", "Test2" );
+ Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, BYTES2 );
entry1.add( attrOC, attrCN, attrSN, attrPWD );
entry2.add( attrOC, attrCN, attrSN, attrPWD );
@@ -757,7 +757,7 @@ public class EntryTest
assertFalse( entry.containsAttribute( "objectClass" ) );
assertFalse( entry.hasObjectClass( "top" ) );
- entry.add( new DefaultEntryAttribute( "objectClass", "top", "person" ) );
+ entry.add( new DefaultAttribute( "objectClass", "top", "person" ) );
assertTrue( entry.hasObjectClass( "top" ) );
assertTrue( entry.hasObjectClass( "person" ) );
@@ -806,10 +806,10 @@ public class EntryTest
{
Entry entry = new DefaultEntry( EXAMPLE_DN );
- Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
- Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
- Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
- Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
+ Attribute attrOC = new DefaultAttribute( "objectClass", "top", "person" );
+ Attribute attrCN = new DefaultAttribute( "cn", "test1", "test2" );
+ Attribute attrSN = new DefaultAttribute( "sn", "Test1", "Test2" );
+ Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, BYTES2 );
List<Attribute> removed = entry.put( attrOC, attrCN, attrSN, attrPWD );
@@ -820,7 +820,7 @@ public class EntryTest
assertTrue( entry.containsAttribute( " sn " ) );
assertTrue( entry.containsAttribute( "userPassword" ) );
- Attribute attrCN2 = new DefaultEntryAttribute( "cn", "test3", "test4" );
+ Attribute attrCN2 = new DefaultAttribute( "cn", "test3", "test4" );
removed = entry.put( attrCN2 );
assertEquals( 4, entry.size() );
assertEquals( 1, removed.size() );
@@ -1009,10 +1009,10 @@ public class EntryTest
{
Entry entry = new DefaultEntry( EXAMPLE_DN );
- Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
- Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
- Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
- Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
+ Attribute attrOC = new DefaultAttribute( "objectClass", "top", "person" );
+ Attribute attrCN = new DefaultAttribute( "cn", "test1", "test2" );
+ Attribute attrSN = new DefaultAttribute( "sn", "Test1", "Test2" );
+ Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, BYTES2 );
entry.put( attrOC, attrCN, attrSN, attrPWD );
@@ -1037,10 +1037,10 @@ public class EntryTest
{
Entry entry = new DefaultEntry( EXAMPLE_DN );
- Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
- Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
- Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
- Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
+ Attribute attrOC = new DefaultAttribute( "objectClass", "top", "person" );
+ Attribute attrCN = new DefaultAttribute( "cn", "test1", "test2" );
+ Attribute attrSN = new DefaultAttribute( "sn", "Test1", "Test2" );
+ Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, BYTES2 );
entry.put( attrOC, attrCN, attrSN, attrPWD );
@@ -1069,7 +1069,7 @@ public class EntryTest
{
Entry entry = new DefaultEntry( EXAMPLE_DN );
- Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, (byte[])null, BYTES2 );
+ Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, (byte[])null, BYTES2 );
entry.put( attrPWD );
assertTrue( entry.remove( "userPassword", (byte[])null ) );
@@ -1120,8 +1120,8 @@ public class EntryTest
{
Entry entry = new DefaultEntry( EXAMPLE_DN );
- Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2", (String)null );
- Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2, (byte[])null );
+ Attribute attrCN = new DefaultAttribute( "cn", "test1", "test2", (String)null );
+ Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, BYTES2, (byte[])null );
entry.add( attrCN, attrPWD );
Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareEntryAttributeSerializationTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareEntryAttributeSerializationTest.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareEntryAttributeSerializationTest.java (original)
+++ directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareEntryAttributeSerializationTest.java Fri Apr 1 00:05:17 2011
@@ -28,7 +28,7 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import org.apache.directory.shared.ldap.model.entry.Attribute;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeValueException;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.SchemaManager;
@@ -73,7 +73,7 @@ public class SchemaAwareEntryAttributeSe
@Test
public void testEntryAttributeNoStringValueSerialization() throws IOException, ClassNotFoundException, LdapInvalidAttributeValueException
{
- Attribute attribute1 = new DefaultEntryAttribute( cn );
+ Attribute attribute1 = new DefaultAttribute( cn );
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -85,7 +85,7 @@ public class SchemaAwareEntryAttributeSe
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- Attribute attribute2 = new DefaultEntryAttribute( cn );
+ Attribute attribute2 = new DefaultAttribute( cn );
attribute2.readExternal( in );
attribute2.apply( cn );
@@ -96,7 +96,7 @@ public class SchemaAwareEntryAttributeSe
@Test
public void testEntryAttributeOneStringValueSerialization() throws IOException, ClassNotFoundException, LdapInvalidAttributeValueException
{
- Attribute attribute1 = new DefaultEntryAttribute( "CommonName", cn, "test" );
+ Attribute attribute1 = new DefaultAttribute( "CommonName", cn, "test" );
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -108,7 +108,7 @@ public class SchemaAwareEntryAttributeSe
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- Attribute attribute2 = new DefaultEntryAttribute( cn );
+ Attribute attribute2 = new DefaultAttribute( cn );
attribute2.readExternal( in );
attribute2.apply( cn );
@@ -120,7 +120,7 @@ public class SchemaAwareEntryAttributeSe
@Test
public void testEntryAttributeManyStringValuesSerialization() throws IOException, ClassNotFoundException, LdapInvalidAttributeValueException
{
- Attribute attribute1 = new DefaultEntryAttribute( "CN", cn, "test1", "test2", "test3" );
+ Attribute attribute1 = new DefaultAttribute( "CN", cn, "test1", "test2", "test3" );
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -132,7 +132,7 @@ public class SchemaAwareEntryAttributeSe
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- Attribute attribute2 = new DefaultEntryAttribute( cn );
+ Attribute attribute2 = new DefaultAttribute( cn );
attribute2.readExternal( in );
attribute2.apply( cn );
@@ -144,7 +144,7 @@ public class SchemaAwareEntryAttributeSe
@Test
public void testEntryAttributeNoBinaryValueSerialization() throws IOException, ClassNotFoundException, LdapInvalidAttributeValueException, LdapInvalidAttributeValueException
{
- Attribute attribute1 = new DefaultEntryAttribute( userCertificate );
+ Attribute attribute1 = new DefaultAttribute( userCertificate );
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -156,7 +156,7 @@ public class SchemaAwareEntryAttributeSe
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- Attribute attribute2 = new DefaultEntryAttribute( userCertificate );
+ Attribute attribute2 = new DefaultAttribute( userCertificate );
attribute2.readExternal( in );
attribute2.apply( userCertificate );
@@ -167,7 +167,7 @@ public class SchemaAwareEntryAttributeSe
@Test
public void testEntryAttributeOneBinaryValueSerialization() throws IOException, ClassNotFoundException, LdapInvalidAttributeValueException
{
- Attribute attribute1 = new DefaultEntryAttribute( userCertificate, data1 );
+ Attribute attribute1 = new DefaultAttribute( userCertificate, data1 );
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -179,7 +179,7 @@ public class SchemaAwareEntryAttributeSe
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- Attribute attribute2 = new DefaultEntryAttribute( userCertificate );
+ Attribute attribute2 = new DefaultAttribute( userCertificate );
attribute2.readExternal( in );
attribute2.apply( userCertificate );
@@ -190,7 +190,7 @@ public class SchemaAwareEntryAttributeSe
@Test
public void testEntryAttributeManyBinaryValuesSerialization() throws IOException, ClassNotFoundException, LdapInvalidAttributeValueException
{
- Attribute attribute1 = new DefaultEntryAttribute( "UserCertificate", userCertificate, data1, data2, data3 );
+ Attribute attribute1 = new DefaultAttribute( "UserCertificate", userCertificate, data1, data2, data3 );
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
@@ -202,7 +202,7 @@ public class SchemaAwareEntryAttributeSe
byte[] data = baos.toByteArray();
in = new ObjectInputStream( new ByteArrayInputStream( data ) );
- Attribute attribute2 = new DefaultEntryAttribute( userCertificate );
+ Attribute attribute2 = new DefaultAttribute( userCertificate );
attribute2.readExternal( in );
attribute2.apply( userCertificate );
Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareModificationSerializationTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareModificationSerializationTest.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareModificationSerializationTest.java (original)
+++ directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareModificationSerializationTest.java Fri Apr 1 00:05:17 2011
@@ -28,7 +28,7 @@ import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.DefaultModification;
import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.Modification;
@@ -156,7 +156,7 @@ public class SchemaAwareModificationSeri
@Test
public void testCreateServerModification() throws LdapException
{
- Attribute attribute = new DefaultEntryAttribute( "cn", CN_AT );
+ Attribute attribute = new DefaultAttribute( "cn", CN_AT );
attribute.add( "test1", "test2" );
Modification mod = new DefaultModification( CN_AT, ModificationOperation.ADD_ATTRIBUTE, attribute );
@@ -178,7 +178,7 @@ public class SchemaAwareModificationSeri
@Test
public void testSerializationModificationADD() throws ClassNotFoundException, IOException, LdapInvalidAttributeValueException
{
- Attribute attribute = new DefaultEntryAttribute( "cn", CN_AT );
+ Attribute attribute = new DefaultAttribute( "cn", CN_AT );
attribute.add( "test1", "test2" );
DefaultModification mod = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attribute );
@@ -192,7 +192,7 @@ public class SchemaAwareModificationSeri
@Test
public void testSerializationModificationREPLACE() throws ClassNotFoundException, IOException, LdapInvalidAttributeValueException
{
- Attribute attribute = new DefaultEntryAttribute( "cn", CN_AT );
+ Attribute attribute = new DefaultAttribute( "cn", CN_AT );
attribute.add( "test1", "test2" );
DefaultModification mod = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attribute );
@@ -206,7 +206,7 @@ public class SchemaAwareModificationSeri
@Test
public void testSerializationModificationREMOVE() throws ClassNotFoundException, IOException, LdapInvalidAttributeValueException
{
- Attribute attribute = new DefaultEntryAttribute( "cn", CN_AT );
+ Attribute attribute = new DefaultAttribute( "cn", CN_AT );
attribute.add( "test1", "test2" );
DefaultModification mod = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attribute );
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java Fri Apr 1 00:05:17 2011
@@ -31,7 +31,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.codec.api.LdapConstants;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.Value;
@@ -207,7 +207,7 @@ public final class AddRequestDecorator e
}
// fix this to use AttributeImpl(type.getString().toLowerCase())
- currentAttribute = new DefaultEntryAttribute( type );
+ currentAttribute = new DefaultAttribute( type );
getDecorated().getEntry().put( currentAttribute );
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java Fri Apr 1 00:05:17 2011
@@ -33,7 +33,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.codec.api.LdapConstants;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.DefaultModification;
import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.Modification;
@@ -194,7 +194,7 @@ public class ModifyRequestDecorator exte
*/
public void addAttributeTypeAndValues( String type )
{
- currentAttribute = new DefaultEntryAttribute( type );
+ currentAttribute = new DefaultAttribute( type );
Modification modification = new DefaultModification( currentOperation, currentAttribute );
getDecorated().addModification( modification );
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java Fri Apr 1 00:05:17 2011
@@ -34,7 +34,7 @@ import org.apache.directory.shared.i18n.
import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.codec.api.LdapConstants;
import org.apache.directory.shared.ldap.codec.api.MessageDecorator;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.exception.LdapException;
@@ -190,7 +190,7 @@ public class SearchResultEntryDecorator
*/
public void addAttribute( String type ) throws LdapException
{
- currentAttribute = new DefaultEntryAttribute( type );
+ currentAttribute = new DefaultAttribute( type );
getDecorated().getEntry().put( currentAttribute );
}
Modified: directory/shared/trunk/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeValueTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeValueTest.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeValueTest.java (original)
+++ directory/shared/trunk/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeValueTest.java Fri Apr 1 00:05:17 2011
@@ -29,7 +29,7 @@ import java.util.Set;
import com.mycila.junit.concurrent.Concurrency;
import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.aci.protectedItem.AttributeValueItem;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.junit.Before;
import org.junit.Test;
@@ -58,13 +58,13 @@ public class ProtectedItem_AttributeValu
public void initNames() throws Exception
{
- Attribute attrA = new DefaultEntryAttribute( "aa" );
+ Attribute attrA = new DefaultAttribute( "aa" );
attrA.add( "aa" );
- Attribute attrB = new DefaultEntryAttribute( "bb" );
+ Attribute attrB = new DefaultAttribute( "bb" );
attrB.add( "bb" );
- Attribute attrC = new DefaultEntryAttribute( "cc" );
+ Attribute attrC = new DefaultAttribute( "cc" );
attrC.add( "cc" );
- Attribute attrD = new DefaultEntryAttribute( "dd" );
+ Attribute attrD = new DefaultAttribute( "dd" );
attrD.add( "dd" );
Set<Attribute> colA = new HashSet<Attribute>();
Modified: directory/shared/trunk/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItemTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItemTest.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItemTest.java (original)
+++ directory/shared/trunk/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItemTest.java Fri Apr 1 00:05:17 2011
@@ -28,7 +28,7 @@ import java.util.Set;
import com.mycila.junit.concurrent.Concurrency;
import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.filter.UndefinedNode;
import org.junit.Before;
@@ -63,22 +63,22 @@ public class AttributeValueItemTest
public void initNames() throws Exception
{
attributeA = new HashSet<Attribute>();
- attributeA.add( new DefaultEntryAttribute( "aa", "aa" ) );
- attributeA.add( new DefaultEntryAttribute( "aa", "bb" ) );
- attributeA.add( new DefaultEntryAttribute( "aa", "cc" ) );
+ attributeA.add( new DefaultAttribute( "aa", "aa" ) );
+ attributeA.add( new DefaultAttribute( "aa", "bb" ) );
+ attributeA.add( new DefaultAttribute( "aa", "cc" ) );
// Sets aren't ordered, so adding order must not matter
attributeB = new HashSet<Attribute>();
- attributeB.add( new DefaultEntryAttribute( "aa", "bb" ) );
- attributeB.add( new DefaultEntryAttribute( "aa", "cc" ) );
- attributeB.add( new DefaultEntryAttribute( "aa", "aa" ) );
+ attributeB.add( new DefaultAttribute( "aa", "bb" ) );
+ attributeB.add( new DefaultAttribute( "aa", "cc" ) );
+ attributeB.add( new DefaultAttribute( "aa", "aa" ) );
attributeC = new HashSet<Attribute>();
- attributeC.add( new DefaultEntryAttribute( "aa", "aa" ) );
- attributeC.add( new DefaultEntryAttribute( "bb", "bb" ) );
- attributeC.add( new DefaultEntryAttribute( "aa", "cc" ) );
+ attributeC.add( new DefaultAttribute( "aa", "aa" ) );
+ attributeC.add( new DefaultAttribute( "bb", "bb" ) );
+ attributeC.add( new DefaultAttribute( "aa", "cc" ) );
attributeD = new HashSet<Attribute>();
- attributeD.add( new DefaultEntryAttribute( "aa", "aa" ) );
- attributeD.add( new DefaultEntryAttribute( "aa", "bb" ) );
- attributeD.add( new DefaultEntryAttribute( "aa", "dd" ) );
+ attributeD.add( new DefaultAttribute( "aa", "aa" ) );
+ attributeD.add( new DefaultAttribute( "aa", "bb" ) );
+ attributeD.add( new DefaultAttribute( "aa", "dd" ) );
attributeValueItemA = new AttributeValueItem( attributeA );
attributeValueItemACopy = new AttributeValueItem( attributeA );
attributeValueItemB = new AttributeValueItem( attributeB );
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AttributeUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AttributeUtils.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AttributeUtils.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AttributeUtils.java Fri Apr 1 00:05:17 2011
@@ -1128,7 +1128,7 @@ public final class AttributeUtils
try
{
- Attribute clientAttribute = new DefaultEntryAttribute( attribute.getID() );
+ Attribute clientAttribute = new DefaultAttribute( attribute.getID() );
for ( NamingEnumeration<?> values = attribute.getAll(); values.hasMoreElements(); )
{
Copied: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultAttribute.java (from r1087508, directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttribute.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultAttribute.java?p2=directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultAttribute.java&p1=directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttribute.java&r1=1087508&r2=1087515&rev=1087515&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttribute.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultAttribute.java Fri Apr 1 00:05:17 2011
@@ -46,10 +46,10 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class DefaultEntryAttribute implements Attribute
+public class DefaultAttribute implements Attribute
{
/** logger for reporting errors that might not be handled properly upstream */
- private static final Logger LOG = LoggerFactory.getLogger( DefaultEntryAttribute.class );
+ private static final Logger LOG = LoggerFactory.getLogger( DefaultAttribute.class );
/** The associated AttributeType */
private AttributeType attributeType;
@@ -121,18 +121,18 @@ public class DefaultEntryAttribute imple
// maybe have some additional convenience constructors which take
// an initial value as a string or a byte[]
/**
- * Create a new instance of a EntryAttribute, without ID nor value.
+ * Create a new instance of a Attribute, without ID nor value.
* Used by the serializer
*/
- /* No protection */ DefaultEntryAttribute()
+ DefaultAttribute()
{
}
/**
- * Create a new instance of a EntryAttribute, without ID nor value.
+ * Create a new instance of a Attribute, without ID nor value.
*/
- /* No qualifier */ DefaultEntryAttribute( AttributeType attributeType, String upId, String normId, boolean isHR, int hashCode, Value<?>... values)
+ DefaultAttribute( AttributeType attributeType, String upId, String normId, boolean isHR, int hashCode, Value<?>... values)
{
this.attributeType = attributeType;
this.upId = upId;
@@ -151,11 +151,11 @@ public class DefaultEntryAttribute imple
/**
- * Create a new instance of a EntryAttribute, without ID nor value.
+ * Create a new instance of a Attribute, without ID nor value.
*
* @param attributeType the attributeType for the empty attribute added into the entry
*/
- public DefaultEntryAttribute( AttributeType attributeType )
+ public DefaultAttribute( AttributeType attributeType )
{
if ( attributeType != null )
{
@@ -172,21 +172,21 @@ public class DefaultEntryAttribute imple
/**
- * Create a new instance of a EntryAttribute, without value.
+ * Create a new instance of a Attribute, without value.
*/
- public DefaultEntryAttribute( String upId )
+ public DefaultAttribute( String upId )
{
setUpId( upId );
}
/**
- * Create a new instance of a EntryAttribute, without value.
+ * Create a new instance of a Attribute, without value.
*
* @param upId the ID for the added attributeType
* @param attributeType the added AttributeType
*/
- public DefaultEntryAttribute( String upId, AttributeType attributeType )
+ public DefaultAttribute( String upId, AttributeType attributeType )
{
if ( attributeType == null )
{
@@ -218,7 +218,7 @@ public class DefaultEntryAttribute imple
* @param upId
* @param vals an initial set of values for this attribute
*/
- public DefaultEntryAttribute( String upId, Value<?>... vals )
+ public DefaultAttribute( String upId, Value<?>... vals )
{
// The value can be null, this is a valid value.
if ( vals[0] == null )
@@ -247,25 +247,25 @@ public class DefaultEntryAttribute imple
/**
- * Create a new instance of a EntryAttribute, without ID but with some values.
+ * Create a new instance of a Attribute, without ID but with some values.
*
* @param attributeType The attributeType added on creation
* @param vals The added value for this attribute
*/
- public DefaultEntryAttribute( AttributeType attributeType, String... vals ) throws LdapInvalidAttributeValueException
+ public DefaultAttribute( AttributeType attributeType, String... vals ) throws LdapInvalidAttributeValueException
{
this( null, attributeType, vals );
}
/**
- * Create a new instance of a EntryAttribute.
+ * Create a new instance of a Attribute.
*
* @param upId the ID for the added attribute
* @param attributeType The attributeType added on creation
* @param vals the added values for this attribute
*/
- public DefaultEntryAttribute( String upId, AttributeType attributeType, String... vals ) throws LdapInvalidAttributeValueException
+ public DefaultAttribute( String upId, AttributeType attributeType, String... vals ) throws LdapInvalidAttributeValueException
{
if ( attributeType == null )
{
@@ -293,7 +293,7 @@ public class DefaultEntryAttribute imple
* @param attributeType the attribute type according to the schema
* @param vals an initial set of values for this attribute
*/
- public DefaultEntryAttribute( String upId, AttributeType attributeType, Value<?>... vals ) throws LdapInvalidAttributeValueException
+ public DefaultAttribute( String upId, AttributeType attributeType, Value<?>... vals ) throws LdapInvalidAttributeValueException
{
if ( attributeType == null )
{
@@ -318,16 +318,16 @@ public class DefaultEntryAttribute imple
* @param attributeType the attribute type according to the schema
* @param vals an initial set of values for this attribute
*/
- public DefaultEntryAttribute( AttributeType attributeType, Value<?>... vals ) throws LdapInvalidAttributeValueException
+ public DefaultAttribute( AttributeType attributeType, Value<?>... vals ) throws LdapInvalidAttributeValueException
{
this( null, attributeType, vals );
}
/**
- * Create a new instance of a EntryAttribute.
+ * Create a new instance of a Attribute.
*/
- public DefaultEntryAttribute( String upId, String... vals )
+ public DefaultAttribute( String upId, String... vals )
{
try
{
@@ -343,9 +343,9 @@ public class DefaultEntryAttribute imple
/**
- * Create a new instance of a EntryAttribute, with some byte[] values.
+ * Create a new instance of a Attribute, with some byte[] values.
*/
- public DefaultEntryAttribute( String upId, byte[]... vals )
+ public DefaultAttribute( String upId, byte[]... vals )
{
try
{
@@ -361,25 +361,25 @@ public class DefaultEntryAttribute imple
/**
- * Create a new instance of a EntryAttribute, with some byte[] values.
+ * Create a new instance of a Attribute, with some byte[] values.
*
* @param attributeType The attributeType added on creation
* @param vals The value for the added attribute
*/
- public DefaultEntryAttribute( AttributeType attributeType, byte[]... vals ) throws LdapInvalidAttributeValueException
+ public DefaultAttribute( AttributeType attributeType, byte[]... vals ) throws LdapInvalidAttributeValueException
{
this( null, attributeType, vals );
}
/**
- * Create a new instance of a EntryAttribute, with some byte[] values.
+ * Create a new instance of a Attribute, with some byte[] values.
*
* @param upId the ID for the added attribute
* @param attributeType the AttributeType to be added
* @param vals the values for the added attribute
*/
- public DefaultEntryAttribute( String upId, AttributeType attributeType, byte[]... vals ) throws LdapInvalidAttributeValueException
+ public DefaultAttribute( String upId, AttributeType attributeType, byte[]... vals ) throws LdapInvalidAttributeValueException
{
if ( attributeType == null )
{
@@ -401,7 +401,7 @@ public class DefaultEntryAttribute imple
* @param attributeType The attribute's type
* @param attribute The attribute to be copied
*/
- public DefaultEntryAttribute( AttributeType attributeType, Attribute attribute ) throws LdapException
+ public DefaultAttribute( AttributeType attributeType, Attribute attribute ) throws LdapException
{
// Copy the common values. isHR is only available on a ServerAttribute
this.attributeType = attributeType;
@@ -1869,7 +1869,7 @@ public class DefaultEntryAttribute imple
{
try
{
- DefaultEntryAttribute attribute = (DefaultEntryAttribute)super.clone();
+ DefaultAttribute attribute = (DefaultAttribute)super.clone();
attribute.setUpId( upId );
attribute.values = new LinkedHashSet<Value<?>>( values.size() );
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java Fri Apr 1 00:05:17 2011
@@ -222,7 +222,7 @@ public final class DefaultEntry implemen
}
// Create a new ServerAttribute.
- Attribute serverAttribute = new DefaultEntryAttribute( attributeType, attribute );
+ Attribute serverAttribute = new DefaultAttribute( attributeType, attribute );
// And store it
add( serverAttribute );
@@ -587,7 +587,7 @@ public final class DefaultEntry implemen
*/
protected void createAttribute( String upId, AttributeType attributeType, byte[]... values ) throws LdapInvalidAttributeValueException
{
- Attribute attribute = new DefaultEntryAttribute( attributeType, values );
+ Attribute attribute = new DefaultAttribute( attributeType, values );
attribute.setUpId( upId, attributeType );
attributes.put( attributeType.getOid(), attribute );
}
@@ -601,7 +601,7 @@ public final class DefaultEntry implemen
*/
protected void createAttribute( String upId, AttributeType attributeType, String... values ) throws LdapInvalidAttributeValueException
{
- Attribute attribute = new DefaultEntryAttribute( attributeType, values );
+ Attribute attribute = new DefaultAttribute( attributeType, values );
attribute.setUpId( upId, attributeType );
attributes.put( attributeType.getOid(), attribute );
}
@@ -615,7 +615,7 @@ public final class DefaultEntry implemen
*/
protected void createAttribute( String upId, AttributeType attributeType, Value<?>... values ) throws LdapInvalidAttributeValueException
{
- Attribute attribute = new DefaultEntryAttribute( attributeType, values );
+ Attribute attribute = new DefaultAttribute( attributeType, values );
attribute.setUpId( upId, attributeType );
attributes.put( attributeType.getOid(), attribute );
}
@@ -933,7 +933,7 @@ public final class DefaultEntry implemen
{
// We have to create a new Attribute and set the values
// and the upId
- attributes.put( id, new DefaultEntryAttribute( upId, values ) );
+ attributes.put( id, new DefaultAttribute( upId, values ) );
}
}
}
@@ -975,7 +975,7 @@ public final class DefaultEntry implemen
{
// We have to create a new Attribute and set the values
// and the upId
- attributes.put( id, new DefaultEntryAttribute( upId, values ) );
+ attributes.put( id, new DefaultAttribute( upId, values ) );
}
}
}
@@ -1017,7 +1017,7 @@ public final class DefaultEntry implemen
{
// We have to create a new Attribute and set the values
// and the upId
- attributes.put( id, new DefaultEntryAttribute( upId, values ) );
+ attributes.put( id, new DefaultAttribute( upId, values ) );
}
}
}
@@ -1468,7 +1468,7 @@ public final class DefaultEntry implemen
String id = getId( upId );
// Create a new attribute
- Attribute clientAttribute = new DefaultEntryAttribute( upId, values );
+ Attribute clientAttribute = new DefaultAttribute( upId, values );
// Replace the previous one, and return it back
return attributes.put( id, clientAttribute );
@@ -1507,7 +1507,7 @@ public final class DefaultEntry implemen
String id = getId( upId );
// Create a new attribute
- Attribute clientAttribute = new DefaultEntryAttribute( upId, values );
+ Attribute clientAttribute = new DefaultAttribute( upId, values );
// Replace the previous one, and return it back
return attributes.put( id, clientAttribute );
@@ -1546,7 +1546,7 @@ public final class DefaultEntry implemen
String id = getId( upId );
// Create a new attribute
- Attribute clientAttribute = new DefaultEntryAttribute( upId, values );
+ Attribute clientAttribute = new DefaultAttribute( upId, values );
// Replace the previous one, and return it back
return attributes.put( id, clientAttribute );
@@ -1602,7 +1602,7 @@ public final class DefaultEntry implemen
removed.add( attributes.remove( id ) );
}
- Attribute newAttribute = new DefaultEntryAttribute( upId );
+ Attribute newAttribute = new DefaultAttribute( upId );
attributes.put( id, newAttribute );
added = true;
}
@@ -1643,7 +1643,7 @@ public final class DefaultEntry implemen
removed.add( attributes.get( oid ) );
}
- attributes.put( oid, new DefaultEntryAttribute( upId, attributeType ) );
+ attributes.put( oid, new DefaultAttribute( upId, attributeType ) );
added = true;
}
}
@@ -1675,7 +1675,7 @@ public final class DefaultEntry implemen
}
Attribute attribute = attributes.put( attributeType.getOid(),
- new DefaultEntryAttribute( attributeType ) );
+ new DefaultAttribute( attributeType ) );
if ( attribute != null )
{
@@ -1821,7 +1821,7 @@ public final class DefaultEntry implemen
throw new UnsupportedOperationException( message );
}
- Attribute attribute = new DefaultEntryAttribute( upId, attributeType, values );
+ Attribute attribute = new DefaultAttribute( upId, attributeType, values );
return attributes.put( attributeType.getOid(), attribute );
}
@@ -1864,7 +1864,7 @@ public final class DefaultEntry implemen
}
}
- Attribute attribute = new DefaultEntryAttribute( upId, attributeType, values );
+ Attribute attribute = new DefaultAttribute( upId, attributeType, values );
return attributes.put( attributeType.getOid(), attribute );
}
@@ -1907,7 +1907,7 @@ public final class DefaultEntry implemen
}
}
- Attribute attribute = new DefaultEntryAttribute( upId, attributeType, values );
+ Attribute attribute = new DefaultAttribute( upId, attributeType, values );
return attributes.put( attributeType.getOid(), attribute );
}
@@ -2593,7 +2593,7 @@ public final class DefaultEntry implemen
for ( int i = 0; i < nbAttributes; i++ )
{
// Read each attribute
- Attribute attribute = new DefaultEntryAttribute();
+ Attribute attribute = new DefaultAttribute();
attribute.readExternal( in );
if ( schemaManager != null )
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultModification.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultModification.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultModification.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultModification.java Fri Apr 1 00:05:17 2011
@@ -116,7 +116,7 @@ public class DefaultModification impleme
at = schemaManager.lookupAttributeTypeRegistry( modAttribute.getId() );
}
- attribute = new DefaultEntryAttribute( at, modAttribute );
+ attribute = new DefaultAttribute( at, modAttribute );
}
catch ( LdapException ne )
{
@@ -261,7 +261,7 @@ public class DefaultModification impleme
if ( hasAttribute )
{
- attribute = new DefaultEntryAttribute();
+ attribute = new DefaultAttribute();
attribute.readExternal( in );
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifEntry.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifEntry.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifEntry.java Fri Apr 1 00:05:17 2011
@@ -32,7 +32,7 @@ import java.util.concurrent.ConcurrentHa
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.DefaultModification;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Attribute;
@@ -392,7 +392,7 @@ public class LdifEntry implements Clonea
if ( value == null )
{
value = new StringValue( ( String ) null );
- attr = new DefaultEntryAttribute( id, ( Value<?> ) value );
+ attr = new DefaultAttribute( id, ( Value<?> ) value );
}
else
{
@@ -557,7 +557,7 @@ public class LdifEntry implements Clonea
{
if ( "dn".equalsIgnoreCase( attributeId ) )
{
- return new DefaultEntryAttribute( "dn", entry.getDn().getName() );
+ return new DefaultAttribute( "dn", entry.getDn().getName() );
}
return entry.get( attributeId );
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifReader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifReader.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifReader.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifReader.java Fri Apr 1 00:05:17 2011
@@ -43,7 +43,7 @@ import java.util.NoSuchElementException;
import org.apache.directory.shared.asn1.util.Oid;
import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
import org.apache.directory.shared.ldap.model.exception.LdapException;
@@ -869,11 +869,11 @@ public class LdifReader implements Itera
// Create an attribute
if ( attributeValue instanceof String )
{
- return new DefaultEntryAttribute( attributeType, ( String ) attributeValue );
+ return new DefaultAttribute( attributeType, ( String ) attributeValue );
}
else
{
- return new DefaultEntryAttribute( attributeType, ( byte[] ) attributeValue );
+ return new DefaultAttribute( attributeType, ( byte[] ) attributeValue );
}
}
else
@@ -1046,7 +1046,7 @@ public class LdifReader implements Itera
modified = Strings.trim( line.substring( "add:".length() ) );
modificationType = ModificationOperation.ADD_ATTRIBUTE;
- attribute = new DefaultEntryAttribute( modified );
+ attribute = new DefaultAttribute( modified );
state = ATTRVAL_SPEC;
}
@@ -1060,7 +1060,7 @@ public class LdifReader implements Itera
modified = Strings.trim(line.substring("delete:".length()));
modificationType = ModificationOperation.REMOVE_ATTRIBUTE;
- attribute = new DefaultEntryAttribute( modified );
+ attribute = new DefaultAttribute( modified );
state = ATTRVAL_SPEC_OR_SEP;
}
@@ -1074,7 +1074,7 @@ public class LdifReader implements Itera
modified = Strings.trim(line.substring("replace:".length()));
modificationType = ModificationOperation.REPLACE_ATTRIBUTE;
- attribute = new DefaultEntryAttribute( modified );
+ attribute = new DefaultAttribute( modified );
state = ATTRVAL_SPEC_OR_SEP;
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertor.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertor.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertor.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertor.java Fri Apr 1 00:05:17 2011
@@ -27,7 +27,7 @@ import java.util.Set;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.model.entry.AttributeUtils;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.DefaultModification;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Attribute;
@@ -199,7 +199,7 @@ public final class LdifRevertor
if ( ( mod.get() == null ) && ( previous == null ) )
{
reverseModification = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE,
- new DefaultEntryAttribute( mod.getId() ) );
+ new DefaultAttribute( mod.getId() ) );
reverseModifications.add( 0, reverseModification );
continue;
}
@@ -214,7 +214,7 @@ public final class LdifRevertor
if ( previous == null )
{
- Attribute emptyAttribute = new DefaultEntryAttribute( mod.getId() );
+ Attribute emptyAttribute = new DefaultAttribute( mod.getId() );
reverseModification = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE,
emptyAttribute );
reverseModifications.add( 0, reverseModification );
@@ -364,7 +364,7 @@ public final class LdifRevertor
{
// Create the modification, which is an Remove
Modification modification = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE,
- new DefaultEntryAttribute( ava.getUpType(), ava.getUpValue().getString() ) );
+ new DefaultAttribute( ava.getUpType(), ava.getUpValue().getString() ) );
restored.addModificationItem( modification );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifUtils.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifUtils.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifUtils.java Fri Apr 1 00:05:17 2011
@@ -26,7 +26,7 @@ import javax.naming.directory.Attributes
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.model.entry.AttributeUtils;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.Modification;
@@ -439,7 +439,7 @@ public final class LdifUtils
}
// Stores the new Rdn
- Attribute newRdn = new DefaultEntryAttribute( "newrdn", entry.getNewRdn() );
+ Attribute newRdn = new DefaultAttribute( "newrdn", entry.getNewRdn() );
sb.append( convertToLdif( newRdn, length ) );
// Stores the deleteoldrdn flag
@@ -459,7 +459,7 @@ public final class LdifUtils
// Stores the optional newSuperior
if ( !Strings.isEmpty(entry.getNewSuperior()) )
{
- Attribute newSuperior = new DefaultEntryAttribute( "newsuperior", entry.getNewSuperior() );
+ Attribute newSuperior = new DefaultAttribute( "newsuperior", entry.getNewSuperior() );
sb.append( convertToLdif( newSuperior, length ) );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequestImpl.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequestImpl.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequestImpl.java Fri Apr 1 00:05:17 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.Value;
@@ -89,7 +89,7 @@ public class AddRequestImpl extends Abst
}
// fix this to use AttributeImpl(type.getString().toLowerCase())
- currentAttribute = new DefaultEntryAttribute( type );
+ currentAttribute = new DefaultAttribute( type );
entry.put( currentAttribute );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java Fri Apr 1 00:05:17 2011
@@ -26,7 +26,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.DefaultModification;
import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.Modification;
@@ -128,14 +128,14 @@ public class ModifyRequestImpl extends A
private void addModification( ModificationOperation modOp, String attributeName, byte[]... attributeValue )
{
- Attribute attr = new DefaultEntryAttribute( attributeName, attributeValue );
+ Attribute attr = new DefaultAttribute( attributeName, attributeValue );
addModification( attr, modOp );
}
private void addModification( ModificationOperation modOp, String attributeName, String... attributeValue )
{
- Attribute attr = new DefaultEntryAttribute( attributeName, attributeValue );
+ Attribute attr = new DefaultAttribute( attributeName, attributeValue );
addModification( attr, modOp );
}
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/AttributeUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/AttributeUtilsTest.java?rev=1087515&r1=1087514&r2=1087515&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/AttributeUtilsTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/AttributeUtilsTest.java Fri Apr 1 00:05:17 2011
@@ -73,7 +73,7 @@ public class AttributeUtilsTest
public void testApplyAddModificationToEmptyEntry() throws LdapException
{
Entry entry = new DefaultEntry();
- Attribute attr = new DefaultEntryAttribute( "cn", "test" );
+ Attribute attr = new DefaultAttribute( "cn", "test" );
Modification modification = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attr );
AttributeUtils.applyModification( entry, modification );
assertNotNull( entry.get( "cn" ) );
@@ -92,7 +92,7 @@ public class AttributeUtilsTest
entry.add( "dc", "apache" );
assertEquals( 1, entry.size() );
- Attribute attr = new DefaultEntryAttribute( "cn", "test" );
+ Attribute attr = new DefaultAttribute( "cn", "test" );
Modification modification = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attr );
AttributeUtils.applyModification( entry, modification );
@@ -113,7 +113,7 @@ public class AttributeUtilsTest
entry.put( "cn", "apache" );
assertEquals( 1, entry.size() );
- Attribute attr = new DefaultEntryAttribute( "cn", "test" );
+ Attribute attr = new DefaultAttribute( "cn", "test" );
Modification modification = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attr );
AttributeUtils.applyModification( entry, modification );
assertNotNull( entry.get( "cn" ) );
@@ -151,7 +151,7 @@ public class AttributeUtilsTest
entry.put( "cn", "test", "apache" );
assertEquals( 1, entry.size() );
- Attribute attr = new DefaultEntryAttribute( "cn", "test" );
+ Attribute attr = new DefaultAttribute( "cn", "test" );
Modification modification = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attr );
AttributeUtils.applyModification( entry, modification );
assertNotNull( entry.get( "cn" ) );
@@ -186,7 +186,7 @@ public class AttributeUtilsTest
{
Entry entry = new DefaultEntry();
- Attribute attr = new DefaultEntryAttribute( "cn", "test" );
+ Attribute attr = new DefaultAttribute( "cn", "test" );
Modification modification = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attr );
AttributeUtils.applyModification( entry, modification );
@@ -203,10 +203,10 @@ public class AttributeUtilsTest
{
Entry entry = new DefaultEntry();
- Attribute dc = new DefaultEntryAttribute( "dc", "apache" );
+ Attribute dc = new DefaultAttribute( "dc", "apache" );
entry.put( dc );
- Attribute cn = new DefaultEntryAttribute( "cn", "test" );
+ Attribute cn = new DefaultAttribute( "cn", "test" );
Modification modification = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, cn );
@@ -228,10 +228,10 @@ public class AttributeUtilsTest
{
Entry entry = new DefaultEntry();
- Attribute cn = new DefaultEntryAttribute( "cn", "apache" );
+ Attribute cn = new DefaultAttribute( "cn", "apache" );
entry.put( cn );
- Attribute attr = new DefaultEntryAttribute( "cn", "test" );
+ Attribute attr = new DefaultAttribute( "cn", "test" );
Modification modification = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attr );
@@ -254,7 +254,7 @@ public class AttributeUtilsTest
Entry entry = new DefaultEntry();
entry.put( "cn", "test" );
- Attribute attr = new DefaultEntryAttribute( "cn", "test" );
+ Attribute attr = new DefaultAttribute( "cn", "test" );
Modification modification = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attr );
@@ -277,7 +277,7 @@ public class AttributeUtilsTest
Entry entry = new DefaultEntry();
entry.put( "cn", "test", "apache" );
- Attribute attr = new DefaultEntryAttribute( "cn", "test" );
+ Attribute attr = new DefaultAttribute( "cn", "test" );
Modification modification = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attr );
@@ -313,7 +313,7 @@ public class AttributeUtilsTest
{
Entry entry = new DefaultEntry();
- Attribute attr = new DefaultEntryAttribute( "cn", "test" );
+ Attribute attr = new DefaultAttribute( "cn", "test" );
Modification modification = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attr );
@@ -335,7 +335,7 @@ public class AttributeUtilsTest
{
Entry entry = new DefaultEntry();
- Attribute attr = new DefaultEntryAttribute( "cn" );
+ Attribute attr = new DefaultAttribute( "cn" );
Modification modification = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attr );
AttributeUtils.applyModification( entry, modification );
@@ -358,7 +358,7 @@ public class AttributeUtilsTest
entry.put( "cn", "test" );
entry.put( "ou", "apache", "acme corp" );
- Attribute newOu = new DefaultEntryAttribute( "ou", "Big Company", "directory" );
+ Attribute newOu = new DefaultAttribute( "ou", "Big Company", "directory" );
Modification modification = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, newOu );
@@ -402,7 +402,7 @@ public class AttributeUtilsTest
entry.put( "cn", "test" );
entry.put( "ou", "apache", "acme corp" );
- Attribute newOu = new DefaultEntryAttribute( "ou" );
+ Attribute newOu = new DefaultAttribute( "ou" );
Modification modification = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, newOu );
Re: svn commit: r1087515 [1/2] - in /directory/shared/trunk: dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ integ/src/test/java/org/apache/directory/shared/ldap/en...
Posted by Pierre-Arnaud Marcelot <pa...@marcelot.net>.
Hi Emmanuel,
This renaming as a strange side effect for me.
Tests are failing in the 'shared-ldap-model' module, with the following tests in error.
> Tests in error:
> testSerializeAttributeBinaryValue(org.apache.directory.shared.ldap.model.entry.DefaultEntryAttributeTest): org.apache.directory.shared.ldap.model.entry.DefaultAttribute; org.apache.directory.shared.ldap.model.entry.DefaultAttribute; no valid constructor
> testSerializeAttributeWithNoValue(org.apache.directory.shared.ldap.model.entry.DefaultEntryAttributeTest): org.apache.directory.shared.ldap.model.entry.DefaultAttribute; org.apache.directory.shared.ldap.model.entry.DefaultAttribute; no valid constructor
> testSerializeAttributeNullValue(org.apache.directory.shared.ldap.model.entry.DefaultEntryAttributeTest): org.apache.directory.shared.ldap.model.entry.DefaultAttribute; org.apache.directory.shared.ldap.model.entry.DefaultAttribute; no valid constructor
> testSerializeCompleteAttribute(org.apache.directory.shared.ldap.model.entry.DefaultEntryAttributeTest): org.apache.directory.shared.ldap.model.entry.DefaultAttribute; org.apache.directory.shared.ldap.model.entry.DefaultAttribute; no valid constructor
Something related to the default constructor during serialization.
Looks like the serializer does not see anymore the default (empty parameters) constructor, which does not have any protection qualifier.
Setting back the constructor with a public visibility makes the issue go away... But it's not something we want to publish in the API I guess.
I'm wondering how it worked before and why we didn't notice such an error before this renaming.
Any ideas?
Regards,
Pierre-Arnaud
On 1 avr. 2011, at 02:05, elecharny@apache.org wrote:
> Author: elecharny
> Date: Fri Apr 1 00:05:17 2011
> New Revision: 1087515
>
> URL: http://svn.apache.org/viewvc?rev=1087515&view=rev
> Log:
> o Renamed the DefaultEntryAttribute interface to DefaultAttribute
>
> Added:
> directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultAttribute.java
> - copied, changed from r1087508, directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttribute.java
> Removed:
> directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttribute.java
> Modified:
> directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java
> directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java
> directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java
> directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/EntryTest.java
> directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareEntryAttributeSerializationTest.java
> directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareModificationSerializationTest.java
> directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java
> directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java
> directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java
> directory/shared/trunk/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeValueTest.java
> directory/shared/trunk/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItemTest.java
> directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AttributeUtils.java
> directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java
> directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultModification.java
> directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifEntry.java
> directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifReader.java
> directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertor.java
> directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifUtils.java
> directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequestImpl.java
> directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java
> directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/AttributeUtilsTest.java
> directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttributeTest.java
> directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/EntryAttributeSerializationTest.java
> directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/ModificationTest.java
> directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertorTest.java
> directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/AddRequestImplTest.java
> directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImplTest.java
> directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResultEntryImplTest.java
> directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java
> directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java
>
> Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java
> URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java?rev=1087515&r1=1087514&r2=1087515&view=diff
> ==============================================================================
> --- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java (original)
> +++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java Fri Apr 1 00:05:17 2011
> @@ -22,7 +22,7 @@ package org.apache.directory.shared.dsml
>
> import org.apache.directory.shared.dsmlv2.ParserUtils;
> import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
> -import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
> +import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
> import org.apache.directory.shared.ldap.model.entry.Entry;
> import org.apache.directory.shared.ldap.model.entry.Attribute;
> import org.apache.directory.shared.ldap.model.entry.Value;
> @@ -89,7 +89,7 @@ public class SearchResultEntryDsml
> */
> public void addAttribute( String type ) throws LdapException
> {
> - currentAttribute = new DefaultEntryAttribute( type );
> + currentAttribute = new DefaultAttribute( type );
>
> getDecorated().getEntry().put( currentAttribute );
> }
>
> Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java
> URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java?rev=1087515&r1=1087514&r2=1087515&view=diff
> ==============================================================================
> --- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java (original)
> +++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java Fri Apr 1 00:05:17 2011
> @@ -22,7 +22,7 @@ package org.apache.directory.shared.dsml
>
> import org.apache.directory.shared.dsmlv2.ParserUtils;
> import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
> -import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
> +import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
> import org.apache.directory.shared.ldap.model.entry.Entry;
> import org.apache.directory.shared.ldap.model.entry.Attribute;
> import org.apache.directory.shared.ldap.model.entry.Value;
> @@ -89,7 +89,7 @@ public class AddRequestDsml
> }
>
> // fix this to use AttributeImpl(type.getString().toLowerCase())
> - currentAttribute = new DefaultEntryAttribute( type );
> + currentAttribute = new DefaultAttribute( type );
> getDecorated().getEntry().put( currentAttribute );
> }
>
>
> Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java
> URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java?rev=1087515&r1=1087514&r2=1087515&view=diff
> ==============================================================================
> --- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java (original)
> +++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java Fri Apr 1 00:05:17 2011
> @@ -25,7 +25,7 @@ import java.util.Iterator;
>
> import org.apache.directory.shared.dsmlv2.ParserUtils;
> import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
> -import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
> +import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
> import org.apache.directory.shared.ldap.model.entry.DefaultModification;
> import org.apache.directory.shared.ldap.model.entry.Attribute;
> import org.apache.directory.shared.ldap.model.entry.Modification;
> @@ -107,7 +107,7 @@ public class ModifyRequestDsml
> */
> public void addAttributeTypeAndValues( String type )
> {
> - currentAttribute = new DefaultEntryAttribute( type );
> + currentAttribute = new DefaultAttribute( type );
>
> Modification modification = new DefaultModification( currentOperation, currentAttribute );
> getDecorated().addModification( modification );
>
> Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/EntryTest.java
> URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/EntryTest.java?rev=1087515&r1=1087514&r2=1087515&view=diff
> ==============================================================================
> --- directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/EntryTest.java (original)
> +++ directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/EntryTest.java Fri Apr 1 00:05:17 2011
> @@ -39,7 +39,7 @@ import java.util.Set;
>
> import org.apache.directory.shared.ldap.model.entry.BinaryValue;
> import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
> -import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
> +import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
> import org.apache.directory.shared.ldap.model.entry.Entry;
> import org.apache.directory.shared.ldap.model.entry.Attribute;
> import org.apache.directory.shared.ldap.model.entry.StringValue;
> @@ -81,10 +81,10 @@ public class EntryTest
> {
> Entry entry = new DefaultEntry( EXAMPLE_DN );
>
> - Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
> - Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
> - Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
> - Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
> + Attribute attrOC = new DefaultAttribute( "objectClass", "top", "person" );
> + Attribute attrCN = new DefaultAttribute( "cn", "test1", "test2" );
> + Attribute attrSN = new DefaultAttribute( "sn", "Test1", "Test2" );
> + Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, BYTES2 );
>
> entry.put( attrOC, attrCN, attrSN, attrPWD );
>
> @@ -256,9 +256,9 @@ public class EntryTest
> @Test
> public void testDefaultClientEntryLdapDNEntryAttributeArray()
> {
> - Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
> - Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
> - Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
> + Attribute attrOC = new DefaultAttribute( "objectClass", "top", "person" );
> + Attribute attrCN = new DefaultAttribute( "cn", "test1", "test2" );
> + Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, BYTES2 );
>
> Entry entry = new DefaultEntry( EXAMPLE_DN, attrOC, attrCN, attrPWD );
>
> @@ -304,7 +304,7 @@ public class EntryTest
> Attribute attr = entry.get( "objectclass" );
> assertEquals( 2, attr.size() );
>
> - Attribute attrCN2 = new DefaultEntryAttribute( "cn", "test1", "test3" );
> + Attribute attrCN2 = new DefaultAttribute( "cn", "test1", "test3" );
> entry.add( attrCN2 );
> assertEquals( 4, entry.size() );
> attr = entry.get( "cn" );
> @@ -483,10 +483,10 @@ public class EntryTest
> {
> Entry entry = new DefaultEntry( EXAMPLE_DN );
>
> - Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
> - Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
> - Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
> - Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
> + Attribute attrOC = new DefaultAttribute( "objectClass", "top", "person" );
> + Attribute attrCN = new DefaultAttribute( "cn", "test1", "test2" );
> + Attribute attrSN = new DefaultAttribute( "sn", "Test1", "Test2" );
> + Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, BYTES2 );
>
> assertFalse( entry.contains( attrOC, attrCN ) );
>
> @@ -511,7 +511,7 @@ public class EntryTest
>
> assertFalse( entry.containsAttribute( "objectClass" ) );
>
> - Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, (byte[])null, BYTES2 );
> + Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, (byte[])null, BYTES2 );
>
> entry.add( attrPWD );
>
> @@ -535,10 +535,10 @@ public class EntryTest
>
> assertFalse( entry.containsAttribute( "objectClass" ) );
>
> - Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
> - Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
> - Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2", (String)null );
> - Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
> + Attribute attrOC = new DefaultAttribute( "objectClass", "top", "person" );
> + Attribute attrCN = new DefaultAttribute( "cn", "test1", "test2" );
> + Attribute attrSN = new DefaultAttribute( "sn", "Test1", "Test2", (String)null );
> + Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, BYTES2 );
>
> entry.add( attrOC, attrCN, attrSN, attrPWD );
>
> @@ -564,8 +564,8 @@ public class EntryTest
>
> assertFalse( entry.containsAttribute( "objectClass" ) );
>
> - Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2", (String)null );
> - Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2, (byte[])null );
> + Attribute attrCN = new DefaultAttribute( "cn", "test1", "test2", (String)null );
> + Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, BYTES2, (byte[])null );
>
> entry.add( attrCN, attrPWD );
>
> @@ -597,10 +597,10 @@ public class EntryTest
>
> assertFalse( entry.containsAttribute( "objectClass" ) );
>
> - Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
> - Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
> - Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
> - Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
> + Attribute attrOC = new DefaultAttribute( "objectClass", "top", "person" );
> + Attribute attrCN = new DefaultAttribute( "cn", "test1", "test2" );
> + Attribute attrSN = new DefaultAttribute( "sn", "Test1", "Test2" );
> + Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, BYTES2 );
>
> entry.add( attrOC, attrCN, attrSN, attrPWD );
>
> @@ -635,10 +635,10 @@ public class EntryTest
> entry2.setDn( EXAMPLE_DN );
> assertEquals( entry1, entry2 );
>
> - Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
> - Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
> - Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
> - Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
> + Attribute attrOC = new DefaultAttribute( "objectClass", "top", "person" );
> + Attribute attrCN = new DefaultAttribute( "cn", "test1", "test2" );
> + Attribute attrSN = new DefaultAttribute( "sn", "Test1", "Test2" );
> + Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, BYTES2 );
>
> entry1.put( attrOC, attrCN, attrSN, attrPWD );
> entry2.put( attrOC, attrCN, attrSN );
> @@ -647,8 +647,8 @@ public class EntryTest
> entry2.put( attrPWD );
> assertEquals( entry1, entry2 );
>
> - Attribute attrL1 = new DefaultEntryAttribute( "l", "Paris", "New-York" );
> - Attribute attrL2 = new DefaultEntryAttribute( "l", "Paris", "Tokyo" );
> + Attribute attrL1 = new DefaultAttribute( "l", "Paris", "New-York" );
> + Attribute attrL2 = new DefaultAttribute( "l", "Paris", "Tokyo" );
>
> entry1.put( attrL1 );
> entry2.put( attrL1 );
> @@ -676,10 +676,10 @@ public class EntryTest
>
> assertNull( entry.get( "objectClass" ) );
>
> - Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
> - Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
> - Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
> - Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
> + Attribute attrOC = new DefaultAttribute( "objectClass", "top", "person" );
> + Attribute attrCN = new DefaultAttribute( "cn", "test1", "test2" );
> + Attribute attrSN = new DefaultAttribute( "sn", "Test1", "Test2" );
> + Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, BYTES2 );
>
> entry.add( attrOC, attrCN, attrSN, attrPWD );
>
> @@ -729,10 +729,10 @@ public class EntryTest
> assertEquals( entry1.hashCode(), entry2.hashCode() );
>
>
> - Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
> - Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
> - Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
> - Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
> + Attribute attrOC = new DefaultAttribute( "objectClass", "top", "person" );
> + Attribute attrCN = new DefaultAttribute( "cn", "test1", "test2" );
> + Attribute attrSN = new DefaultAttribute( "sn", "Test1", "Test2" );
> + Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, BYTES2 );
>
> entry1.add( attrOC, attrCN, attrSN, attrPWD );
> entry2.add( attrOC, attrCN, attrSN, attrPWD );
> @@ -757,7 +757,7 @@ public class EntryTest
> assertFalse( entry.containsAttribute( "objectClass" ) );
> assertFalse( entry.hasObjectClass( "top" ) );
>
> - entry.add( new DefaultEntryAttribute( "objectClass", "top", "person" ) );
> + entry.add( new DefaultAttribute( "objectClass", "top", "person" ) );
>
> assertTrue( entry.hasObjectClass( "top" ) );
> assertTrue( entry.hasObjectClass( "person" ) );
> @@ -806,10 +806,10 @@ public class EntryTest
> {
> Entry entry = new DefaultEntry( EXAMPLE_DN );
>
> - Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
> - Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
> - Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
> - Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
> + Attribute attrOC = new DefaultAttribute( "objectClass", "top", "person" );
> + Attribute attrCN = new DefaultAttribute( "cn", "test1", "test2" );
> + Attribute attrSN = new DefaultAttribute( "sn", "Test1", "Test2" );
> + Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, BYTES2 );
>
> List<Attribute> removed = entry.put( attrOC, attrCN, attrSN, attrPWD );
>
> @@ -820,7 +820,7 @@ public class EntryTest
> assertTrue( entry.containsAttribute( " sn " ) );
> assertTrue( entry.containsAttribute( "userPassword" ) );
>
> - Attribute attrCN2 = new DefaultEntryAttribute( "cn", "test3", "test4" );
> + Attribute attrCN2 = new DefaultAttribute( "cn", "test3", "test4" );
> removed = entry.put( attrCN2 );
> assertEquals( 4, entry.size() );
> assertEquals( 1, removed.size() );
> @@ -1009,10 +1009,10 @@ public class EntryTest
> {
> Entry entry = new DefaultEntry( EXAMPLE_DN );
>
> - Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
> - Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
> - Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
> - Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
> + Attribute attrOC = new DefaultAttribute( "objectClass", "top", "person" );
> + Attribute attrCN = new DefaultAttribute( "cn", "test1", "test2" );
> + Attribute attrSN = new DefaultAttribute( "sn", "Test1", "Test2" );
> + Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, BYTES2 );
>
> entry.put( attrOC, attrCN, attrSN, attrPWD );
>
> @@ -1037,10 +1037,10 @@ public class EntryTest
> {
> Entry entry = new DefaultEntry( EXAMPLE_DN );
>
> - Attribute attrOC = new DefaultEntryAttribute( "objectClass", "top", "person" );
> - Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2" );
> - Attribute attrSN = new DefaultEntryAttribute( "sn", "Test1", "Test2" );
> - Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2 );
> + Attribute attrOC = new DefaultAttribute( "objectClass", "top", "person" );
> + Attribute attrCN = new DefaultAttribute( "cn", "test1", "test2" );
> + Attribute attrSN = new DefaultAttribute( "sn", "Test1", "Test2" );
> + Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, BYTES2 );
>
> entry.put( attrOC, attrCN, attrSN, attrPWD );
>
> @@ -1069,7 +1069,7 @@ public class EntryTest
> {
> Entry entry = new DefaultEntry( EXAMPLE_DN );
>
> - Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, (byte[])null, BYTES2 );
> + Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, (byte[])null, BYTES2 );
>
> entry.put( attrPWD );
> assertTrue( entry.remove( "userPassword", (byte[])null ) );
> @@ -1120,8 +1120,8 @@ public class EntryTest
> {
> Entry entry = new DefaultEntry( EXAMPLE_DN );
>
> - Attribute attrCN = new DefaultEntryAttribute( "cn", "test1", "test2", (String)null );
> - Attribute attrPWD = new DefaultEntryAttribute( "userPassword", BYTES1, BYTES2, (byte[])null );
> + Attribute attrCN = new DefaultAttribute( "cn", "test1", "test2", (String)null );
> + Attribute attrPWD = new DefaultAttribute( "userPassword", BYTES1, BYTES2, (byte[])null );
>
> entry.add( attrCN, attrPWD );
>
>
> Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareEntryAttributeSerializationTest.java
> URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareEntryAttributeSerializationTest.java?rev=1087515&r1=1087514&r2=1087515&view=diff
> ==============================================================================
> --- directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareEntryAttributeSerializationTest.java (original)
> +++ directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareEntryAttributeSerializationTest.java Fri Apr 1 00:05:17 2011
> @@ -28,7 +28,7 @@ import java.io.ObjectInputStream;
> import java.io.ObjectOutputStream;
>
> import org.apache.directory.shared.ldap.model.entry.Attribute;
> -import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
> +import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
> import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeValueException;
> import org.apache.directory.shared.ldap.model.schema.AttributeType;
> import org.apache.directory.shared.ldap.model.schema.SchemaManager;
> @@ -73,7 +73,7 @@ public class SchemaAwareEntryAttributeSe
> @Test
> public void testEntryAttributeNoStringValueSerialization() throws IOException, ClassNotFoundException, LdapInvalidAttributeValueException
> {
> - Attribute attribute1 = new DefaultEntryAttribute( cn );
> + Attribute attribute1 = new DefaultAttribute( cn );
>
> ByteArrayOutputStream baos = new ByteArrayOutputStream();
> ObjectOutputStream out = new ObjectOutputStream( baos );
> @@ -85,7 +85,7 @@ public class SchemaAwareEntryAttributeSe
> byte[] data = baos.toByteArray();
> in = new ObjectInputStream( new ByteArrayInputStream( data ) );
>
> - Attribute attribute2 = new DefaultEntryAttribute( cn );
> + Attribute attribute2 = new DefaultAttribute( cn );
> attribute2.readExternal( in );
> attribute2.apply( cn );
>
> @@ -96,7 +96,7 @@ public class SchemaAwareEntryAttributeSe
> @Test
> public void testEntryAttributeOneStringValueSerialization() throws IOException, ClassNotFoundException, LdapInvalidAttributeValueException
> {
> - Attribute attribute1 = new DefaultEntryAttribute( "CommonName", cn, "test" );
> + Attribute attribute1 = new DefaultAttribute( "CommonName", cn, "test" );
>
> ByteArrayOutputStream baos = new ByteArrayOutputStream();
> ObjectOutputStream out = new ObjectOutputStream( baos );
> @@ -108,7 +108,7 @@ public class SchemaAwareEntryAttributeSe
> byte[] data = baos.toByteArray();
> in = new ObjectInputStream( new ByteArrayInputStream( data ) );
>
> - Attribute attribute2 = new DefaultEntryAttribute( cn );
> + Attribute attribute2 = new DefaultAttribute( cn );
> attribute2.readExternal( in );
> attribute2.apply( cn );
>
> @@ -120,7 +120,7 @@ public class SchemaAwareEntryAttributeSe
> @Test
> public void testEntryAttributeManyStringValuesSerialization() throws IOException, ClassNotFoundException, LdapInvalidAttributeValueException
> {
> - Attribute attribute1 = new DefaultEntryAttribute( "CN", cn, "test1", "test2", "test3" );
> + Attribute attribute1 = new DefaultAttribute( "CN", cn, "test1", "test2", "test3" );
>
> ByteArrayOutputStream baos = new ByteArrayOutputStream();
> ObjectOutputStream out = new ObjectOutputStream( baos );
> @@ -132,7 +132,7 @@ public class SchemaAwareEntryAttributeSe
> byte[] data = baos.toByteArray();
> in = new ObjectInputStream( new ByteArrayInputStream( data ) );
>
> - Attribute attribute2 = new DefaultEntryAttribute( cn );
> + Attribute attribute2 = new DefaultAttribute( cn );
> attribute2.readExternal( in );
> attribute2.apply( cn );
>
> @@ -144,7 +144,7 @@ public class SchemaAwareEntryAttributeSe
> @Test
> public void testEntryAttributeNoBinaryValueSerialization() throws IOException, ClassNotFoundException, LdapInvalidAttributeValueException, LdapInvalidAttributeValueException
> {
> - Attribute attribute1 = new DefaultEntryAttribute( userCertificate );
> + Attribute attribute1 = new DefaultAttribute( userCertificate );
>
> ByteArrayOutputStream baos = new ByteArrayOutputStream();
> ObjectOutputStream out = new ObjectOutputStream( baos );
> @@ -156,7 +156,7 @@ public class SchemaAwareEntryAttributeSe
> byte[] data = baos.toByteArray();
> in = new ObjectInputStream( new ByteArrayInputStream( data ) );
>
> - Attribute attribute2 = new DefaultEntryAttribute( userCertificate );
> + Attribute attribute2 = new DefaultAttribute( userCertificate );
> attribute2.readExternal( in );
> attribute2.apply( userCertificate );
>
> @@ -167,7 +167,7 @@ public class SchemaAwareEntryAttributeSe
> @Test
> public void testEntryAttributeOneBinaryValueSerialization() throws IOException, ClassNotFoundException, LdapInvalidAttributeValueException
> {
> - Attribute attribute1 = new DefaultEntryAttribute( userCertificate, data1 );
> + Attribute attribute1 = new DefaultAttribute( userCertificate, data1 );
>
> ByteArrayOutputStream baos = new ByteArrayOutputStream();
> ObjectOutputStream out = new ObjectOutputStream( baos );
> @@ -179,7 +179,7 @@ public class SchemaAwareEntryAttributeSe
> byte[] data = baos.toByteArray();
> in = new ObjectInputStream( new ByteArrayInputStream( data ) );
>
> - Attribute attribute2 = new DefaultEntryAttribute( userCertificate );
> + Attribute attribute2 = new DefaultAttribute( userCertificate );
> attribute2.readExternal( in );
> attribute2.apply( userCertificate );
>
> @@ -190,7 +190,7 @@ public class SchemaAwareEntryAttributeSe
> @Test
> public void testEntryAttributeManyBinaryValuesSerialization() throws IOException, ClassNotFoundException, LdapInvalidAttributeValueException
> {
> - Attribute attribute1 = new DefaultEntryAttribute( "UserCertificate", userCertificate, data1, data2, data3 );
> + Attribute attribute1 = new DefaultAttribute( "UserCertificate", userCertificate, data1, data2, data3 );
>
> ByteArrayOutputStream baos = new ByteArrayOutputStream();
> ObjectOutputStream out = new ObjectOutputStream( baos );
> @@ -202,7 +202,7 @@ public class SchemaAwareEntryAttributeSe
> byte[] data = baos.toByteArray();
> in = new ObjectInputStream( new ByteArrayInputStream( data ) );
>
> - Attribute attribute2 = new DefaultEntryAttribute( userCertificate );
> + Attribute attribute2 = new DefaultAttribute( userCertificate );
> attribute2.readExternal( in );
> attribute2.apply( userCertificate );
>
>
> Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareModificationSerializationTest.java
> URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareModificationSerializationTest.java?rev=1087515&r1=1087514&r2=1087515&view=diff
> ==============================================================================
> --- directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareModificationSerializationTest.java (original)
> +++ directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareModificationSerializationTest.java Fri Apr 1 00:05:17 2011
> @@ -28,7 +28,7 @@ import java.io.IOException;
> import java.io.ObjectInputStream;
> import java.io.ObjectOutputStream;
>
> -import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
> +import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
> import org.apache.directory.shared.ldap.model.entry.DefaultModification;
> import org.apache.directory.shared.ldap.model.entry.Attribute;
> import org.apache.directory.shared.ldap.model.entry.Modification;
> @@ -156,7 +156,7 @@ public class SchemaAwareModificationSeri
> @Test
> public void testCreateServerModification() throws LdapException
> {
> - Attribute attribute = new DefaultEntryAttribute( "cn", CN_AT );
> + Attribute attribute = new DefaultAttribute( "cn", CN_AT );
> attribute.add( "test1", "test2" );
>
> Modification mod = new DefaultModification( CN_AT, ModificationOperation.ADD_ATTRIBUTE, attribute );
> @@ -178,7 +178,7 @@ public class SchemaAwareModificationSeri
> @Test
> public void testSerializationModificationADD() throws ClassNotFoundException, IOException, LdapInvalidAttributeValueException
> {
> - Attribute attribute = new DefaultEntryAttribute( "cn", CN_AT );
> + Attribute attribute = new DefaultAttribute( "cn", CN_AT );
> attribute.add( "test1", "test2" );
>
> DefaultModification mod = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attribute );
> @@ -192,7 +192,7 @@ public class SchemaAwareModificationSeri
> @Test
> public void testSerializationModificationREPLACE() throws ClassNotFoundException, IOException, LdapInvalidAttributeValueException
> {
> - Attribute attribute = new DefaultEntryAttribute( "cn", CN_AT );
> + Attribute attribute = new DefaultAttribute( "cn", CN_AT );
> attribute.add( "test1", "test2" );
>
> DefaultModification mod = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attribute );
> @@ -206,7 +206,7 @@ public class SchemaAwareModificationSeri
> @Test
> public void testSerializationModificationREMOVE() throws ClassNotFoundException, IOException, LdapInvalidAttributeValueException
> {
> - Attribute attribute = new DefaultEntryAttribute( "cn", CN_AT );
> + Attribute attribute = new DefaultAttribute( "cn", CN_AT );
> attribute.add( "test1", "test2" );
>
> DefaultModification mod = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attribute );
>
> Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java
> URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java?rev=1087515&r1=1087514&r2=1087515&view=diff
> ==============================================================================
> --- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java (original)
> +++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java Fri Apr 1 00:05:17 2011
> @@ -31,7 +31,7 @@ import org.apache.directory.shared.asn1.
> import org.apache.directory.shared.i18n.I18n;
> import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
> import org.apache.directory.shared.ldap.codec.api.LdapConstants;
> -import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
> +import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
> import org.apache.directory.shared.ldap.model.entry.Entry;
> import org.apache.directory.shared.ldap.model.entry.Attribute;
> import org.apache.directory.shared.ldap.model.entry.Value;
> @@ -207,7 +207,7 @@ public final class AddRequestDecorator e
> }
>
> // fix this to use AttributeImpl(type.getString().toLowerCase())
> - currentAttribute = new DefaultEntryAttribute( type );
> + currentAttribute = new DefaultAttribute( type );
> getDecorated().getEntry().put( currentAttribute );
> }
>
>
> Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java
> URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java?rev=1087515&r1=1087514&r2=1087515&view=diff
> ==============================================================================
> --- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java (original)
> +++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java Fri Apr 1 00:05:17 2011
> @@ -33,7 +33,7 @@ import org.apache.directory.shared.asn1.
> import org.apache.directory.shared.i18n.I18n;
> import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
> import org.apache.directory.shared.ldap.codec.api.LdapConstants;
> -import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
> +import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
> import org.apache.directory.shared.ldap.model.entry.DefaultModification;
> import org.apache.directory.shared.ldap.model.entry.Attribute;
> import org.apache.directory.shared.ldap.model.entry.Modification;
> @@ -194,7 +194,7 @@ public class ModifyRequestDecorator exte
> */
> public void addAttributeTypeAndValues( String type )
> {
> - currentAttribute = new DefaultEntryAttribute( type );
> + currentAttribute = new DefaultAttribute( type );
>
> Modification modification = new DefaultModification( currentOperation, currentAttribute );
> getDecorated().addModification( modification );
>
> Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java
> URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java?rev=1087515&r1=1087514&r2=1087515&view=diff
> ==============================================================================
> --- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java (original)
> +++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java Fri Apr 1 00:05:17 2011
> @@ -34,7 +34,7 @@ import org.apache.directory.shared.i18n.
> import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
> import org.apache.directory.shared.ldap.codec.api.LdapConstants;
> import org.apache.directory.shared.ldap.codec.api.MessageDecorator;
> -import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
> +import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
> import org.apache.directory.shared.ldap.model.entry.Entry;
> import org.apache.directory.shared.ldap.model.entry.Attribute;
> import org.apache.directory.shared.ldap.model.exception.LdapException;
> @@ -190,7 +190,7 @@ public class SearchResultEntryDecorator
> */
> public void addAttribute( String type ) throws LdapException
> {
> - currentAttribute = new DefaultEntryAttribute( type );
> + currentAttribute = new DefaultAttribute( type );
>
> getDecorated().getEntry().put( currentAttribute );
> }
>
> Modified: directory/shared/trunk/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeValueTest.java
> URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeValueTest.java?rev=1087515&r1=1087514&r2=1087515&view=diff
> ==============================================================================
> --- directory/shared/trunk/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeValueTest.java (original)
> +++ directory/shared/trunk/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeValueTest.java Fri Apr 1 00:05:17 2011
> @@ -29,7 +29,7 @@ import java.util.Set;
> import com.mycila.junit.concurrent.Concurrency;
> import com.mycila.junit.concurrent.ConcurrentJunitRunner;
> import org.apache.directory.shared.ldap.aci.protectedItem.AttributeValueItem;
> -import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
> +import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
> import org.apache.directory.shared.ldap.model.entry.Attribute;
> import org.junit.Before;
> import org.junit.Test;
> @@ -58,13 +58,13 @@ public class ProtectedItem_AttributeValu
> public void initNames() throws Exception
> {
>
> - Attribute attrA = new DefaultEntryAttribute( "aa" );
> + Attribute attrA = new DefaultAttribute( "aa" );
> attrA.add( "aa" );
> - Attribute attrB = new DefaultEntryAttribute( "bb" );
> + Attribute attrB = new DefaultAttribute( "bb" );
> attrB.add( "bb" );
> - Attribute attrC = new DefaultEntryAttribute( "cc" );
> + Attribute attrC = new DefaultAttribute( "cc" );
> attrC.add( "cc" );
> - Attribute attrD = new DefaultEntryAttribute( "dd" );
> + Attribute attrD = new DefaultAttribute( "dd" );
> attrD.add( "dd" );
>
> Set<Attribute> colA = new HashSet<Attribute>();
>
> Modified: directory/shared/trunk/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItemTest.java
> URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItemTest.java?rev=1087515&r1=1087514&r2=1087515&view=diff
> ==============================================================================
> --- directory/shared/trunk/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItemTest.java (original)
> +++ directory/shared/trunk/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItemTest.java Fri Apr 1 00:05:17 2011
> @@ -28,7 +28,7 @@ import java.util.Set;
>
> import com.mycila.junit.concurrent.Concurrency;
> import com.mycila.junit.concurrent.ConcurrentJunitRunner;
> -import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
> +import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
> import org.apache.directory.shared.ldap.model.entry.Attribute;
> import org.apache.directory.shared.ldap.model.filter.UndefinedNode;
> import org.junit.Before;
> @@ -63,22 +63,22 @@ public class AttributeValueItemTest
> public void initNames() throws Exception
> {
> attributeA = new HashSet<Attribute>();
> - attributeA.add( new DefaultEntryAttribute( "aa", "aa" ) );
> - attributeA.add( new DefaultEntryAttribute( "aa", "bb" ) );
> - attributeA.add( new DefaultEntryAttribute( "aa", "cc" ) );
> + attributeA.add( new DefaultAttribute( "aa", "aa" ) );
> + attributeA.add( new DefaultAttribute( "aa", "bb" ) );
> + attributeA.add( new DefaultAttribute( "aa", "cc" ) );
> // Sets aren't ordered, so adding order must not matter
> attributeB = new HashSet<Attribute>();
> - attributeB.add( new DefaultEntryAttribute( "aa", "bb" ) );
> - attributeB.add( new DefaultEntryAttribute( "aa", "cc" ) );
> - attributeB.add( new DefaultEntryAttribute( "aa", "aa" ) );
> + attributeB.add( new DefaultAttribute( "aa", "bb" ) );
> + attributeB.add( new DefaultAttribute( "aa", "cc" ) );
> + attributeB.add( new DefaultAttribute( "aa", "aa" ) );
> attributeC = new HashSet<Attribute>();
> - attributeC.add( new DefaultEntryAttribute( "aa", "aa" ) );
> - attributeC.add( new DefaultEntryAttribute( "bb", "bb" ) );
> - attributeC.add( new DefaultEntryAttribute( "aa", "cc" ) );
> + attributeC.add( new DefaultAttribute( "aa", "aa" ) );
> + attributeC.add( new DefaultAttribute( "bb", "bb" ) );
> + attributeC.add( new DefaultAttribute( "aa", "cc" ) );
> attributeD = new HashSet<Attribute>();
> - attributeD.add( new DefaultEntryAttribute( "aa", "aa" ) );
> - attributeD.add( new DefaultEntryAttribute( "aa", "bb" ) );
> - attributeD.add( new DefaultEntryAttribute( "aa", "dd" ) );
> + attributeD.add( new DefaultAttribute( "aa", "aa" ) );
> + attributeD.add( new DefaultAttribute( "aa", "bb" ) );
> + attributeD.add( new DefaultAttribute( "aa", "dd" ) );
> attributeValueItemA = new AttributeValueItem( attributeA );
> attributeValueItemACopy = new AttributeValueItem( attributeA );
> attributeValueItemB = new AttributeValueItem( attributeB );
>
> Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AttributeUtils.java
> URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AttributeUtils.java?rev=1087515&r1=1087514&r2=1087515&view=diff
> ==============================================================================
> --- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AttributeUtils.java (original)
> +++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AttributeUtils.java Fri Apr 1 00:05:17 2011
> @@ -1128,7 +1128,7 @@ public final class AttributeUtils
>
> try
> {
> - Attribute clientAttribute = new DefaultEntryAttribute( attribute.getID() );
> + Attribute clientAttribute = new DefaultAttribute( attribute.getID() );
>
> for ( NamingEnumeration<?> values = attribute.getAll(); values.hasMoreElements(); )
> {
>
> Copied: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultAttribute.java (from r1087508, directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttribute.java)
> URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultAttribute.java?p2=directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultAttribute.java&p1=directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttribute.java&r1=1087508&r2=1087515&rev=1087515&view=diff
> ==============================================================================
> --- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttribute.java (original)
> +++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultAttribute.java Fri Apr 1 00:05:17 2011
> @@ -46,10 +46,10 @@ import org.slf4j.LoggerFactory;
> *
> * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
> */
> -public class DefaultEntryAttribute implements Attribute
> +public class DefaultAttribute implements Attribute
> {
> /** logger for reporting errors that might not be handled properly upstream */
> - private static final Logger LOG = LoggerFactory.getLogger( DefaultEntryAttribute.class );
> + private static final Logger LOG = LoggerFactory.getLogger( DefaultAttribute.class );
>
> /** The associated AttributeType */
> private AttributeType attributeType;
> @@ -121,18 +121,18 @@ public class DefaultEntryAttribute imple
> // maybe have some additional convenience constructors which take
> // an initial value as a string or a byte[]
> /**
> - * Create a new instance of a EntryAttribute, without ID nor value.
> + * Create a new instance of a Attribute, without ID nor value.
> * Used by the serializer
> */
> - /* No protection */ DefaultEntryAttribute()
> + DefaultAttribute()
> {
> }
>
>
> /**
> - * Create a new instance of a EntryAttribute, without ID nor value.
> + * Create a new instance of a Attribute, without ID nor value.
> */
> - /* No qualifier */ DefaultEntryAttribute( AttributeType attributeType, String upId, String normId, boolean isHR, int hashCode, Value<?>... values)
> + DefaultAttribute( AttributeType attributeType, String upId, String normId, boolean isHR, int hashCode, Value<?>... values)
> {
> this.attributeType = attributeType;
> this.upId = upId;
> @@ -151,11 +151,11 @@ public class DefaultEntryAttribute imple
>
>
> /**
> - * Create a new instance of a EntryAttribute, without ID nor value.
> + * Create a new instance of a Attribute, without ID nor value.
> *
> * @param attributeType the attributeType for the empty attribute added into the entry
> */
> - public DefaultEntryAttribute( AttributeType attributeType )
> + public DefaultAttribute( AttributeType attributeType )
> {
> if ( attributeType != null )
> {
> @@ -172,21 +172,21 @@ public class DefaultEntryAttribute imple
>
>
> /**
> - * Create a new instance of a EntryAttribute, without value.
> + * Create a new instance of a Attribute, without value.
> */
> - public DefaultEntryAttribute( String upId )
> + public DefaultAttribute( String upId )
> {
> setUpId( upId );
> }
>
>
> /**
> - * Create a new instance of a EntryAttribute, without value.
> + * Create a new instance of a Attribute, without value.
> *
> * @param upId the ID for the added attributeType
> * @param attributeType the added AttributeType
> */
> - public DefaultEntryAttribute( String upId, AttributeType attributeType )
> + public DefaultAttribute( String upId, AttributeType attributeType )
> {
> if ( attributeType == null )
> {
> @@ -218,7 +218,7 @@ public class DefaultEntryAttribute imple
> * @param upId
> * @param vals an initial set of values for this attribute
> */
> - public DefaultEntryAttribute( String upId, Value<?>... vals )
> + public DefaultAttribute( String upId, Value<?>... vals )
> {
> // The value can be null, this is a valid value.
> if ( vals[0] == null )
> @@ -247,25 +247,25 @@ public class DefaultEntryAttribute imple
>
>
> /**
> - * Create a new instance of a EntryAttribute, without ID but with some values.
> + * Create a new instance of a Attribute, without ID but with some values.
> *
> * @param attributeType The attributeType added on creation
> * @param vals The added value for this attribute
> */
> - public DefaultEntryAttribute( AttributeType attributeType, String... vals ) throws LdapInvalidAttributeValueException
> + public DefaultAttribute( AttributeType attributeType, String... vals ) throws LdapInvalidAttributeValueException
> {
> this( null, attributeType, vals );
> }
>
>
> /**
> - * Create a new instance of a EntryAttribute.
> + * Create a new instance of a Attribute.
> *
> * @param upId the ID for the added attribute
> * @param attributeType The attributeType added on creation
> * @param vals the added values for this attribute
> */
> - public DefaultEntryAttribute( String upId, AttributeType attributeType, String... vals ) throws LdapInvalidAttributeValueException
> + public DefaultAttribute( String upId, AttributeType attributeType, String... vals ) throws LdapInvalidAttributeValueException
> {
> if ( attributeType == null )
> {
> @@ -293,7 +293,7 @@ public class DefaultEntryAttribute imple
> * @param attributeType the attribute type according to the schema
> * @param vals an initial set of values for this attribute
> */
> - public DefaultEntryAttribute( String upId, AttributeType attributeType, Value<?>... vals ) throws LdapInvalidAttributeValueException
> + public DefaultAttribute( String upId, AttributeType attributeType, Value<?>... vals ) throws LdapInvalidAttributeValueException
> {
> if ( attributeType == null )
> {
> @@ -318,16 +318,16 @@ public class DefaultEntryAttribute imple
> * @param attributeType the attribute type according to the schema
> * @param vals an initial set of values for this attribute
> */
> - public DefaultEntryAttribute( AttributeType attributeType, Value<?>... vals ) throws LdapInvalidAttributeValueException
> + public DefaultAttribute( AttributeType attributeType, Value<?>... vals ) throws LdapInvalidAttributeValueException
> {
> this( null, attributeType, vals );
> }
>
>
> /**
> - * Create a new instance of a EntryAttribute.
> + * Create a new instance of a Attribute.
> */
> - public DefaultEntryAttribute( String upId, String... vals )
> + public DefaultAttribute( String upId, String... vals )
> {
> try
> {
> @@ -343,9 +343,9 @@ public class DefaultEntryAttribute imple
>
>
> /**
> - * Create a new instance of a EntryAttribute, with some byte[] values.
> + * Create a new instance of a Attribute, with some byte[] values.
> */
> - public DefaultEntryAttribute( String upId, byte[]... vals )
> + public DefaultAttribute( String upId, byte[]... vals )
> {
> try
> {
> @@ -361,25 +361,25 @@ public class DefaultEntryAttribute imple
>
>
> /**
> - * Create a new instance of a EntryAttribute, with some byte[] values.
> + * Create a new instance of a Attribute, with some byte[] values.
> *
> * @param attributeType The attributeType added on creation
> * @param vals The value for the added attribute
> */
> - public DefaultEntryAttribute( AttributeType attributeType, byte[]... vals ) throws LdapInvalidAttributeValueException
> + public DefaultAttribute( AttributeType attributeType, byte[]... vals ) throws LdapInvalidAttributeValueException
> {
> this( null, attributeType, vals );
> }
>
>
> /**
> - * Create a new instance of a EntryAttribute, with some byte[] values.
> + * Create a new instance of a Attribute, with some byte[] values.
> *
> * @param upId the ID for the added attribute
> * @param attributeType the AttributeType to be added
> * @param vals the values for the added attribute
> */
> - public DefaultEntryAttribute( String upId, AttributeType attributeType, byte[]... vals ) throws LdapInvalidAttributeValueException
> + public DefaultAttribute( String upId, AttributeType attributeType, byte[]... vals ) throws LdapInvalidAttributeValueException
> {
> if ( attributeType == null )
> {
> @@ -401,7 +401,7 @@ public class DefaultEntryAttribute imple
> * @param attributeType The attribute's type
> * @param attribute The attribute to be copied
> */
> - public DefaultEntryAttribute( AttributeType attributeType, Attribute attribute ) throws LdapException
> + public DefaultAttribute( AttributeType attributeType, Attribute attribute ) throws LdapException
> {
> // Copy the common values. isHR is only available on a ServerAttribute
> this.attributeType = attributeType;
> @@ -1869,7 +1869,7 @@ public class DefaultEntryAttribute imple
> {
> try
> {
> - DefaultEntryAttribute attribute = (DefaultEntryAttribute)super.clone();
> + DefaultAttribute attribute = (DefaultAttribute)super.clone();
> attribute.setUpId( upId );
>
> attribute.values = new LinkedHashSet<Value<?>>( values.size() );
>
> Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java
> URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java?rev=1087515&r1=1087514&r2=1087515&view=diff
> ==============================================================================
> --- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java (original)
> +++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java Fri Apr 1 00:05:17 2011
> @@ -222,7 +222,7 @@ public final class DefaultEntry implemen
> }
>
> // Create a new ServerAttribute.
> - Attribute serverAttribute = new DefaultEntryAttribute( attributeType, attribute );
> + Attribute serverAttribute = new DefaultAttribute( attributeType, attribute );
>
> // And store it
> add( serverAttribute );
> @@ -587,7 +587,7 @@ public final class DefaultEntry implemen
> */
> protected void createAttribute( String upId, AttributeType attributeType, byte[]... values ) throws LdapInvalidAttributeValueException
> {
> - Attribute attribute = new DefaultEntryAttribute( attributeType, values );
> + Attribute attribute = new DefaultAttribute( attributeType, values );
> attribute.setUpId( upId, attributeType );
> attributes.put( attributeType.getOid(), attribute );
> }
> @@ -601,7 +601,7 @@ public final class DefaultEntry implemen
> */
> protected void createAttribute( String upId, AttributeType attributeType, String... values ) throws LdapInvalidAttributeValueException
> {
> - Attribute attribute = new DefaultEntryAttribute( attributeType, values );
> + Attribute attribute = new DefaultAttribute( attributeType, values );
> attribute.setUpId( upId, attributeType );
> attributes.put( attributeType.getOid(), attribute );
> }
> @@ -615,7 +615,7 @@ public final class DefaultEntry implemen
> */
> protected void createAttribute( String upId, AttributeType attributeType, Value<?>... values ) throws LdapInvalidAttributeValueException
> {
> - Attribute attribute = new DefaultEntryAttribute( attributeType, values );
> + Attribute attribute = new DefaultAttribute( attributeType, values );
> attribute.setUpId( upId, attributeType );
> attributes.put( attributeType.getOid(), attribute );
> }
> @@ -933,7 +933,7 @@ public final class DefaultEntry implemen
> {
> // We have to create a new Attribute and set the values
> // and the upId
> - attributes.put( id, new DefaultEntryAttribute( upId, values ) );
> + attributes.put( id, new DefaultAttribute( upId, values ) );
> }
> }
> }
> @@ -975,7 +975,7 @@ public final class DefaultEntry implemen
> {
> // We have to create a new Attribute and set the values
> // and the upId
> - attributes.put( id, new DefaultEntryAttribute( upId, values ) );
> + attributes.put( id, new DefaultAttribute( upId, values ) );
> }
> }
> }
> @@ -1017,7 +1017,7 @@ public final class DefaultEntry implemen
> {
> // We have to create a new Attribute and set the values
> // and the upId
> - attributes.put( id, new DefaultEntryAttribute( upId, values ) );
> + attributes.put( id, new DefaultAttribute( upId, values ) );
> }
> }
> }
> @@ -1468,7 +1468,7 @@ public final class DefaultEntry implemen
> String id = getId( upId );
>
> // Create a new attribute
> - Attribute clientAttribute = new DefaultEntryAttribute( upId, values );
> + Attribute clientAttribute = new DefaultAttribute( upId, values );
>
> // Replace the previous one, and return it back
> return attributes.put( id, clientAttribute );
> @@ -1507,7 +1507,7 @@ public final class DefaultEntry implemen
> String id = getId( upId );
>
> // Create a new attribute
> - Attribute clientAttribute = new DefaultEntryAttribute( upId, values );
> + Attribute clientAttribute = new DefaultAttribute( upId, values );
>
> // Replace the previous one, and return it back
> return attributes.put( id, clientAttribute );
> @@ -1546,7 +1546,7 @@ public final class DefaultEntry implemen
> String id = getId( upId );
>
> // Create a new attribute
> - Attribute clientAttribute = new DefaultEntryAttribute( upId, values );
> + Attribute clientAttribute = new DefaultAttribute( upId, values );
>
> // Replace the previous one, and return it back
> return attributes.put( id, clientAttribute );
> @@ -1602,7 +1602,7 @@ public final class DefaultEntry implemen
> removed.add( attributes.remove( id ) );
> }
>
> - Attribute newAttribute = new DefaultEntryAttribute( upId );
> + Attribute newAttribute = new DefaultAttribute( upId );
> attributes.put( id, newAttribute );
> added = true;
> }
> @@ -1643,7 +1643,7 @@ public final class DefaultEntry implemen
> removed.add( attributes.get( oid ) );
> }
>
> - attributes.put( oid, new DefaultEntryAttribute( upId, attributeType ) );
> + attributes.put( oid, new DefaultAttribute( upId, attributeType ) );
> added = true;
> }
> }
> @@ -1675,7 +1675,7 @@ public final class DefaultEntry implemen
> }
>
> Attribute attribute = attributes.put( attributeType.getOid(),
> - new DefaultEntryAttribute( attributeType ) );
> + new DefaultAttribute( attributeType ) );
>
> if ( attribute != null )
> {
> @@ -1821,7 +1821,7 @@ public final class DefaultEntry implemen
> throw new UnsupportedOperationException( message );
> }
>
> - Attribute attribute = new DefaultEntryAttribute( upId, attributeType, values );
> + Attribute attribute = new DefaultAttribute( upId, attributeType, values );
>
> return attributes.put( attributeType.getOid(), attribute );
> }
> @@ -1864,7 +1864,7 @@ public final class DefaultEntry implemen
> }
> }
>
> - Attribute attribute = new DefaultEntryAttribute( upId, attributeType, values );
> + Attribute attribute = new DefaultAttribute( upId, attributeType, values );
>
> return attributes.put( attributeType.getOid(), attribute );
> }
> @@ -1907,7 +1907,7 @@ public final class DefaultEntry implemen
> }
> }
>
> - Attribute attribute = new DefaultEntryAttribute( upId, attributeType, values );
> + Attribute attribute = new DefaultAttribute( upId, attributeType, values );
>
> return attributes.put( attributeType.getOid(), attribute );
> }
> @@ -2593,7 +2593,7 @@ public final class DefaultEntry implemen
> for ( int i = 0; i < nbAttributes; i++ )
> {
> // Read each attribute
> - Attribute attribute = new DefaultEntryAttribute();
> + Attribute attribute = new DefaultAttribute();
> attribute.readExternal( in );
>
> if ( schemaManager != null )
>
> Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultModification.java
> URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultModification.java?rev=1087515&r1=1087514&r2=1087515&view=diff
> ==============================================================================
> --- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultModification.java (original)
> +++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultModification.java Fri Apr 1 00:05:17 2011
> @@ -116,7 +116,7 @@ public class DefaultModification impleme
> at = schemaManager.lookupAttributeTypeRegistry( modAttribute.getId() );
> }
>
> - attribute = new DefaultEntryAttribute( at, modAttribute );
> + attribute = new DefaultAttribute( at, modAttribute );
> }
> catch ( LdapException ne )
> {
> @@ -261,7 +261,7 @@ public class DefaultModification impleme
>
> if ( hasAttribute )
> {
> - attribute = new DefaultEntryAttribute();
> + attribute = new DefaultAttribute();
> attribute.readExternal( in );
> }
> }
>
> Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifEntry.java
> URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifEntry.java?rev=1087515&r1=1087514&r2=1087515&view=diff
> ==============================================================================
> --- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifEntry.java (original)
> +++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifEntry.java Fri Apr 1 00:05:17 2011
> @@ -32,7 +32,7 @@ import java.util.concurrent.ConcurrentHa
>
> import org.apache.directory.shared.i18n.I18n;
> import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
> -import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
> +import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
> import org.apache.directory.shared.ldap.model.entry.DefaultModification;
> import org.apache.directory.shared.ldap.model.entry.Entry;
> import org.apache.directory.shared.ldap.model.entry.Attribute;
> @@ -392,7 +392,7 @@ public class LdifEntry implements Clonea
> if ( value == null )
> {
> value = new StringValue( ( String ) null );
> - attr = new DefaultEntryAttribute( id, ( Value<?> ) value );
> + attr = new DefaultAttribute( id, ( Value<?> ) value );
> }
> else
> {
> @@ -557,7 +557,7 @@ public class LdifEntry implements Clonea
> {
> if ( "dn".equalsIgnoreCase( attributeId ) )
> {
> - return new DefaultEntryAttribute( "dn", entry.getDn().getName() );
> + return new DefaultAttribute( "dn", entry.getDn().getName() );
> }
>
> return entry.get( attributeId );
>
> Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifReader.java
> URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifReader.java?rev=1087515&r1=1087514&r2=1087515&view=diff
> ==============================================================================
> --- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifReader.java (original)
> +++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifReader.java Fri Apr 1 00:05:17 2011
> @@ -43,7 +43,7 @@ import java.util.NoSuchElementException;
>
> import org.apache.directory.shared.asn1.util.Oid;
> import org.apache.directory.shared.i18n.I18n;
> -import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
> +import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
> import org.apache.directory.shared.ldap.model.entry.Attribute;
> import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
> import org.apache.directory.shared.ldap.model.exception.LdapException;
> @@ -869,11 +869,11 @@ public class LdifReader implements Itera
> // Create an attribute
> if ( attributeValue instanceof String )
> {
> - return new DefaultEntryAttribute( attributeType, ( String ) attributeValue );
> + return new DefaultAttribute( attributeType, ( String ) attributeValue );
> }
> else
> {
> - return new DefaultEntryAttribute( attributeType, ( byte[] ) attributeValue );
> + return new DefaultAttribute( attributeType, ( byte[] ) attributeValue );
> }
> }
> else
> @@ -1046,7 +1046,7 @@ public class LdifReader implements Itera
>
> modified = Strings.trim( line.substring( "add:".length() ) );
> modificationType = ModificationOperation.ADD_ATTRIBUTE;
> - attribute = new DefaultEntryAttribute( modified );
> + attribute = new DefaultAttribute( modified );
>
> state = ATTRVAL_SPEC;
> }
> @@ -1060,7 +1060,7 @@ public class LdifReader implements Itera
>
> modified = Strings.trim(line.substring("delete:".length()));
> modificationType = ModificationOperation.REMOVE_ATTRIBUTE;
> - attribute = new DefaultEntryAttribute( modified );
> + attribute = new DefaultAttribute( modified );
>
> state = ATTRVAL_SPEC_OR_SEP;
> }
> @@ -1074,7 +1074,7 @@ public class LdifReader implements Itera
>
> modified = Strings.trim(line.substring("replace:".length()));
> modificationType = ModificationOperation.REPLACE_ATTRIBUTE;
> - attribute = new DefaultEntryAttribute( modified );
> + attribute = new DefaultAttribute( modified );
>
> state = ATTRVAL_SPEC_OR_SEP;
> }
>
> Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertor.java
> URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertor.java?rev=1087515&r1=1087514&r2=1087515&view=diff
> ==============================================================================
> --- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertor.java (original)
> +++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertor.java Fri Apr 1 00:05:17 2011
> @@ -27,7 +27,7 @@ import java.util.Set;
>
> import org.apache.directory.shared.i18n.I18n;
> import org.apache.directory.shared.ldap.model.entry.AttributeUtils;
> -import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
> +import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
> import org.apache.directory.shared.ldap.model.entry.DefaultModification;
> import org.apache.directory.shared.ldap.model.entry.Entry;
> import org.apache.directory.shared.ldap.model.entry.Attribute;
> @@ -199,7 +199,7 @@ public final class LdifRevertor
> if ( ( mod.get() == null ) && ( previous == null ) )
> {
> reverseModification = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE,
> - new DefaultEntryAttribute( mod.getId() ) );
> + new DefaultAttribute( mod.getId() ) );
> reverseModifications.add( 0, reverseModification );
> continue;
> }
> @@ -214,7 +214,7 @@ public final class LdifRevertor
>
> if ( previous == null )
> {
> - Attribute emptyAttribute = new DefaultEntryAttribute( mod.getId() );
> + Attribute emptyAttribute = new DefaultAttribute( mod.getId() );
> reverseModification = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE,
> emptyAttribute );
> reverseModifications.add( 0, reverseModification );
> @@ -364,7 +364,7 @@ public final class LdifRevertor
> {
> // Create the modification, which is an Remove
> Modification modification = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE,
> - new DefaultEntryAttribute( ava.getUpType(), ava.getUpValue().getString() ) );
> + new DefaultAttribute( ava.getUpType(), ava.getUpValue().getString() ) );
>
> restored.addModificationItem( modification );
> }
>
> Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifUtils.java
> URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifUtils.java?rev=1087515&r1=1087514&r2=1087515&view=diff
> ==============================================================================
> --- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifUtils.java (original)
> +++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifUtils.java Fri Apr 1 00:05:17 2011
> @@ -26,7 +26,7 @@ import javax.naming.directory.Attributes
>
> import org.apache.directory.shared.i18n.I18n;
> import org.apache.directory.shared.ldap.model.entry.AttributeUtils;
> -import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
> +import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
> import org.apache.directory.shared.ldap.model.entry.Entry;
> import org.apache.directory.shared.ldap.model.entry.Attribute;
> import org.apache.directory.shared.ldap.model.entry.Modification;
> @@ -439,7 +439,7 @@ public final class LdifUtils
> }
>
> // Stores the new Rdn
> - Attribute newRdn = new DefaultEntryAttribute( "newrdn", entry.getNewRdn() );
> + Attribute newRdn = new DefaultAttribute( "newrdn", entry.getNewRdn() );
> sb.append( convertToLdif( newRdn, length ) );
>
> // Stores the deleteoldrdn flag
> @@ -459,7 +459,7 @@ public final class LdifUtils
> // Stores the optional newSuperior
> if ( !Strings.isEmpty(entry.getNewSuperior()) )
> {
> - Attribute newSuperior = new DefaultEntryAttribute( "newsuperior", entry.getNewSuperior() );
> + Attribute newSuperior = new DefaultAttribute( "newsuperior", entry.getNewSuperior() );
> sb.append( convertToLdif( newSuperior, length ) );
> }
>
>
> Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequestImpl.java
> URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequestImpl.java?rev=1087515&r1=1087514&r2=1087515&view=diff
> ==============================================================================
> --- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequestImpl.java (original)
> +++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequestImpl.java Fri Apr 1 00:05:17 2011
> @@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
>
>
> import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
> -import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
> +import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
> import org.apache.directory.shared.ldap.model.entry.Entry;
> import org.apache.directory.shared.ldap.model.entry.Attribute;
> import org.apache.directory.shared.ldap.model.entry.Value;
> @@ -89,7 +89,7 @@ public class AddRequestImpl extends Abst
> }
>
> // fix this to use AttributeImpl(type.getString().toLowerCase())
> - currentAttribute = new DefaultEntryAttribute( type );
> + currentAttribute = new DefaultAttribute( type );
> entry.put( currentAttribute );
> }
>
>
> Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java
> URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java?rev=1087515&r1=1087514&r2=1087515&view=diff
> ==============================================================================
> --- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java (original)
> +++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java Fri Apr 1 00:05:17 2011
> @@ -26,7 +26,7 @@ import java.util.Collections;
> import java.util.Iterator;
> import java.util.List;
>
> -import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
> +import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
> import org.apache.directory.shared.ldap.model.entry.DefaultModification;
> import org.apache.directory.shared.ldap.model.entry.Attribute;
> import org.apache.directory.shared.ldap.model.entry.Modification;
> @@ -128,14 +128,14 @@ public class ModifyRequestImpl extends A
>
> private void addModification( ModificationOperation modOp, String attributeName, byte[]... attributeValue )
> {
> - Attribute attr = new DefaultEntryAttribute( attributeName, attributeValue );
> + Attribute attr = new DefaultAttribute( attributeName, attributeValue );
> addModification( attr, modOp );
> }
>
>
> private void addModification( ModificationOperation modOp, String attributeName, String... attributeValue )
> {
> - Attribute attr = new DefaultEntryAttribute( attributeName, attributeValue );
> + Attribute attr = new DefaultAttribute( attributeName, attributeValue );
> addModification( attr, modOp );
> }
>
>
> Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/AttributeUtilsTest.java
> URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/AttributeUtilsTest.java?rev=1087515&r1=1087514&r2=1087515&view=diff
> ==============================================================================
> --- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/AttributeUtilsTest.java (original)
> +++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/AttributeUtilsTest.java Fri Apr 1 00:05:17 2011
> @@ -73,7 +73,7 @@ public class AttributeUtilsTest
> public void testApplyAddModificationToEmptyEntry() throws LdapException
> {
> Entry entry = new DefaultEntry();
> - Attribute attr = new DefaultEntryAttribute( "cn", "test" );
> + Attribute attr = new DefaultAttribute( "cn", "test" );
> Modification modification = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attr );
> AttributeUtils.applyModification( entry, modification );
> assertNotNull( entry.get( "cn" ) );
> @@ -92,7 +92,7 @@ public class AttributeUtilsTest
> entry.add( "dc", "apache" );
> assertEquals( 1, entry.size() );
>
> - Attribute attr = new DefaultEntryAttribute( "cn", "test" );
> + Attribute attr = new DefaultAttribute( "cn", "test" );
> Modification modification = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attr );
>
> AttributeUtils.applyModification( entry, modification );
> @@ -113,7 +113,7 @@ public class AttributeUtilsTest
> entry.put( "cn", "apache" );
> assertEquals( 1, entry.size() );
>
> - Attribute attr = new DefaultEntryAttribute( "cn", "test" );
> + Attribute attr = new DefaultAttribute( "cn", "test" );
> Modification modification = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attr );
> AttributeUtils.applyModification( entry, modification );
> assertNotNull( entry.get( "cn" ) );
> @@ -151,7 +151,7 @@ public class AttributeUtilsTest
> entry.put( "cn", "test", "apache" );
> assertEquals( 1, entry.size() );
>
> - Attribute attr = new DefaultEntryAttribute( "cn", "test" );
> + Attribute attr = new DefaultAttribute( "cn", "test" );
> Modification modification = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attr );
> AttributeUtils.applyModification( entry, modification );
> assertNotNull( entry.get( "cn" ) );
> @@ -186,7 +186,7 @@ public class AttributeUtilsTest
> {
> Entry entry = new DefaultEntry();
>
> - Attribute attr = new DefaultEntryAttribute( "cn", "test" );
> + Attribute attr = new DefaultAttribute( "cn", "test" );
>
> Modification modification = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attr );
> AttributeUtils.applyModification( entry, modification );
> @@ -203,10 +203,10 @@ public class AttributeUtilsTest
> {
> Entry entry = new DefaultEntry();
>
> - Attribute dc = new DefaultEntryAttribute( "dc", "apache" );
> + Attribute dc = new DefaultAttribute( "dc", "apache" );
> entry.put( dc );
>
> - Attribute cn = new DefaultEntryAttribute( "cn", "test" );
> + Attribute cn = new DefaultAttribute( "cn", "test" );
>
> Modification modification = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, cn );
>
> @@ -228,10 +228,10 @@ public class AttributeUtilsTest
> {
> Entry entry = new DefaultEntry();
>
> - Attribute cn = new DefaultEntryAttribute( "cn", "apache" );
> + Attribute cn = new DefaultAttribute( "cn", "apache" );
> entry.put( cn );
>
> - Attribute attr = new DefaultEntryAttribute( "cn", "test" );
> + Attribute attr = new DefaultAttribute( "cn", "test" );
>
> Modification modification = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attr );
>
> @@ -254,7 +254,7 @@ public class AttributeUtilsTest
> Entry entry = new DefaultEntry();
> entry.put( "cn", "test" );
>
> - Attribute attr = new DefaultEntryAttribute( "cn", "test" );
> + Attribute attr = new DefaultAttribute( "cn", "test" );
>
> Modification modification = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attr );
>
> @@ -277,7 +277,7 @@ public class AttributeUtilsTest
> Entry entry = new DefaultEntry();
> entry.put( "cn", "test", "apache" );
>
> - Attribute attr = new DefaultEntryAttribute( "cn", "test" );
> + Attribute attr = new DefaultAttribute( "cn", "test" );
>
> Modification modification = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attr );
>
> @@ -313,7 +313,7 @@ public class AttributeUtilsTest
> {
> Entry entry = new DefaultEntry();
>
> - Attribute attr = new DefaultEntryAttribute( "cn", "test" );
> + Attribute attr = new DefaultAttribute( "cn", "test" );
>
>
> Modification modification = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attr );
> @@ -335,7 +335,7 @@ public class AttributeUtilsTest
> {
> Entry entry = new DefaultEntry();
>
> - Attribute attr = new DefaultEntryAttribute( "cn" );
> + Attribute attr = new DefaultAttribute( "cn" );
>
> Modification modification = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attr );
> AttributeUtils.applyModification( entry, modification );
> @@ -358,7 +358,7 @@ public class AttributeUtilsTest
> entry.put( "cn", "test" );
> entry.put( "ou", "apache", "acme corp" );
>
> - Attribute newOu = new DefaultEntryAttribute( "ou", "Big Company", "directory" );
> + Attribute newOu = new DefaultAttribute( "ou", "Big Company", "directory" );
>
> Modification modification = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, newOu );
>
> @@ -402,7 +402,7 @@ public class AttributeUtilsTest
> entry.put( "cn", "test" );
> entry.put( "ou", "apache", "acme corp" );
>
> - Attribute newOu = new DefaultEntryAttribute( "ou" );
> + Attribute newOu = new DefaultAttribute( "ou" );
>
> Modification modification = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, newOu );
>
>
>