directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r498848 [2/4] - in /directory/apacheds/branches/1.0: core-unit/src/main/java/org/apache/directory/server/core/unit/ core-unit/src/test/java/org/apache/directory/server/core/ core-unit/src/test/java/org/apache/directory/server/core/authn/ co...
Date Mon, 22 Jan 2007 23:25:59 GMT
Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/ReferralITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/ReferralITest.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/ReferralITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/ReferralITest.java Mon Jan 22 15:25:45 2007
@@ -43,8 +43,8 @@
 import org.apache.directory.server.core.jndi.ServerLdapContext;
 import org.apache.directory.server.core.unit.AbstractAdminTestCase;
 import org.apache.directory.shared.ldap.exception.LdapNamingException;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -147,7 +147,7 @@
         // -------------------------------------------------------------------
 
         // Add a referral entry ( should be fine with or without the control )
-        Attributes referral = new AttributesImpl( "objectClass", "top", true );
+        Attributes referral = new LockableAttributesImpl( "objectClass", "top", true );
         referral.get( "objectClass" ).add( "referral" );
         referral.get( "objectClass" ).add( "extensibleObject" );
         referral.put( "ref", ref0 );
@@ -223,7 +223,7 @@
         // -------------------------------------------------------------------
 
         td.refCtx.addToEnvironment( Context.REFERRAL, "throw" );
-        Attributes userEntry = new AttributesImpl( "objectClass", "top", true );
+        Attributes userEntry = new LockableAttributesImpl( "objectClass", "top", true );
         userEntry.get( "objectClass" ).add( "person" );
         userEntry.put( "sn", "karasulu" );
         userEntry.put( "cn", "alex karasulu" );
@@ -254,7 +254,7 @@
         // -------------------------------------------------------------------
 
         td.refCtx.addToEnvironment( Context.REFERRAL, "throw" );
-        Attributes userEntry = new AttributesImpl( "objectClass", "top", true );
+        Attributes userEntry = new LockableAttributesImpl( "objectClass", "top", true );
         userEntry.get( "objectClass" ).add( "person" );
         userEntry.put( "sn", "karasulu" );
         userEntry.put( "cn", "alex karasulu" );
@@ -414,7 +414,7 @@
         td.refCtx.addToEnvironment( Context.REFERRAL, "throw" );
         try
         {
-            td.refCtx.modifyAttributes( "cn=alex karasulu", DirContext.ADD_ATTRIBUTE, new AttributesImpl(
+            td.refCtx.modifyAttributes( "cn=alex karasulu", DirContext.ADD_ATTRIBUTE, new LockableAttributesImpl(
                 "description", "just some text", true ) );
             fail( "Should fail here throwing a ReferralException" );
         }
@@ -442,7 +442,7 @@
         td.refCtx.addToEnvironment( Context.REFERRAL, "throw" );
         try
         {
-            td.refCtx.modifyAttributes( "cn=alex karasulu,ou=apache", DirContext.ADD_ATTRIBUTE, new AttributesImpl(
+            td.refCtx.modifyAttributes( "cn=alex karasulu,ou=apache", DirContext.ADD_ATTRIBUTE, new LockableAttributesImpl(
                 "description", "just some text", true ) );
             fail( "Should fail here throwing a ReferralException" );
         }
@@ -471,7 +471,7 @@
         try
         {
             ModificationItemImpl[] mods = new ModificationItemImpl[]
-                { new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, new AttributeImpl( "description", "just some text" ) ) };
+                { new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, new LockableAttributeImpl( "description", "just some text" ) ) };
             td.refCtx.modifyAttributes( "cn=alex karasulu", mods );
             fail( "Should fail here throwing a ReferralException" );
         }
@@ -500,7 +500,7 @@
         try
         {
             ModificationItemImpl[] mods = new ModificationItemImpl[]
-                { new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, new AttributeImpl( "description", "just some text" ) ) };
+                { new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, new LockableAttributeImpl( "description", "just some text" ) ) };
             td.refCtx.modifyAttributes( "cn=alex karasulu,ou=apache", mods );
             fail( "Should fail here throwing a ReferralException" );
         }
@@ -798,7 +798,7 @@
     public void createLocalUser() throws Exception
     {
         LdapContext userCtx = null;
-        Attributes referral = new AttributesImpl( "objectClass", "top", true );
+        Attributes referral = new LockableAttributesImpl( "objectClass", "top", true );
         referral.get( "objectClass" ).add( "person" );
         referral.put( "cn", "akarasulu" );
         referral.put( "sn", "karasulu" );
@@ -827,7 +827,7 @@
     public void createDeepLocalUser() throws Exception
     {
         LdapContext userCtx = null;
-        Attributes referral = new AttributesImpl( "objectClass", "top", true );
+        Attributes referral = new LockableAttributesImpl( "objectClass", "top", true );
         referral.get( "objectClass" ).add( "person" );
         referral.get( "objectClass" ).add( "organizationalUnit" );
         referral.put( "cn", "akarasulu" );
@@ -850,8 +850,8 @@
         }
         try
         {
-            Attributes attrs = new AttributesImpl( "ou", "deep" );
-            Attribute oc = new AttributeImpl( "ObjectClass" );
+            Attributes attrs = new LockableAttributesImpl( "ou", "deep" );
+            Attribute oc = new LockableAttributeImpl( "ObjectClass" );
             oc.add( "top" );
             oc.add( "organizationalUnit" );
             attrs.put( oc );

Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextITest.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextITest.java Mon Jan 22 15:25:45 2007
@@ -36,8 +36,8 @@
 import org.apache.directory.server.core.unit.AbstractAdminTestCase;
 import org.apache.directory.shared.ldap.exception.LdapSizeLimitExceededException;
 import org.apache.directory.shared.ldap.exception.LdapTimeLimitExceededException;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
 
 
@@ -61,8 +61,8 @@
         /*
          * create ou=testing00,ou=system
          */
-        Attributes attributes = new AttributesImpl( true );
-        Attribute attribute = new AttributeImpl( "objectClass" );
+        Attributes attributes = new LockableAttributesImpl( true );
+        Attribute attribute = new LockableAttributeImpl( "objectClass" );
         attribute.add( "top" );
         attribute.add( "organizationalUnit" );
         attributes.put( attribute );
@@ -84,8 +84,8 @@
         /*
          * create ou=testing01,ou=system
          */
-        attributes = new AttributesImpl( true );
-        attribute = new AttributeImpl( "objectClass" );
+        attributes = new LockableAttributesImpl( true );
+        attribute = new LockableAttributeImpl( "objectClass" );
         attribute.add( "top" );
         attribute.add( "organizationalUnit" );
         attributes.put( attribute );
@@ -107,8 +107,8 @@
         /*
          * create ou=testing02,ou=system
          */
-        attributes = new AttributesImpl( true );
-        attribute = new AttributeImpl( "objectClass" );
+        attributes = new LockableAttributesImpl( true );
+        attribute = new LockableAttributeImpl( "objectClass" );
         attribute.add( "top" );
         attribute.add( "organizationalUnit" );
         attributes.put( attribute );
@@ -133,8 +133,8 @@
          */
         ctx = ( DirContext ) sysRoot.lookup( "ou=testing01" );
 
-        attributes = new AttributesImpl( true );
-        attribute = new AttributeImpl( "objectClass" );
+        attributes = new LockableAttributesImpl( true );
+        attribute = new LockableAttributeImpl( "objectClass" );
         attribute.add( "top" );
         attribute.add( "organizationalUnit" );
         attributes.put( attribute );
@@ -556,8 +556,8 @@
      */
     protected Attributes getPersonAttributes( String sn, String cn )
     {
-        Attributes attributes = new AttributesImpl();
-        Attribute attribute = new AttributeImpl( "objectClass" );
+        Attributes attributes = new LockableAttributesImpl();
+        Attribute attribute = new LockableAttributeImpl( "objectClass" );
         attribute.add( "top" );
         attribute.add( "person" );
         attributes.put( attribute );

Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/operational/BinaryAttributeFilterITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/operational/BinaryAttributeFilterITest.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/operational/BinaryAttributeFilterITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/operational/BinaryAttributeFilterITest.java Mon Jan 22 15:25:45 2007
@@ -26,7 +26,7 @@
 import javax.naming.directory.DirContext;
 
 import org.apache.directory.server.core.unit.AbstractAdminTestCase;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.util.StringTools;
 
 
@@ -45,7 +45,7 @@
 
     public void testBinaryExtension() throws NamingException
     {
-        Attributes attributes = new AttributesImpl( true );
+        Attributes attributes = new LockableAttributesImpl( true );
         attributes.put( "objectClass", "top" );
         attributes.put( "objectClass", "organizationalUnit" );
         attributes.put( "objectClass", "extensibleObject" );

Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceITest.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceITest.java Mon Jan 22 15:25:45 2007
@@ -29,8 +29,8 @@
 import javax.naming.directory.SearchResult;
 
 import org.apache.directory.server.core.unit.AbstractAdminTestCase;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.message.DerefAliasesEnum;
 
 
@@ -52,8 +52,8 @@
         /*
          * create ou=testing00,ou=system
          */
-        Attributes attributes = new AttributesImpl( true );
-        Attribute attribute = new AttributeImpl( "objectClass" );
+        Attributes attributes = new LockableAttributesImpl( true );
+        Attribute attribute = new LockableAttributeImpl( "objectClass" );
         attribute.add( "top" );
         attribute.add( "organizationalUnit" );
         attributes.put( attribute );

Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/schema/IllegalModifyAddITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/schema/IllegalModifyAddITest.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/schema/IllegalModifyAddITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/schema/IllegalModifyAddITest.java Mon Jan 22 15:25:45 2007
@@ -27,8 +27,8 @@
 
 import org.apache.directory.server.core.unit.AbstractAdminTestCase;
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 
 
 /**
@@ -45,8 +45,8 @@
      */
     public void testIllegalModifyAdd() throws NamingException
     {
-        Attributes attrs = new AttributesImpl();
-        Attribute attr = new AttributeImpl( "description" );
+        Attributes attrs = new LockableAttributesImpl();
+        Attribute attr = new LockableAttributeImpl( "description" );
         attrs.put( attr );
 
         try

Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceITest.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceITest.java Mon Jan 22 15:25:45 2007
@@ -33,8 +33,8 @@
 import javax.naming.directory.SearchResult;
 
 import org.apache.directory.server.core.unit.AbstractAdminTestCase;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 
 
@@ -48,8 +48,8 @@
 {
     public Attributes getTestEntry( String cn )
     {
-        Attributes entry = new AttributesImpl();
-        Attribute objectClass = new AttributeImpl( "objectClass" );
+        Attributes entry = new LockableAttributesImpl();
+        Attribute objectClass = new LockableAttributeImpl( "objectClass" );
         objectClass.add( "top" );
         objectClass.add( "person" );
         entry.put( objectClass );
@@ -61,8 +61,8 @@
 
     public Attributes getCollectiveAttributeTestSubentry( String cn )
     {
-        Attributes subentry = new AttributesImpl();
-        Attribute objectClass = new AttributeImpl( "objectClass" );
+        Attributes subentry = new LockableAttributesImpl();
+        Attribute objectClass = new LockableAttributeImpl( "objectClass" );
         objectClass.add( "top" );
         objectClass.add( "subentry" );
         objectClass.add( "collectiveAttributeSubentry" );
@@ -76,8 +76,8 @@
     
     public Attributes getAccessControlTestSubentry( String cn )
     {
-        Attributes subentry = new AttributesImpl();
-        Attribute objectClass = new AttributeImpl( "objectClass" );
+        Attributes subentry = new LockableAttributesImpl();
+        Attribute objectClass = new LockableAttributeImpl( "objectClass" );
         objectClass.add( "top" );
         objectClass.add( "subentry" );
         objectClass.add( "accessControlSubentry" );
@@ -120,7 +120,7 @@
 
     public void addAdministrativeRoles() throws NamingException
     {
-        Attribute attribute = new AttributeImpl( "administrativeRole" );
+        Attribute attribute = new LockableAttributeImpl( "administrativeRole" );
         attribute.add( "autonomousArea" );
         attribute.add( "collectiveAttributeSpecificArea" );
         attribute.add( "accessControlSpecificArea" );

Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceITest.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceITest.java Mon Jan 22 15:25:45 2007
@@ -23,8 +23,8 @@
 import org.apache.directory.server.core.subtree.SubentryService;
 import org.apache.directory.server.core.unit.AbstractAdminTestCase;
 import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.message.SubentriesControl;
 
@@ -51,8 +51,8 @@
 {
     public Attributes getTestEntry( String cn )
     {
-        Attributes subentry = new AttributesImpl();
-        Attribute objectClass = new AttributeImpl( "objectClass" );
+        Attributes subentry = new LockableAttributesImpl();
+        Attribute objectClass = new LockableAttributeImpl( "objectClass" );
         objectClass.add( "top" );
         objectClass.add( "person" );
         subentry.put( objectClass );
@@ -64,8 +64,8 @@
 
     public Attributes getTestSubentry()
     {
-        Attributes subentry = new AttributesImpl();
-        Attribute objectClass = new AttributeImpl( "objectClass" );
+        Attributes subentry = new LockableAttributesImpl();
+        Attribute objectClass = new LockableAttributeImpl( "objectClass" );
         objectClass.add( "top" );
         objectClass.add( "subentry" );
         objectClass.add( "collectiveAttributeSubentry" );
@@ -79,8 +79,8 @@
 
     public Attributes getTestSubentryWithExclusion()
     {
-        Attributes subentry = new AttributesImpl();
-        Attribute objectClass = new AttributeImpl( "objectClass" );
+        Attributes subentry = new LockableAttributesImpl();
+        Attribute objectClass = new LockableAttributeImpl( "objectClass" );
         objectClass.add( "top" );
         objectClass.add( "subentry" );
         objectClass.add( "collectiveAttributeSubentry" );
@@ -95,7 +95,7 @@
 
     public void addAdministrativeRole( String role ) throws NamingException
     {
-        Attribute attribute = new AttributeImpl( "administrativeRole" );
+        Attribute attribute = new LockableAttributeImpl( "administrativeRole" );
         attribute.add( role );
         ModificationItemImpl item = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, attribute );
         super.sysRoot.modifyAttributes( "", new ModificationItemImpl[]
@@ -272,7 +272,7 @@
         // Now modify the subentry by introducing an exclusion
         // --------------------------------------------------------------------
 
-        Attribute subtreeSpecification = new AttributeImpl( "subtreeSpecification" );
+        Attribute subtreeSpecification = new LockableAttributeImpl( "subtreeSpecification" );
         subtreeSpecification.add( "{ base \"ou=configuration\", specificExclusions { chopBefore:\"ou=services\" } }" );
         ModificationItemImpl item = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, subtreeSpecification );
         super.sysRoot.modifyAttributes( "cn=testsubentry", new ModificationItemImpl[]
@@ -388,7 +388,7 @@
         // Now modify the subentry by introducing an exclusion
         // --------------------------------------------------------------------
 
-        Attributes changes = new AttributesImpl();
+        Attributes changes = new LockableAttributesImpl();
         changes.put( "subtreeSpecification",
             "{ base \"ou=configuration\", specificExclusions { chopBefore:\"ou=services\" } }" );
         super.sysRoot.modifyAttributes( "cn=testsubentry", DirContext.REPLACE_ATTRIBUTE, changes );

Modified: directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original)
+++ directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Mon Jan 22 15:25:45 2007
@@ -50,8 +50,8 @@
 import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
 import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
 import org.apache.directory.shared.ldap.ldif.Entry;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -432,8 +432,8 @@
         {
             firstStart = true;
 
-            Attributes attributes = new AttributesImpl();
-            Attribute objectClass = new AttributeImpl( "objectClass" );
+            Attributes attributes = new LockableAttributesImpl();
+            Attribute objectClass = new LockableAttributeImpl( "objectClass" );
             objectClass.add( "top" );
             objectClass.add( "person" );
             objectClass.add( "organizationalPerson" );
@@ -465,8 +465,8 @@
         {
             firstStart = true;
 
-            Attributes attributes = new AttributesImpl();
-            Attribute objectClass = new AttributeImpl( "objectClass" );
+            Attributes attributes = new LockableAttributesImpl();
+            Attribute objectClass = new LockableAttributeImpl( "objectClass" );
             objectClass.add( "top" );
             objectClass.add( "organizationalUnit" );
             attributes.put( objectClass );
@@ -489,8 +489,8 @@
         {
             firstStart = true;
 
-            Attributes attributes = new AttributesImpl();
-            Attribute objectClass = new AttributeImpl( "objectClass" );
+            Attributes attributes = new LockableAttributesImpl();
+            Attribute objectClass = new LockableAttributeImpl( "objectClass" );
             objectClass.add( "top" );
             objectClass.add( "organizationalUnit" );
             attributes.put( objectClass );
@@ -514,8 +514,8 @@
         {
             firstStart = true;
 
-            Attributes attributes = new AttributesImpl();
-            Attribute objectClass = new AttributeImpl( "objectClass" );
+            Attributes attributes = new LockableAttributesImpl();
+            Attribute objectClass = new LockableAttributeImpl( "objectClass" );
             objectClass.add( "top" );
             objectClass.add( "groupOfUniqueNames" );
             attributes.put( objectClass );
@@ -540,8 +540,8 @@
         {
             firstStart = true;
 
-            Attributes attributes = new AttributesImpl();
-            Attribute objectClass = new AttributeImpl( "objectClass" );
+            Attributes attributes = new LockableAttributesImpl();
+            Attribute objectClass = new LockableAttributeImpl( "objectClass" );
             objectClass.add( "top" );
             objectClass.add( "organizationalUnit" );
             attributes.put( objectClass );
@@ -564,8 +564,8 @@
         {
             firstStart = true;
 
-            Attributes attributes = new AttributesImpl();
-            Attribute objectClass = new AttributeImpl( "objectClass" );
+            Attributes attributes = new LockableAttributesImpl();
+            Attribute objectClass = new LockableAttributeImpl( "objectClass" );
             objectClass.add( "top" );
             objectClass.add( "organizationalUnit" );
             attributes.put( objectClass );
@@ -588,8 +588,8 @@
         {
             firstStart = true;
 
-            Attributes attributes = new AttributesImpl();
-            Attribute objectClass = new AttributeImpl( "objectClass" );
+            Attributes attributes = new LockableAttributesImpl();
+            Attribute objectClass = new LockableAttributeImpl( "objectClass" );
             objectClass.add( "top" );
             objectClass.add( "organizationalUnit" );
             attributes.put( objectClass );
@@ -612,8 +612,8 @@
         {
             firstStart = true;
 
-            Attributes attributes = new AttributesImpl();
-            Attribute objectClass = new AttributeImpl( "objectClass" );
+            Attributes attributes = new LockableAttributesImpl();
+            Attribute objectClass = new LockableAttributeImpl( "objectClass" );
             objectClass.add( "top" );
             objectClass.add( "organizationalUnit" );
             attributes.put( objectClass );
@@ -636,8 +636,8 @@
         {
             firstStart = true;
 
-            Attributes attributes = new AttributesImpl();
-            Attribute objectClass = new AttributeImpl( "objectClass" );
+            Attributes attributes = new LockableAttributesImpl();
+            Attribute objectClass = new LockableAttributeImpl( "objectClass" );
             objectClass.add( "top" );
             objectClass.add( "organizationalUnit" );
             attributes.put( objectClass );
@@ -815,7 +815,7 @@
             log.debug( "binary ids used: " + binaries );
         }
 
-        partitionNexus = new DefaultPartitionNexus( new AttributesImpl() );
+        partitionNexus = new DefaultPartitionNexus( new LockableAttributesImpl() );
         partitionNexus.init( configuration, null );
 
         interceptorChain = new InterceptorChain();

Modified: directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java (original)
+++ directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java Mon Jan 22 15:25:45 2007
@@ -32,7 +32,7 @@
 import org.apache.directory.server.core.schema.AttributeTypeRegistry;
 import org.apache.directory.server.core.subtree.SubentryService;
 import org.apache.directory.shared.ldap.filter.ExprNode;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 
@@ -168,7 +168,7 @@
                     // if entry does not have attribute for colattr then create it
                     if ( entryColAttr == null )
                     {
-                        entryColAttr = new AttributeImpl( attrId );
+                        entryColAttr = new LockableAttributeImpl( attrId );
                         entry.put( entryColAttr );
                     }
 

Modified: directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/configuration/AttributesPropertyEditor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/configuration/AttributesPropertyEditor.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/configuration/AttributesPropertyEditor.java (original)
+++ directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/configuration/AttributesPropertyEditor.java Mon Jan 22 15:25:45 2007
@@ -38,7 +38,7 @@
 import org.apache.directory.shared.ldap.ldif.LdifComposer;
 import org.apache.directory.shared.ldap.ldif.LdifComposerImpl;
 import org.apache.directory.shared.ldap.ldif.LdifReader;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.util.MultiMap;
 import org.apache.directory.shared.ldap.util.StringTools;
 
@@ -183,7 +183,7 @@
         BufferedReader in = new BufferedReader( strIn );
 
         String line = null;
-        Attributes attributes = new AttributesImpl( true );
+        Attributes attributes = new LockableAttributesImpl( true );
 
         try
         {

Modified: directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java (original)
+++ directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java Mon Jan 22 15:25:45 2007
@@ -31,7 +31,7 @@
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
 import org.apache.directory.server.core.schema.MatchingRuleRegistry;
 import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.Normalizer;
 
@@ -52,7 +52,7 @@
     private int cacheSize = -1;
     private String suffix;
     private Set indexedAttributes; // Set<String> or <IndexConfiguration>
-    private Attributes contextEntry = new AttributesImpl( true );
+    private Attributes contextEntry = new LockableAttributesImpl( true );
     private Partition contextPartition = new JdbmPartition();
 
 

Modified: directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java (original)
+++ directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java Mon Jan 22 15:25:45 2007
@@ -20,7 +20,7 @@
 package org.apache.directory.server.core.jndi;
 
 
-import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -167,7 +167,7 @@
          * objectClass: javaContainer
          * objectClass: javaSerializedObject
          */
-        Attribute objectClass = new AttributeImpl( "objectClass" );
+        Attribute objectClass = new LockableAttributeImpl( "objectClass" );
         objectClass.add( TOP_ATTR );
         objectClass.add( JOBJECT_ATTR );
         objectClass.add( JCONTAINER_ATTR );
@@ -180,7 +180,7 @@
 
         // Add all the class names this object can be cast to:
         Class[] classes = obj.getClass().getClasses();
-        Attribute javaClassNames = new AttributeImpl( JCLASSNAMES_ATTR );
+        Attribute javaClassNames = new LockableAttributeImpl( JCLASSNAMES_ATTR );
 
         for ( int ii = 0; ii < classes.length; ii++ )
         {

Modified: directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Mon Jan 22 15:25:45 2007
@@ -54,7 +54,7 @@
 import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.PresenceNode;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.name.AttributeTypeAndValue;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.name.Rdn;
@@ -289,7 +289,7 @@
      */
     public Context createSubcontext( Name name ) throws NamingException
     {
-        Attributes attributes = new AttributesImpl();
+        Attributes attributes = new LockableAttributesImpl();
         LdapDN target = buildTarget( name );
         injectRdnAttributeValues( target, attributes );
         
@@ -391,7 +391,7 @@
         else if ( obj instanceof Serializable )
         {
             // Serialize and add outAttrs
-            Attributes attributes = new AttributesImpl();
+            Attributes attributes = new LockableAttributesImpl();
             if ( outAttrs != null && outAttrs.size() > 0 )
             {
                 NamingEnumeration list = outAttrs.getAll();

Modified: directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java (original)
+++ directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java Mon Jan 22 15:25:45 2007
@@ -49,8 +49,8 @@
 import org.apache.directory.shared.ldap.schema.UsageEnum;
 import org.apache.directory.shared.ldap.util.AttributeUtils;
 import org.apache.directory.shared.ldap.util.DateUtils;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.name.AttributeTypeAndValue;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -138,11 +138,11 @@
     {
         String principal = getPrincipal().getName();
 
-        Attribute attribute = new AttributeImpl( "creatorsName" );
+        Attribute attribute = new LockableAttributeImpl( "creatorsName" );
         attribute.add( principal );
         entry.put( attribute );
 
-        attribute = new AttributeImpl( "createTimestamp" );
+        attribute = new LockableAttributeImpl( "createTimestamp" );
         attribute.add( DateUtils.getGeneralizedTime() );
         entry.put( attribute );
 
@@ -156,12 +156,12 @@
         nextInterceptor.modify( name, modOp, attrs );
 
         // add operational attributes after call in case the operation fails
-        Attributes attributes = new AttributesImpl( true );
-        Attribute attribute = new AttributeImpl( "modifiersName" );
+        Attributes attributes = new LockableAttributesImpl( true );
+        Attribute attribute = new LockableAttributeImpl( "modifiersName" );
         attribute.add( getPrincipal().getName() );
         attributes.put( attribute );
 
-        attribute = new AttributeImpl( "modifyTimestamp" );
+        attribute = new LockableAttributeImpl( "modifyTimestamp" );
         attribute.add( DateUtils.getGeneralizedTime() );
         attributes.put( attribute );
 
@@ -174,12 +174,12 @@
         nextInterceptor.modify( name, items );
 
         // add operational attributes after call in case the operation fails
-        Attributes attributes = new AttributesImpl( true );
-        Attribute attribute = new AttributeImpl( "modifiersName" );
+        Attributes attributes = new LockableAttributesImpl( true );
+        Attribute attribute = new LockableAttributeImpl( "modifiersName" );
         attribute.add( getPrincipal().getName() );
         attributes.put( attribute );
 
-        attribute = new AttributeImpl( "modifyTimestamp" );
+        attribute = new LockableAttributeImpl( "modifyTimestamp" );
         attribute.add( DateUtils.getGeneralizedTime() );
         attributes.put( attribute );
 
@@ -193,12 +193,12 @@
         nextInterceptor.modifyRn( name, newRn, deleteOldRn );
 
         // add operational attributes after call in case the operation fails
-        Attributes attributes = new AttributesImpl( true );
-        Attribute attribute = new AttributeImpl( "modifiersName" );
+        Attributes attributes = new LockableAttributesImpl( true );
+        Attribute attribute = new LockableAttributeImpl( "modifiersName" );
         attribute.add( getPrincipal().getName() );
         attributes.put( attribute );
 
-        attribute = new AttributeImpl( "modifyTimestamp" );
+        attribute = new LockableAttributeImpl( "modifyTimestamp" );
         attribute.add( DateUtils.getGeneralizedTime() );
         attributes.put( attribute );
 
@@ -215,12 +215,12 @@
         nextInterceptor.move( name, newParentName );
 
         // add operational attributes after call in case the operation fails
-        Attributes attributes = new AttributesImpl( true );
-        Attribute attribute = new AttributeImpl( "modifiersName" );
+        Attributes attributes = new LockableAttributesImpl( true );
+        Attribute attribute = new LockableAttributeImpl( "modifiersName" );
         attribute.add( getPrincipal().getName() );
         attributes.put( attribute );
 
-        attribute = new AttributeImpl( "modifyTimestamp" );
+        attribute = new LockableAttributeImpl( "modifyTimestamp" );
         attribute.add( DateUtils.getGeneralizedTime() );
         attributes.put( attribute );
 
@@ -234,12 +234,12 @@
         nextInterceptor.move( name, newParentName, newRn, deleteOldRn );
 
         // add operational attributes after call in case the operation fails
-        Attributes attributes = new AttributesImpl( true );
-        Attribute attribute = new AttributeImpl( "modifiersName" );
+        Attributes attributes = new LockableAttributesImpl( true );
+        Attribute attribute = new LockableAttributeImpl( "modifiersName" );
         attribute.add( getPrincipal().getName() );
         attributes.put( attribute );
 
-        attribute = new AttributeImpl( "modifyTimestamp" );
+        attribute = new LockableAttributeImpl( "modifyTimestamp" );
         attribute.add( DateUtils.getGeneralizedTime() );
         attributes.put( attribute );
 

Modified: directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Mon Jan 22 15:25:45 2007
@@ -56,8 +56,8 @@
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.PresenceNode;
 import org.apache.directory.shared.ldap.message.EntryChangeControl;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.message.ManageDsaITControl;
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.message.PersistentSearchControl;
@@ -132,38 +132,38 @@
     {
         // setup that root DSE
         this.rootDSE = rootDSE;
-        Attribute attr = new AttributeImpl( "subschemaSubentry" );
+        Attribute attr = new LockableAttributeImpl( "subschemaSubentry" );
         attr.add( "cn=schema,ou=system" );
         rootDSE.put( attr );
 
-        attr = new AttributeImpl( "supportedLDAPVersion" );
+        attr = new LockableAttributeImpl( "supportedLDAPVersion" );
         rootDSE.put( attr );
         attr.add( "3" );
 
-        attr = new AttributeImpl( "supportedFeatures" );
+        attr = new LockableAttributeImpl( "supportedFeatures" );
         rootDSE.put( attr );
         attr.add( "1.3.6.1.4.1.4203.1.5.1" );
 
-        attr = new AttributeImpl( "supportedExtension" );
+        attr = new LockableAttributeImpl( "supportedExtension" );
         rootDSE.put( attr );
         attr.add( NoticeOfDisconnect.EXTENSION_OID );
 
-        attr = new AttributeImpl( "supportedControl" );
+        attr = new LockableAttributeImpl( "supportedControl" );
         rootDSE.put( attr );
         attr.add( PersistentSearchControl.CONTROL_OID );
         attr.add( EntryChangeControl.CONTROL_OID );
         attr.add( SubentriesControl.CONTROL_OID );
         attr.add( ManageDsaITControl.CONTROL_OID );
 
-        attr = new AttributeImpl( "objectClass" );
+        attr = new LockableAttributeImpl( "objectClass" );
         rootDSE.put( attr );
         attr.add( "top" );
         attr.add( "extensibleObject" );
 
-        attr = new AttributeImpl( NAMINGCTXS_ATTR );
+        attr = new LockableAttributeImpl( NAMINGCTXS_ATTR );
         rootDSE.put( attr );
 
-        attr = new AttributeImpl( VENDORNAME_ATTR );
+        attr = new LockableAttributeImpl( VENDORNAME_ATTR );
         attr.add( ASF );
         rootDSE.put( attr );
 
@@ -177,7 +177,7 @@
             log.error( "failed to log version properties" );
         }
 
-        attr = new AttributeImpl( VENDORVERSION_ATTR );
+        attr = new LockableAttributeImpl( VENDORVERSION_ATTR );
         attr.add( props.getProperty( "apacheds.version", "UNKNOWN" ) );
         rootDSE.put( attr );
     }
@@ -256,7 +256,7 @@
             Attribute objectClassAttr = systemEntry.get( "objectClass" );
             if ( objectClassAttr == null )
             {
-                objectClassAttr = new AttributeImpl(  "objectClass" );
+                objectClassAttr = new LockableAttributeImpl(  "objectClass" );
                 systemEntry.put( objectClassAttr );
             }
             objectClassAttr.add( "top" );
@@ -346,8 +346,8 @@
             systemCfg.setIndexedAttributes( indexedSystemAttrs );
     
             // Add context entry for system partition
-            Attributes systemEntry = new AttributesImpl();
-            Attribute objectClassAttr = new AttributeImpl( "objectClass" );
+            Attributes systemEntry = new LockableAttributesImpl();
+            Attribute objectClassAttr = new LockableAttributeImpl( "objectClass" );
             objectClassAttr.add( "top" );
             objectClassAttr.add( "organizationalUnit" );
             objectClassAttr.add( "extensibleObject" );
@@ -790,7 +790,7 @@
                 // return nothing
                 if ( containsOneDotOne )
                 {
-                    SearchResult result = new SearchResult( "", null, new AttributesImpl(), false );
+                    SearchResult result = new SearchResult( "", null, new LockableAttributesImpl(), false );
                     return new SingletonEnumeration( result );
                 }
                 
@@ -801,7 +801,7 @@
                     return new SingletonEnumeration( result );
                 }
                 
-                Attributes attrs = new AttributesImpl();
+                Attributes attrs = new LockableAttributesImpl();
                 if ( containsAsterisk )
                 {
                     for ( NamingEnumeration ii = getRootDSE().getAll(); ii.hasMore(); /**/ )
@@ -886,7 +886,7 @@
     {
         if ( dn.size() == 0 )
         {
-            Attributes retval = new AttributesImpl();
+            Attributes retval = new LockableAttributesImpl();
             NamingEnumeration list = rootDSE.getIDs();
             while ( list.hasMore() )
             {
@@ -999,7 +999,7 @@
         Attribute supportedExtension = rootDSE.get( "supportedExtension" );
         if ( supportedExtension == null )
         {
-            supportedExtension = new AttributeImpl( "supportedExtension" );
+            supportedExtension = new LockableAttributeImpl( "supportedExtension" );
             rootDSE.put( supportedExtension );
         }
         for ( Iterator oids = extensionOids.iterator(); oids.hasNext(); )

Modified: directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java (original)
+++ directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java Mon Jan 22 15:25:45 2007
@@ -42,7 +42,7 @@
 import org.apache.directory.shared.ldap.exception.LdapContextNotEmptyException;
 import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.util.ArrayUtils;
@@ -384,7 +384,7 @@
         }
 
         Attributes entry = lookup( dn );
-        Attributes retval = new AttributesImpl();
+        Attributes retval = new LockableAttributesImpl();
 
         for ( int ii = 0; ii < attrIds.length; ii++ )
         {

Modified: directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java (original)
+++ directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java Mon Jan 22 15:25:45 2007
@@ -29,7 +29,7 @@
 
 import org.apache.directory.server.core.enumeration.SearchResultEnumeration;
 import org.apache.directory.server.core.schema.AttributeTypeRegistry;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.UsageEnum;
 import org.apache.directory.shared.ldap.util.AttributeUtils;
@@ -121,7 +121,7 @@
         }
         else if ( attrIdsHasPlus )
         {
-            entry = new AttributesImpl();
+            entry = new LockableAttributesImpl();
 
             // add all listed attributes
             for ( int ii = 0; ii < attrIds.length; ii++ )
@@ -158,7 +158,7 @@
         }
         else if ( attrIdsHasStar )
         {
-            entry = new AttributesImpl();
+            entry = new LockableAttributesImpl();
 
             // add all listed operational attributes
             for ( int ii = 0; ii < attrIds.length; ii++ )
@@ -193,7 +193,7 @@
         }
         else
         {
-            entry = new AttributesImpl();
+            entry = new LockableAttributesImpl();
 
             Attributes attrs = rec.getAttributes();
             

Modified: directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java (original)
+++ directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java Mon Jan 22 15:25:45 2007
@@ -40,7 +40,7 @@
 import javax.swing.JTable;
 import javax.swing.JTextField;
 
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -71,7 +71,7 @@
     private JButton m_cancelBut = new JButton();
     private JPopupMenu m_popup;
 
-    private Attributes m_childEntry = new AttributesImpl();
+    private Attributes m_childEntry = new LockableAttributesImpl();
 
 
     /**

Modified: directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializer.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializer.java (original)
+++ directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializer.java Mon Jan 22 15:25:45 2007
@@ -26,7 +26,7 @@
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
 
-import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
 
 import jdbm.helper.Serializer;
 
@@ -64,7 +64,7 @@
     public final Object deserialize( byte[] buf ) throws IOException
     {
         String id = readString( buf );
-        AttributeImpl attr = new AttributeImpl( id );
+        LockableAttributeImpl attr = new LockableAttributeImpl( id );
         int pos = ( id.length() << 1 ) + 4;
         
         // read the type of the objects stored in this attribute
@@ -101,7 +101,7 @@
     public static final DeserializedAttribute deserialize( byte[] buf, int offset ) throws IOException
     {
         final String id = readString( buf, offset );
-        final AttributeImpl attr = new AttributeImpl( id );
+        final LockableAttributeImpl attr = new LockableAttributeImpl( id );
         int pos = ( id.length() << 1 ) + 4 + offset;
         
         // read the type of the objects stored in this attribute

Modified: directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializer.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializer.java (original)
+++ directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializer.java Mon Jan 22 15:25:45 2007
@@ -27,8 +27,8 @@
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 
 import jdbm.helper.Serializer;
 
@@ -51,15 +51,15 @@
     {
         if ( buf.length == 0 )
         {
-            return new AttributesImpl();
+            return new LockableAttributesImpl();
         }
 
         int pos = 0;
-        AttributesImpl attrs = new AttributesImpl();
+        LockableAttributesImpl attrs = new LockableAttributesImpl();
         while ( pos < buf.length )
         {
             String id = AttributeSerializer.readString( buf, pos );
-            AttributeImpl attr = new AttributeImpl( id );
+            LockableAttributeImpl attr = new LockableAttributeImpl( id );
             pos += ( id.length() << 1 ) + 4;
 
             // read the type of the objects stored in this attribute

Modified: directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java (original)
+++ directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java Mon Jan 22 15:25:45 2007
@@ -57,8 +57,8 @@
 import org.apache.directory.shared.ldap.exception.LdapAuthenticationNotSupportedException;
 import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -989,7 +989,7 @@
 
     public Attributes getIndices( BigInteger id ) throws NamingException
     {
-        Attributes attributes = new AttributesImpl();
+        Attributes attributes = new LockableAttributesImpl();
 
         // Get the distinguishedName to id mapping
         attributes.put( "_nDn", getEntryDn( id ) );
@@ -1010,7 +1010,7 @@
                 Attribute attr = attributes.get( attrId );
                 if ( attr == null )
                 {
-                    attr = new AttributeImpl( attrId );
+                    attr = new LockableAttributeImpl( attrId );
                 }
                 attr.add( val );
                 attributes.put( attr );
@@ -1032,7 +1032,7 @@
             Attribute attr = attributes.get( valStr );
             if ( attr == null )
             {
-                attr = new AttributeImpl( valStr );
+                attr = new LockableAttributeImpl( valStr );
             }
             attr.add( rec.getEntryId() );
             attributes.put( attr );
@@ -1042,7 +1042,7 @@
         // Get all parent child mappings for this entry as the parent using the
         // key 'child' with many entries following it.
         list = hierarchyIdx.listIndices( id );
-        Attribute childAttr = new AttributeImpl( "_child" );
+        Attribute childAttr = new LockableAttributeImpl( "_child" );
         attributes.put( childAttr );
         while ( list.hasMore() )
         {
@@ -1087,7 +1087,7 @@
 
         if ( entryAttrToAddTo == null )
         {
-            entryAttrToAddTo = new AttributeImpl( mods.getID() );
+            entryAttrToAddTo = new LockableAttributeImpl( mods.getID() );
             entry.put( entryAttrToAddTo );
         }
 
@@ -1357,7 +1357,7 @@
         Attribute rdnAttr = ServerUtils.getAttribute( newRdnAttrType, entry );
         if ( rdnAttr == null )
         {
-            rdnAttr = new AttributeImpl( newRdnAttr );
+            rdnAttr = new LockableAttributeImpl( newRdnAttr );
         }
 
         // add the new Rdn value only if it is not already present in the entry

Modified: directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java (original)
+++ directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java Mon Jan 22 15:25:45 2007
@@ -43,8 +43,8 @@
 import org.apache.directory.server.core.configuration.ShutdownConfiguration;
 import org.apache.directory.server.core.jndi.CoreContextFactory;
 
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.util.PreferencesDictionary;
 
@@ -190,13 +190,13 @@
      */
     private void setUpNode( String name ) throws NamingException
     {
-        Attributes attrs = new AttributesImpl();
-        Attribute attr = new AttributeImpl( "objectClass" );
+        Attributes attrs = new LockableAttributesImpl();
+        Attribute attr = new LockableAttributeImpl( "objectClass" );
         attr.add( "top" );
         attr.add( "prefNode" );
         attr.add( "extensibleObject" );
         attrs.put( attr );
-        attr = new AttributeImpl( "prefNodeName" );
+        attr = new LockableAttributeImpl( "prefNodeName" );
         attr.add( name );
         attrs.put( attr );
 
@@ -334,7 +334,7 @@
 
     protected void removeSpi( String key )
     {
-        Attribute attr = new AttributeImpl( key );
+        Attribute attr = new LockableAttributeImpl( key );
         ModificationItemImpl mi = new ModificationItemImpl( DirContext.REMOVE_ATTRIBUTE, attr );
         addDelta( mi );
     }
@@ -401,7 +401,7 @@
 
     protected void putSpi( String key, String value )
     {
-        Attribute attr = new AttributeImpl( key );
+        Attribute attr = new LockableAttributeImpl( key );
         attr.add( value );
         ModificationItemImpl mi = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, attr );
         addDelta( mi );

Modified: directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original)
+++ directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Mon Jan 22 15:25:45 2007
@@ -55,8 +55,8 @@
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.PresenceNode;
 import org.apache.directory.shared.ldap.filter.SimpleNode;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -451,8 +451,8 @@
         }
 
         Set set = new HashSet();
-        AttributesImpl attrs = new AttributesImpl();
-        AttributeImpl attr;
+        LockableAttributesImpl attrs = new LockableAttributesImpl();
+        LockableAttributeImpl attr;
 
         for ( int ii = 0; ii < ids.length; ii++ )
         {
@@ -465,7 +465,7 @@
 
         if ( returnAllOperationalAttributes || set.contains( "objectclasses" ) )
         {
-            attr = new AttributeImpl( "objectClasses" );
+            attr = new LockableAttributeImpl( "objectClasses" );
             Iterator list = globalRegistries.getObjectClassRegistry().list();
             while ( list.hasNext() )
             {
@@ -477,7 +477,7 @@
 
         if ( returnAllOperationalAttributes || set.contains( "attributetypes" ) )
         {
-            attr = new AttributeImpl( "attributeTypes" );
+            attr = new LockableAttributeImpl( "attributeTypes" );
             Iterator list = globalRegistries.getAttributeTypeRegistry().list();
             while ( list.hasNext() )
             {
@@ -489,7 +489,7 @@
 
         if ( returnAllOperationalAttributes || set.contains( "matchingrules" ) )
         {
-            attr = new AttributeImpl( "matchingRules" );
+            attr = new LockableAttributeImpl( "matchingRules" );
             Iterator list = globalRegistries.getMatchingRuleRegistry().list();
             while ( list.hasNext() )
             {
@@ -501,7 +501,7 @@
 
         if ( returnAllOperationalAttributes || set.contains( "matchingruleuse" ) )
         {
-            attr = new AttributeImpl( "matchingRuleUse" );
+            attr = new LockableAttributeImpl( "matchingRuleUse" );
             Iterator list = globalRegistries.getMatchingRuleUseRegistry().list();
             while ( list.hasNext() )
             {
@@ -513,7 +513,7 @@
 
         if ( returnAllOperationalAttributes || set.contains( "ldapsyntaxes" ) )
         {
-            attr = new AttributeImpl( "ldapSyntaxes" );
+            attr = new LockableAttributeImpl( "ldapSyntaxes" );
             Iterator list = globalRegistries.getSyntaxRegistry().list();
             while ( list.hasNext() )
             {
@@ -525,7 +525,7 @@
 
         if ( returnAllOperationalAttributes || set.contains( "ditcontentrules" ) )
         {
-            attr = new AttributeImpl( "dITContentRules" );
+            attr = new LockableAttributeImpl( "dITContentRules" );
             Iterator list = globalRegistries.getDitContentRuleRegistry().list();
             while ( list.hasNext() )
             {
@@ -537,7 +537,7 @@
 
         if ( returnAllOperationalAttributes || set.contains( "ditstructurerules" ) )
         {
-            attr = new AttributeImpl( "dITStructureRules" );
+            attr = new LockableAttributeImpl( "dITStructureRules" );
             Iterator list = globalRegistries.getDitStructureRuleRegistry().list();
             while ( list.hasNext() )
             {
@@ -549,7 +549,7 @@
 
         if ( returnAllOperationalAttributes || set.contains( "nameforms" ) )
         {
-            attr = new AttributeImpl( "nameForms" );
+            attr = new LockableAttributeImpl( "nameForms" );
             Iterator list = globalRegistries.getNameFormRegistry().list();
             while ( list.hasNext() )
             {
@@ -564,28 +564,28 @@
 
         if ( returnAllOperationalAttributes || set.contains( "createtimestamp" ) )
         {
-            attr = new AttributeImpl( "createTimestamp" );
+            attr = new LockableAttributeImpl( "createTimestamp" );
             attr.add( startUpTimeStamp );
             attrs.put( attr );
         }
 
         if ( returnAllOperationalAttributes || set.contains( "modifytimestamp" ) )
         {
-            attr = new AttributeImpl( "modifyTimestamp" );
+            attr = new LockableAttributeImpl( "modifyTimestamp" );
             attr.add( startUpTimeStamp );
             attrs.put( attr );
         }
 
         if ( returnAllOperationalAttributes || set.contains( "creatorsname" ) )
         {
-            attr = new AttributeImpl( "creatorsName" );
+            attr = new LockableAttributeImpl( "creatorsName" );
             attr.add( PartitionNexus.ADMIN_PRINCIPAL );
             attrs.put( attr );
         }
 
         if ( returnAllOperationalAttributes || set.contains( "modifiersname" ) )
         {
-            attr = new AttributeImpl( "modifiersName" );
+            attr = new LockableAttributeImpl( "modifiersName" );
             attr.add( PartitionNexus.ADMIN_PRINCIPAL );
             attrs.put( attr );
         }
@@ -607,7 +607,7 @@
         // add the objectClass attribute
         if ( set.contains( "*" ) || set.contains( "objectclass" ) || set.size() == minSetSize )
         {
-            attr = new AttributeImpl( "objectClass" );
+            attr = new LockableAttributeImpl( "objectClass" );
             attr.add( "top" );
             attr.add( "subschema" );
             attrs.put( attr );
@@ -732,7 +732,7 @@
     {
         if ( changes == null && existing == null )
         {
-            return new AttributeImpl( "objectClass" );
+            return new LockableAttributeImpl( "objectClass" );
         }
 
         if ( changes == null )
@@ -746,7 +746,7 @@
         }
         else if ( existing == null )
         {
-            return new AttributeImpl( "objectClasses" );
+            return new LockableAttributeImpl( "objectClasses" );
         }
 
         switch ( modOp )
@@ -1215,7 +1215,7 @@
                     }
                     else
                     {
-                        attr = new AttributeImpl( change.getID() );
+                        attr = new LockableAttributeImpl( change.getID() );
                         NamingEnumeration values = change.getAll();
                         
                         while ( values.hasMoreElements() )
@@ -1296,7 +1296,7 @@
                     {
                         tmpEntry.remove( change.getID() );
                     }
-                    attr = new AttributeImpl( change.getID() );
+                    attr = new LockableAttributeImpl( change.getID() );
                     
                     NamingEnumeration values = change.getAll();
                     
@@ -1382,7 +1382,7 @@
 
             entry.remove( "objectClass" );
             
-            Attribute newOc = new AttributeImpl( "ObjectClass" );
+            Attribute newOc = new LockableAttributeImpl( "ObjectClass" );
             
             for ( int i = 0; i < objectClasses.size(); i++ )
             {
@@ -1433,7 +1433,7 @@
             if ( asBinary )
             {
                 Attribute attribute = entry.get( id );
-                Attribute binary = new AttributeImpl( id );
+                Attribute binary = new LockableAttributeImpl( id );
 
                 for ( int i = 0; i < attribute.size(); i++ )
                 {

Modified: directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java (original)
+++ directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java Mon Jan 22 15:25:45 2007
@@ -40,8 +40,8 @@
 import org.apache.directory.shared.ldap.filter.LeafNode;
 import org.apache.directory.shared.ldap.filter.PresenceNode;
 import org.apache.directory.shared.ldap.filter.SimpleNode;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.SubentriesControl;
@@ -296,7 +296,7 @@
      */
     public Attributes getSubentryAttributes( Name dn, Attributes entryAttrs ) throws NamingException
     {
-        Attributes subentryAttrs = new AttributesImpl();
+        Attributes subentryAttrs = new LockableAttributesImpl();
         Attribute objectClasses = entryAttrs.get( "objectClass" );
         Iterator list = subentryCache.nameIterator();
         while ( list.hasNext() )
@@ -317,7 +317,7 @@
                     operational = subentryAttrs.get( AC_SUBENTRIES );
                     if ( operational == null )
                     {
-                        operational = new AttributeImpl( AC_SUBENTRIES );
+                        operational = new LockableAttributeImpl( AC_SUBENTRIES );
                         subentryAttrs.put( operational );
                     }
                     operational.add( subentryDn.toString() );
@@ -327,7 +327,7 @@
                     operational = subentryAttrs.get( SCHEMA_SUBENTRY );
                     if ( operational == null )
                     {
-                        operational = new AttributeImpl( SCHEMA_SUBENTRY );
+                        operational = new LockableAttributeImpl( SCHEMA_SUBENTRY );
                         subentryAttrs.put( operational );
                     }
                     operational.add( subentryDn.toString() );
@@ -337,7 +337,7 @@
                     operational = subentryAttrs.get( COLLECTIVE_ATTRIBUTE_SUBENTRIES );
                     if ( operational == null )
                     {
-                        operational = new AttributeImpl( COLLECTIVE_ATTRIBUTE_SUBENTRIES );
+                        operational = new LockableAttributeImpl( COLLECTIVE_ATTRIBUTE_SUBENTRIES );
                         subentryAttrs.put( operational );
                     }
                     operational.add( subentryDn.toString() );
@@ -456,7 +456,7 @@
                         operational = entry.get( AC_SUBENTRIES );
                         if ( operational == null )
                         {
-                            operational = new AttributeImpl( AC_SUBENTRIES );
+                            operational = new LockableAttributeImpl( AC_SUBENTRIES );
                             entry.put( operational );
                         }
                         operational.add( subentryDn.toString() );
@@ -466,7 +466,7 @@
                         operational = entry.get( SCHEMA_SUBENTRY );
                         if ( operational == null )
                         {
-                            operational = new AttributeImpl( SCHEMA_SUBENTRY );
+                            operational = new LockableAttributeImpl( SCHEMA_SUBENTRY );
                             entry.put( operational );
                         }
                         operational.add( subentryDn.toString() );
@@ -476,7 +476,7 @@
                         operational = entry.get( COLLECTIVE_ATTRIBUTE_SUBENTRIES );
                         if ( operational == null )
                         {
-                            operational = new AttributeImpl( COLLECTIVE_ATTRIBUTE_SUBENTRIES );
+                            operational = new LockableAttributeImpl( COLLECTIVE_ATTRIBUTE_SUBENTRIES );
                             entry.put( operational );
                         }
                         operational.add( subentryDn.toString() );
@@ -633,7 +633,7 @@
                 for ( int ii = 0; ii < SUBENTRY_OPATTRS.length; ii++ )
                 {
                     int op = DirContext.ADD_ATTRIBUTE;
-                    Attribute opAttr = new AttributeImpl( SUBENTRY_OPATTRS[ii] );
+                    Attribute opAttr = new LockableAttributeImpl( SUBENTRY_OPATTRS[ii] );
                     opAttr.add( subentryDn );
                     modList.add( new ModificationItemImpl( op, opAttr ) );
                 }
@@ -891,7 +891,7 @@
             }
         }
         
-        Attributes attrs = new AttributesImpl();
+        Attributes attrs = new LockableAttributesImpl();
         attrs.put( ocFinalState );
         return getSubentryTypes( attrs );
     }
@@ -925,7 +925,7 @@
             }
         }
         
-        Attributes attrs = new AttributesImpl();
+        Attributes attrs = new LockableAttributesImpl();
         attrs.put( ocFinalState );
         return getSubentryTypes( attrs );
     }
@@ -1106,7 +1106,7 @@
             operational = ( Attribute ) entry.get( AC_SUBENTRIES ).clone();
             if ( operational == null )
             {
-                operational = new AttributeImpl( AC_SUBENTRIES );
+                operational = new LockableAttributeImpl( AC_SUBENTRIES );
                 operational.add( newName.toString() );
             }
             else
@@ -1121,7 +1121,7 @@
             operational = ( Attribute ) entry.get( SCHEMA_SUBENTRY ).clone();
             if ( operational == null )
             {
-                operational = new AttributeImpl( SCHEMA_SUBENTRY );
+                operational = new LockableAttributeImpl( SCHEMA_SUBENTRY );
                 operational.add( newName.toString() );
             }
             else
@@ -1136,7 +1136,7 @@
             operational = ( Attribute ) entry.get( COLLECTIVE_ATTRIBUTE_SUBENTRIES ).clone();
             if ( operational == null )
             {
-                operational = new AttributeImpl( COLLECTIVE_ATTRIBUTE_SUBENTRIES );
+                operational = new LockableAttributeImpl( COLLECTIVE_ATTRIBUTE_SUBENTRIES );
                 operational.add( newName.toString() );
             }
             else
@@ -1164,7 +1164,7 @@
     private Attributes getSubentryOperatationalAttributes( Name name, Subentry subentry )
         throws NamingException
     {
-        Attributes operational = new AttributesImpl();
+        Attributes operational = new LockableAttributesImpl();
         
         if ( subentry.isAccessControlSubentry() )
         {
@@ -1229,7 +1229,7 @@
 
             if ( opAttr != null && opAttr.contains( dn ) )
             {
-                Attribute attr = new AttributeImpl( SUBENTRY_OPATTRS[ii] );
+                Attribute attr = new LockableAttributeImpl( SUBENTRY_OPATTRS[ii] );
                 attr.add( dn );
                 modList.add( new ModificationItemImpl( DirContext.REMOVE_ATTRIBUTE, attr ) );
             }
@@ -1264,7 +1264,7 @@
         {
             int op = DirContext.REPLACE_ATTRIBUTE;
             String opAttrId = ( String ) opAttrIds.next();
-            Attribute result = new AttributeImpl( opAttrId );
+            Attribute result = new LockableAttributeImpl( opAttrId );
             Attribute opAttrAdditions = operational.get( opAttrId );
             Attribute opAttrInEntry = entry.get( opAttrId );
 

Modified: directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java (original)
+++ directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java Mon Jan 22 15:25:45 2007
@@ -47,7 +47,7 @@
 import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
 import org.apache.directory.shared.ldap.aci.ProtectedItem;
 import org.apache.directory.shared.ldap.filter.ExprNode;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
 
@@ -65,7 +65,7 @@
     private static final LdapDN ROOTDSE_NAME = new LdapDN();
     private static final LdapDN ENTRY_NAME;
     private static final Collection PROTECTED_ITEMS = new ArrayList();
-    private static final Attributes ENTRY = new AttributesImpl();
+    private static final Attributes ENTRY = new LockableAttributesImpl();
 
     static
     {

Modified: directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java (original)
+++ directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java Mon Jan 22 15:25:45 2007
@@ -38,8 +38,8 @@
 import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
 import org.apache.directory.shared.ldap.aci.ProtectedItem;
 import org.apache.directory.shared.ldap.aci.ProtectedItem.MaxValueCountItem;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 
 
 /**
@@ -54,8 +54,8 @@
     private static final Set EMPTY_SET = Collections.unmodifiableSet( new HashSet() );
 
     private static final Collection PROTECTED_ITEMS = new ArrayList();
-    private static final Attributes ENTRY = new AttributesImpl();
-    private static final Attributes FULL_ENTRY = new AttributesImpl();
+    private static final Attributes ENTRY = new LockableAttributesImpl();
+    private static final Attributes FULL_ENTRY = new LockableAttributesImpl();
 
     static
     {
@@ -65,7 +65,7 @@
 
         ENTRY.put( "testAttr", "1" );
 
-        Attribute attr = new AttributeImpl( "testAttr" );
+        Attribute attr = new LockableAttributeImpl( "testAttr" );
         attr.add( "1" );
         attr.add( "2" );
         FULL_ENTRY.put( attr );

Modified: directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java (original)
+++ directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java Mon Jan 22 15:25:45 2007
@@ -45,8 +45,8 @@
 import org.apache.directory.shared.ldap.aci.ProtectedItem;
 import org.apache.directory.shared.ldap.aci.ProtectedItem.MaxValueCountItem;
 import org.apache.directory.shared.ldap.aci.ProtectedItem.RestrictedByItem;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
 
@@ -201,7 +201,7 @@
     public void testAttributeValue() throws Exception
     {
         Collection attributes = new ArrayList();
-        attributes.add( new AttributeImpl( "attrA", "valueA" ) );
+        attributes.add( new LockableAttributeImpl( "attrA", "valueA" ) );
         Collection tuples = getTuples( new ProtectedItem.AttributeValue( attributes ) );
 
         // Test wrong scope
@@ -313,7 +313,7 @@
         attrTypes.add( "attrA" );
         Collection tuples = getTuples( new ProtectedItem.SelfValue( attrTypes ) );
 
-        Attributes entry = new AttributesImpl();
+        Attributes entry = new LockableAttributesImpl();
         entry.put( "attrA", USER_NAME.toNormName() );
 
         // Test wrong scope

Modified: directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java (original)
+++ directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java Mon Jan 22 15:25:45 2007
@@ -38,8 +38,8 @@
 import org.apache.directory.shared.ldap.aci.AuthenticationLevel;
 import org.apache.directory.shared.ldap.aci.ProtectedItem;
 import org.apache.directory.shared.ldap.aci.ProtectedItem.RestrictedByItem;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
 
 
 /**
@@ -54,7 +54,7 @@
     private static final Set EMPTY_SET = Collections.unmodifiableSet( new HashSet() );
 
     private static final Collection PROTECTED_ITEMS = new ArrayList();
-    private static final Attributes ENTRY = new AttributesImpl();
+    private static final Attributes ENTRY = new LockableAttributesImpl();
 
     static
     {
@@ -62,7 +62,7 @@
         mvcItems.add( new RestrictedByItem( "choice", "option" ) );
         PROTECTED_ITEMS.add( new ProtectedItem.RestrictedBy( mvcItems ) );
 
-        Attribute attr = new AttributeImpl( "option" );
+        Attribute attr = new LockableAttributeImpl( "option" );
         attr.add( "1" );
         attr.add( "2" );
 

Modified: directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializerTest.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializerTest.java (original)
+++ directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializerTest.java Mon Jan 22 15:25:45 2007
@@ -25,7 +25,7 @@
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
 
-import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
 import org.apache.directory.shared.ldap.util.ArrayUtils;
 
 import junit.framework.TestCase;
@@ -190,7 +190,7 @@
     
     public void testFullCycleNonBinaryAttribute() throws IOException
     {
-        AttributeImpl attr = new AttributeImpl( "testing" );
+        LockableAttributeImpl attr = new LockableAttributeImpl( "testing" );
         AttributeSerializer serializer = new AttributeSerializer();
         attr.add( "value0" );
         attr.add( "val1" );
@@ -204,7 +204,7 @@
     
     public void testFullCycleBinaryAttribute() throws IOException, NamingException
     {
-        AttributeImpl attr = new AttributeImpl( "testing" );
+        LockableAttributeImpl attr = new LockableAttributeImpl( "testing" );
         AttributeSerializer serializer = new AttributeSerializer();
         byte[] ba0 = new byte[2];
         ba0[0] = 7;
@@ -229,7 +229,7 @@
         long start = System.currentTimeMillis();
         for ( int ii = 0; ii < limit; ii++ )
         {
-            AttributeImpl attr = new AttributeImpl( "testing" );
+            LockableAttributeImpl attr = new LockableAttributeImpl( "testing" );
             AttributeSerializer serializer = new AttributeSerializer();
             attr.add( "value0" );
             attr.add( "val1" );



Mime
View raw message