You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2007/01/23 00:25:59 UTC
svn commit: r498848 [1/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...
Author: elecharny
Date: Mon Jan 22 15:25:45 2007
New Revision: 498848
URL: http://svn.apache.org/viewvc?view=rev&rev=498848
Log:
Renamed Attribute(s)Impl to LockableAttribute(s)Impl
Modified:
directory/apacheds/branches/1.0/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/SearchOpsITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/AbstractAuthorizationITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfigurationITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/event/EventServiceITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/CreateContextITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169ITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER758ITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER783ITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791ITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER826ITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/DestroyContextITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/ExtensibleObjectITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/ModifyContextITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/ReferralITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/operational/BinaryAttributeFilterITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/schema/IllegalModifyAddITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceITest.java
directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceITest.java
directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java
directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/configuration/AttributesPropertyEditor.java
directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/configuration/PartitionConfiguration.java
directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java
directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java
directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java
directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializer.java
directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializer.java
directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java
directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java
directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java
directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializerTest.java
directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializerTest.java
directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java
directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java
directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java
directory/apacheds/branches/1.0/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java
directory/apacheds/branches/1.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java
directory/apacheds/branches/1.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/DeletePrincipal.java
directory/apacheds/branches/1.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java
directory/apacheds/branches/1.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/PrincipalStateFactory.java
directory/apacheds/branches/1.0/protocol-dns/src/main/java/org/apache/directory/server/dns/store/operations/GetFlatRecord.java
directory/apacheds/branches/1.0/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java
directory/apacheds/branches/1.0/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/kerberos/KerberosTest.java
directory/apacheds/branches/1.0/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java
directory/apacheds/branches/1.0/server-ssl/src/test/java/org/apache/directory/server/ssl/LdapsITest.java
directory/apacheds/branches/1.0/server-tools/src/main/java/org/apache/directory/server/tools/CapacityTestCommand.java
directory/apacheds/branches/1.0/server-unit/src/test/java/org/apache/directory/server/AddITest.java
directory/apacheds/branches/1.0/server-unit/src/test/java/org/apache/directory/server/AddingEntriesWithSpecialCharactersInRDNTest.java
directory/apacheds/branches/1.0/server-unit/src/test/java/org/apache/directory/server/BinarySearchTest.java
directory/apacheds/branches/1.0/server-unit/src/test/java/org/apache/directory/server/DefaultAuthorizationTest.java
directory/apacheds/branches/1.0/server-unit/src/test/java/org/apache/directory/server/MatchingRuleCompareTest.java
directory/apacheds/branches/1.0/server-unit/src/test/java/org/apache/directory/server/MiscTest.java
directory/apacheds/branches/1.0/server-unit/src/test/java/org/apache/directory/server/ModifyAddTest.java
directory/apacheds/branches/1.0/server-unit/src/test/java/org/apache/directory/server/ModifyRdnTest.java
directory/apacheds/branches/1.0/server-unit/src/test/java/org/apache/directory/server/ModifyRemoveTest.java
directory/apacheds/branches/1.0/server-unit/src/test/java/org/apache/directory/server/ModifyReplaceITest.java
directory/apacheds/branches/1.0/server-unit/src/test/java/org/apache/directory/server/PersistentSearchTest.java
directory/apacheds/branches/1.0/server-unit/src/test/java/org/apache/directory/server/ReferralITest.java
directory/apacheds/branches/1.0/server-unit/src/test/java/org/apache/directory/server/ReferralTest.java
directory/apacheds/branches/1.0/server-unit/src/test/java/org/apache/directory/server/SearchTest.java
directory/apacheds/branches/1.0/server-unit/src/test/java/org/apache/directory/server/jndi/ServerContextFactoryTest.java
Modified: directory/apacheds/branches/1.0/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractPerformanceTest.java Mon Jan 22 15:25:45 2007
@@ -39,7 +39,7 @@
import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.shared.ldap.ldif.Entry;
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.name.LdapDN;
import org.apache.directory.shared.ldap.util.NamespaceTools;
@@ -141,7 +141,7 @@
indexedAttributes.add( "objectClass" );
// Build the root entry for the new partition
- Attributes attributes = new AttributesImpl( "objectClass", "top", true );
+ Attributes attributes = new LockableAttributesImpl( "objectClass", "top", true );
attributes.get( "objectClass" ).add( "organizationalUnit" );
attributes.put( "ou", "test" );
Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/SearchOpsITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/SearchOpsITest.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/SearchOpsITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/SearchOpsITest.java Mon Jan 22 15:25:45 2007
@@ -34,7 +34,7 @@
import org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration;
import org.apache.directory.server.core.schema.bootstrap.NisSchema;
import org.apache.directory.server.core.unit.AbstractAdminTestCase;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
/**
@@ -47,7 +47,7 @@
{
private DirContext addNisPosixGroup( String name, int gid ) throws NamingException
{
- Attributes attrs = new AttributesImpl( "objectClass", "top", true );
+ Attributes attrs = new LockableAttributesImpl( "objectClass", "top", true );
attrs.get( "objectClass" ).add( "posixGroup" );
attrs.put( "cn", name );
attrs.put( "gidNumber", String.valueOf( gid ) );
@@ -74,7 +74,7 @@
{
MutablePartitionConfiguration sysConf = new MutablePartitionConfiguration();
sysConf.setName( "system" );
- Attributes attrs = new AttributesImpl( "objectClass", "top", true );
+ Attributes attrs = new LockableAttributesImpl( "objectClass", "top", true );
attrs.get( "objectClass" ).add( "organizationalUnit" );
attrs.put( "ou", "system" );
sysConf.setContextEntry( attrs );
Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationITest.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationITest.java Mon Jan 22 15:25:45 2007
@@ -37,7 +37,7 @@
import org.apache.directory.server.core.unit.AbstractAdminTestCase;
import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.util.ArrayUtils;
@@ -347,7 +347,7 @@
assertTrue( attrs.get( "roomnumber" ).contains( "4612" ) );
// now modify the password for akarasulu
- AttributeImpl userPasswordAttribute = new AttributeImpl( "userPassword", "newpwd" );
+ LockableAttributeImpl userPasswordAttribute = new LockableAttributeImpl( "userPassword", "newpwd" );
ic.modifyAttributes( "uid=akarasulu,ou=users", new ModificationItemImpl[] {
new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, userPasswordAttribute ) } );
Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/AbstractAuthorizationITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/AbstractAuthorizationITest.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/AbstractAuthorizationITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/AbstractAuthorizationITest.java Mon Jan 22 15:25:45 2007
@@ -23,8 +23,8 @@
import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.core.subtree.SubentryService;
import org.apache.directory.server.core.unit.AbstractTestCase;
-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;
import javax.naming.NamingException;
@@ -110,8 +110,8 @@
public Name createGroup( String cn, String firstMemberDn ) throws NamingException
{
DirContext adminCtx = getContextAsAdmin();
- Attributes group = new AttributesImpl( "cn", cn, true );
- Attribute objectClass = new AttributeImpl( "objectClass" );
+ Attributes group = new LockableAttributesImpl( "cn", cn, true );
+ Attribute objectClass = new LockableAttributeImpl( "objectClass" );
group.put( objectClass );
objectClass.add( "top" );
objectClass.add( "groupOfUniqueNames" );
@@ -148,9 +148,9 @@
public Name createUser( String uid, String password ) throws NamingException
{
DirContext adminCtx = getContextAsAdmin();
- Attributes user = new AttributesImpl( "uid", uid, true );
+ Attributes user = new LockableAttributesImpl( "uid", uid, true );
user.put( "userPassword", password );
- Attribute objectClass = new AttributeImpl( "objectClass" );
+ Attribute objectClass = new LockableAttributeImpl( "objectClass" );
user.put( objectClass );
objectClass.add( "top" );
objectClass.add( "uidObject" );
@@ -172,8 +172,8 @@
public Name createGroup( String groupName ) throws NamingException
{
DirContext adminCtx = getContextAsAdmin();
- Attributes group = new AttributesImpl( true );
- Attribute objectClass = new AttributeImpl( "objectClass" );
+ Attributes group = new LockableAttributesImpl( true );
+ Attribute objectClass = new LockableAttributeImpl( "objectClass" );
group.put( objectClass );
objectClass.add( "top" );
objectClass.add( "groupOfUniqueNames" );
@@ -194,7 +194,7 @@
public void addUserToGroup( String userUid, String groupCn ) throws NamingException
{
DirContext adminCtx = getContextAsAdmin();
- Attributes changes = new AttributesImpl( "uniqueMember", "uid=" + userUid + ",ou=users,ou=system", true );
+ Attributes changes = new LockableAttributesImpl( "uniqueMember", "uid=" + userUid + ",ou=users,ou=system", true );
adminCtx.modifyAttributes( "cn=" + groupCn + ",ou=groups", DirContext.ADD_ATTRIBUTE, changes );
}
@@ -209,7 +209,7 @@
public void removeUserFromGroup( String userUid, String groupCn ) throws NamingException
{
DirContext adminCtx = getContextAsAdmin();
- Attributes changes = new AttributesImpl( "uniqueMember", "uid=" + userUid + ",ou=users,ou=system", true );
+ Attributes changes = new LockableAttributesImpl( "uniqueMember", "uid=" + userUid + ",ou=users,ou=system", true );
adminCtx.modifyAttributes( "cn=" + groupCn + ",ou=groups", DirContext.REMOVE_ATTRIBUTE, changes );
}
@@ -288,13 +288,13 @@
Attribute administrativeRole = ap.get( "administrativeRole" );
if ( administrativeRole == null || !administrativeRole.contains( SubentryService.AC_AREA ) )
{
- Attributes changes = new AttributesImpl( "administrativeRole", SubentryService.AC_AREA, true );
+ Attributes changes = new LockableAttributesImpl( "administrativeRole", SubentryService.AC_AREA, true );
adminCtx.modifyAttributes( "", DirContext.ADD_ATTRIBUTE, changes );
}
// now add the A/C subentry below ou=system
- Attributes subentry = new AttributesImpl( "cn", cn, true );
- Attribute objectClass = new AttributeImpl( "objectClass" );
+ Attributes subentry = new LockableAttributesImpl( "cn", cn, true );
+ Attribute objectClass = new LockableAttributeImpl( "objectClass" );
subentry.put( objectClass );
objectClass.add( "top" );
objectClass.add( "subentry" );
@@ -318,7 +318,7 @@
DirContext adminCtx = getContextAsAdmin();
// modify the entry relative to ou=system to include the aciItem
- Attributes changes = new AttributesImpl( "entryACI", aciItem, true );
+ Attributes changes = new LockableAttributesImpl( "entryACI", aciItem, true );
adminCtx.modifyAttributes( rdn, DirContext.ADD_ATTRIBUTE, changes );
}
@@ -334,7 +334,7 @@
DirContext adminCtx = getContextAsAdmin();
// modify the entry relative to ou=system to include the aciItem
- Attributes changes = new AttributesImpl( "subentryACI", aciItem, true );
+ Attributes changes = new LockableAttributesImpl( "subentryACI", aciItem, true );
adminCtx.modifyAttributes( "", DirContext.ADD_ATTRIBUTE, changes );
}
}
Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationITest.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationITest.java Mon Jan 22 15:25:45 2007
@@ -21,8 +21,8 @@
import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
-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;
import javax.naming.NamingException;
@@ -55,8 +55,8 @@
*/
public boolean checkCanAddEntryAs( String uid, String password, String entryRdn ) throws NamingException
{
- Attributes testEntry = new AttributesImpl( "ou", "testou", true );
- Attribute objectClass = new AttributeImpl( "objectClass" );
+ Attributes testEntry = new LockableAttributesImpl( "ou", "testou", true );
+ Attribute objectClass = new LockableAttributeImpl( "objectClass" );
testEntry.put( objectClass );
objectClass.add( "top" );
objectClass.add( "organizationalUnit" );
Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminITest.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminITest.java Mon Jan 22 15:25:45 2007
@@ -31,7 +31,7 @@
import org.apache.directory.server.core.unit.AbstractAdminTestCase;
import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
import org.apache.directory.shared.ldap.util.ArrayUtils;
@@ -89,7 +89,7 @@
*/
public void testModifyOnAdminByAdmin() throws NamingException
{
- Attributes attributes = new AttributesImpl();
+ Attributes attributes = new LockableAttributesImpl();
attributes.put( "userPassword", "replaced" );
sysRoot.modifyAttributes( "uid=admin", DirContext.REPLACE_ATTRIBUTE, attributes );
Attributes newAttrs = sysRoot.getAttributes( "uid=admin" );
Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminITest.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminITest.java Mon Jan 22 15:25:45 2007
@@ -31,7 +31,7 @@
import org.apache.directory.server.core.unit.AbstractNonAdminTestCase;
import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
/**
@@ -86,7 +86,7 @@
*/
public void testModifyOnAdminByNonAdmin()
{
- Attributes attributes = new AttributesImpl();
+ Attributes attributes = new LockableAttributesImpl();
attributes.put( "userPassword", "replaced" );
try
Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationITest.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationITest.java Mon Jan 22 15:25:45 2007
@@ -22,8 +22,8 @@
import org.apache.directory.server.core.jndi.ServerLdapContext;
import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
-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;
import javax.naming.NamingException;
@@ -63,8 +63,8 @@
throws NamingException
{
// create the entry with the telephoneNumber attribute to compare
- Attributes testEntry = new AttributesImpl( "ou", "testou", true );
- Attribute objectClass = new AttributeImpl( "objectClass" );
+ Attributes testEntry = new LockableAttributesImpl( "ou", "testou", true );
+ Attribute objectClass = new LockableAttributeImpl( "objectClass" );
testEntry.put( objectClass );
objectClass.add( "top" );
objectClass.add( "organizationalUnit" );
@@ -209,9 +209,9 @@
public void testPasswordCompare() throws NamingException
{
DirContext adminCtx = getContextAsAdmin();
- Attributes user = new AttributesImpl( "uid", "bob", true );
+ Attributes user = new LockableAttributesImpl( "uid", "bob", true );
user.put( "userPassword", "bobspassword".getBytes() );
- Attribute objectClass = new AttributeImpl( "objectClass" );
+ Attribute objectClass = new LockableAttributeImpl( "objectClass" );
user.put( objectClass );
objectClass.add( "top" );
objectClass.add( "person" );
Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationITest.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationITest.java Mon Jan 22 15:25:45 2007
@@ -21,8 +21,8 @@
import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
-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;
import javax.naming.NamingException;
@@ -60,8 +60,8 @@
*/
public boolean checkCanDeleteEntryAs( String uid, String password, String entryRdn ) throws NamingException
{
- Attributes testEntry = new AttributesImpl( "ou", "testou", true );
- Attribute objectClass = new AttributeImpl( "objectClass" );
+ Attributes testEntry = new LockableAttributesImpl( "ou", "testou", true );
+ Attribute objectClass = new LockableAttributeImpl( "objectClass" );
testEntry.put( objectClass );
objectClass.add( "top" );
objectClass.add( "organizationalUnit" );
Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationITest.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationITest.java Mon Jan 22 15:25:45 2007
@@ -21,8 +21,8 @@
import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
-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.LdapDN;
@@ -67,8 +67,8 @@
throws NamingException
{
// create the entry with the telephoneNumber attribute to modify
- Attributes testEntry = new AttributesImpl( "ou", "testou", true );
- Attribute objectClass = new AttributeImpl( "objectClass" );
+ Attributes testEntry = new LockableAttributesImpl( "ou", "testou", true );
+ Attribute objectClass = new LockableAttributeImpl( "objectClass" );
testEntry.put( objectClass );
objectClass.add( "top" );
objectClass.add( "organizationalUnit" );
@@ -123,8 +123,8 @@
throws NamingException
{
// create the entry with the telephoneNumber attribute to modify
- Attributes testEntry = new AttributesImpl( "ou", "testou", true );
- Attribute objectClass = new AttributeImpl( "objectClass" );
+ Attributes testEntry = new LockableAttributesImpl( "ou", "testou", true );
+ Attribute objectClass = new LockableAttributeImpl( "objectClass" );
testEntry.put( objectClass );
objectClass.add( "top" );
objectClass.add( "organizationalUnit" );
@@ -247,7 +247,7 @@
createUser( "billyd", "billyd" );
// create the password modification
- ModificationItemImpl[] mods = toItems( DirContext.REPLACE_ATTRIBUTE, new AttributesImpl( "userPassword",
+ ModificationItemImpl[] mods = toItems( DirContext.REPLACE_ATTRIBUTE, new LockableAttributesImpl( "userPassword",
"williams", true ) );
// try a modify operation which should fail without any ACI
@@ -280,7 +280,7 @@
// ----------------------------------------------------------------------------------
// create the add modifications
- ModificationItemImpl[] mods = toItems( DirContext.ADD_ATTRIBUTE, new AttributesImpl( "registeredAddress",
+ ModificationItemImpl[] mods = toItems( DirContext.ADD_ATTRIBUTE, new LockableAttributesImpl( "registeredAddress",
"100 Park Ave.", true ) );
// create the non-admin user
@@ -315,7 +315,7 @@
// ----------------------------------------------------------------------------------
// now let's test to see if we can perform a modify with a delete op
- mods = toItems( DirContext.REMOVE_ATTRIBUTE, new AttributesImpl( "telephoneNumber", "867-5309", true ) );
+ mods = toItems( DirContext.REMOVE_ATTRIBUTE, new LockableAttributesImpl( "telephoneNumber", "867-5309", true ) );
// make sure we cannot remove the telephone number from the test entry
assertFalse( checkCanModifyAs( "billyd", "billyd", "ou=testou", mods ) );
@@ -337,7 +337,7 @@
// ----------------------------------------------------------------------------------
// now let's test to see if we can perform a modify with a delete op
- mods = toItems( DirContext.REPLACE_ATTRIBUTE, new AttributesImpl( "telephoneNumber", "867-5309", true ) );
+ mods = toItems( DirContext.REPLACE_ATTRIBUTE, new LockableAttributesImpl( "telephoneNumber", "867-5309", true ) );
// make sure we cannot remove the telephone number from the test entry
assertFalse( checkCanModifyAs( "billyd", "billyd", "ou=testou", mods ) );
@@ -363,7 +363,7 @@
// Modify with Attribute Addition
// ----------------------------------------------------------------------------------
// create the add modifications
- Attributes changes = new AttributesImpl( "registeredAddress", "100 Park Ave.", true );
+ Attributes changes = new LockableAttributesImpl( "registeredAddress", "100 Park Ave.", true );
// try a modify operation which should fail without any ACI
assertFalse( checkCanModifyAs( "billyd", "billyd", "ou=testou", DirContext.ADD_ATTRIBUTE, changes ) );
@@ -385,7 +385,7 @@
// ----------------------------------------------------------------------------------
// now let's test to see if we can perform a modify with a delete op
- changes = new AttributesImpl( "telephoneNumber", "867-5309", true );
+ changes = new LockableAttributesImpl( "telephoneNumber", "867-5309", true );
// make sure we cannot remove the telephone number from the test entry
assertFalse( checkCanModifyAs( "billyd", "billyd", "ou=testou", DirContext.REMOVE_ATTRIBUTE, changes ) );
@@ -407,7 +407,7 @@
// ----------------------------------------------------------------------------------
// now let's test to see if we can perform a modify with a delete op
- changes = new AttributesImpl( "telephoneNumber", "867-5309", true );
+ changes = new LockableAttributesImpl( "telephoneNumber", "867-5309", true );
// make sure we cannot remove the telephone number from the test entry
assertFalse( checkCanModifyAs( "billyd", "billyd", "ou=testou", DirContext.REPLACE_ATTRIBUTE, changes ) );
Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationITest.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationITest.java Mon Jan 22 15:25:45 2007
@@ -21,8 +21,8 @@
import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
-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;
import javax.naming.NamingException;
@@ -57,8 +57,8 @@
public boolean checkCanRenameAs( String uid, String password, String entryRdn, String newRdn )
throws NamingException
{
- Attributes testEntry = new AttributesImpl( "ou", "testou", true );
- Attribute objectClass = new AttributeImpl( "objectClass" );
+ Attributes testEntry = new LockableAttributesImpl( "ou", "testou", true );
+ Attribute objectClass = new LockableAttributeImpl( "objectClass" );
testEntry.put( objectClass );
objectClass.add( "top" );
objectClass.add( "organizationalUnit" );
Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationITest.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationITest.java Mon Jan 22 15:25:45 2007
@@ -22,8 +22,8 @@
import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
-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;
import javax.naming.NamingException;
@@ -69,12 +69,12 @@
Attributes[] attributes = new Attributes[count];
for ( int ii = 0; ii < count; ii++ )
{
- attributes[ii] = new AttributesImpl();
- Attribute oc = new AttributeImpl( "objectClass" );
+ attributes[ii] = new LockableAttributesImpl();
+ Attribute oc = new LockableAttributeImpl( "objectClass" );
oc.add( "top" );
oc.add( "organizationalUnit" );
attributes[ii].put( oc );
- Attribute ou = new AttributeImpl( "ou" );
+ Attribute ou = new LockableAttributeImpl( "ou" );
ou.add( String.valueOf( ii ) );
ou.add( "testEntry" );
attributes[ii].put( ou );
Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceITest.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceITest.java Mon Jan 22 15:25:45 2007
@@ -21,8 +21,8 @@
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;
import javax.naming.NamingException;
@@ -47,8 +47,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 );
@@ -60,8 +60,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" );
@@ -75,8 +75,8 @@
public Attributes getTestSubentry2()
{
- 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" );
@@ -90,8 +90,8 @@
public Attributes getTestSubentry3()
{
- 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" );
@@ -105,7 +105,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[]
@@ -179,7 +179,7 @@
ModificationItemImpl[] items = new ModificationItemImpl[]
{ new ModificationItemImpl( DirContext.ADD_ATTRIBUTE,
- new AttributeImpl( "collectiveExclusions", "c-ou" ) ) };
+ new LockableAttributeImpl( "collectiveExclusions", "c-ou" ) ) };
super.sysRoot.modifyAttributes( "ou=services,ou=configuration", items );
// entry should not show the c-ou collective attribute anymore
@@ -234,7 +234,7 @@
// -------------------------------------------------------------------
items = new ModificationItemImpl[]
- { new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, new AttributeImpl( "collectiveExclusions",
+ { new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, new LockableAttributeImpl( "collectiveExclusions",
"excludeAllCollectiveAttributes" ) ) };
super.sysRoot.modifyAttributes( "ou=interceptors,ou=configuration", items );
@@ -286,7 +286,7 @@
ModificationItemImpl[] items = new ModificationItemImpl[]
{ new ModificationItemImpl( DirContext.ADD_ATTRIBUTE,
- new AttributeImpl( "collectiveExclusions", "c-ou" ) ) };
+ new LockableAttributeImpl( "collectiveExclusions", "c-ou" ) ) };
super.sysRoot.modifyAttributes( "ou=services,ou=configuration", items );
entries = getAllEntries();
@@ -344,7 +344,7 @@
// -------------------------------------------------------------------
items = new ModificationItemImpl[]
- { new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, new AttributeImpl( "collectiveExclusions",
+ { new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, new LockableAttributeImpl( "collectiveExclusions",
"excludeAllCollectiveAttributes" ) ) };
super.sysRoot.modifyAttributes( "ou=interceptors,ou=configuration", items );
entries = getAllEntries();
Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfigurationITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfigurationITest.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfigurationITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/configuration/DirectoryPartitionConfigurationITest.java Mon Jan 22 15:25:45 2007
@@ -35,7 +35,7 @@
import org.apache.directory.server.core.jndi.CoreContextFactory;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
import org.apache.directory.server.core.unit.AbstractAdminTestCase;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.LockableAttributesImpl;
/**
@@ -57,7 +57,7 @@
MutablePartitionConfiguration partitionCfg = new MutablePartitionConfiguration();
partitionCfg.setName( "removable" );
partitionCfg.setSuffix( "ou=removable" );
- Attributes ctxEntry = new AttributesImpl( true );
+ Attributes ctxEntry = new LockableAttributesImpl( true );
ctxEntry.put( "objectClass", "top" );
ctxEntry.put( "ou", "removable" );
partitionCfg.setContextEntry( ctxEntry );
Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/event/EventServiceITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/event/EventServiceITest.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/event/EventServiceITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/event/EventServiceITest.java Mon Jan 22 15:25:45 2007
@@ -21,8 +21,8 @@
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 javax.naming.NamingException;
import javax.naming.directory.Attribute;
@@ -51,8 +51,8 @@
TestListener listener = new TestListener();
EventDirContext ctx = ( EventDirContext ) super.sysRoot.lookup( "" );
ctx.addNamingListener( "", SearchControls.SUBTREE_SCOPE, listener );
- Attributes testEntry = new AttributesImpl( "ou", "testentry", true );
- Attribute objectClass = new AttributeImpl( "objectClass", "top" );
+ Attributes testEntry = new LockableAttributesImpl( "ou", "testentry", true );
+ Attribute objectClass = new LockableAttributeImpl( "objectClass", "top" );
objectClass.add( "organizationalUnit" );
testEntry.put( objectClass );
ctx.createSubcontext( "ou=testentry", testEntry );
@@ -88,8 +88,8 @@
TestListener listener = new TestListener();
EventDirContext ctx = ( EventDirContext ) super.sysRoot.lookup( "" );
ctx.addNamingListener( "", SearchControls.SUBTREE_SCOPE, listener );
- Attributes testEntry = new AttributesImpl( "ou", "testentry", true );
- Attribute objectClass = new AttributeImpl( "objectClass", "top" );
+ Attributes testEntry = new LockableAttributesImpl( "ou", "testentry", true );
+ Attribute objectClass = new LockableAttributeImpl( "objectClass", "top" );
objectClass.add( "organizationalUnit" );
testEntry.put( objectClass );
ctx.createSubcontext( "ou=testentry", testEntry );
Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceITest.java?view=diff&rev=498848&r1=498847&r2=498848
==============================================================================
--- directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceITest.java Mon Jan 22 15:25:45 2007
@@ -35,8 +35,8 @@
import org.apache.directory.shared.ldap.exception.LdapNameAlreadyBoundException;
import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
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;
@@ -56,8 +56,8 @@
private DirContext createSubContext( DirContext ctx, String type, String value ) throws NamingException
{
- Attributes attrs = new AttributesImpl( type, value );
- Attribute attr = new AttributeImpl( "ObjectClass" );
+ Attributes attrs = new LockableAttributesImpl( type, value );
+ Attribute attr = new LockableAttributeImpl( "ObjectClass" );
attr.add( "top" );
attr.add( "person" );
attr.add( "OrganizationalPerson" );
@@ -123,8 +123,8 @@
{
try
{
- Attributes attrs = new AttributesImpl( "ou", "users" );
- Attribute attr = new AttributeImpl( "ObjectClass" );
+ Attributes attrs = new LockableAttributesImpl( "ou", "users" );
+ Attribute attr = new LockableAttributeImpl( "ObjectClass" );
attr.add( "top" );
attr.add( "OrganizationalUnit" );
attrs.put( attr );
@@ -141,8 +141,8 @@
try
{
- Attributes attrs = new AttributesImpl( "ou", "uzerz" );
- Attribute attr = new AttributeImpl( "ObjectClass" );
+ Attributes attrs = new LockableAttributesImpl( "ou", "uzerz" );
+ Attribute attr = new LockableAttributeImpl( "ObjectClass" );
attr.add( "top" );
attr.add( "OrganizationalUnit" );
attrs.put( attr );
@@ -285,8 +285,8 @@
*/
public void testFailModifyNoSuchObject() throws NamingException
{
- Attributes attrs = new AttributesImpl( true );
- Attribute ou = new AttributeImpl( "ou" );
+ Attributes attrs = new LockableAttributesImpl( true );
+ Attribute ou = new LockableAttributeImpl( "ou" );
ou.add( "users" );
ou.add( "dummyValue" );
attrs.put( ou );
@@ -324,8 +324,8 @@
*/
public void testModifyControl() throws NamingException
{
- Attributes attrs = new AttributesImpl( true );
- Attribute attr = new AttributeImpl( "ou" );
+ Attributes attrs = new LockableAttributesImpl( true );
+ Attribute attr = new LockableAttributeImpl( "ou" );
attr.add( "dummyValue" );
attrs.put( attr );
sysRoot.modifyAttributes( "ou=users", DirContext.ADD_ATTRIBUTE, attrs );
@@ -333,7 +333,7 @@
assertTrue( ou.contains( "users" ) );
assertTrue( ou.contains( "dummyValue" ) );
- attr = new AttributeImpl( "ou" );
+ attr = new LockableAttributeImpl( "ou" );
attr.add( "another" );
ModificationItemImpl[] mods = new ModificationItemImpl[]
{ new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, attr ) };
@@ -430,8 +430,8 @@
*/
public void testFailAddOnAlias() throws NamingException
{
- Attributes attrs = new AttributesImpl( true );
- Attribute attr = new AttributeImpl( "objectClass" );
+ Attributes attrs = new LockableAttributesImpl( true );
+ Attribute attr = new LockableAttributeImpl( "objectClass" );
attr.add( "top" );
attr.add( "alias" );
attr.add( "person" );
Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/CreateContextITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/CreateContextITest.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/CreateContextITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/CreateContextITest.java Mon Jan 22 15:25:45 2007
@@ -31,8 +31,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;
/**
@@ -45,8 +45,8 @@
{
protected Attributes getPersonAttributes( String sn, String cn )
{
- Attributes attrs = new AttributesImpl();
- Attribute ocls = new AttributeImpl( "objectClass" );
+ Attributes attrs = new LockableAttributesImpl();
+ Attribute ocls = new LockableAttributeImpl( "objectClass" );
ocls.add( "top" );
ocls.add( "person" );
attrs.put( ocls );
@@ -98,8 +98,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 );
@@ -121,8 +121,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 );
@@ -144,8 +144,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 );
@@ -169,8 +169,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 );
@@ -200,8 +200,8 @@
/*
* create ou=testing00,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 );
@@ -223,8 +223,8 @@
/*
* fail on recreate attempt for ou=testing00,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 );
@@ -247,8 +247,8 @@
public void testCreateContextWithCompositeName() throws Exception
{
- Attributes attrs = new AttributesImpl( true );
- Attribute objclass = new AttributeImpl( "objectClass" );
+ Attributes attrs = new LockableAttributesImpl( true );
+ Attribute objclass = new LockableAttributeImpl( "objectClass" );
objclass.add( "top" );
objclass.add( "extensibleObject" );
attrs.put( objclass );
Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169ITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169ITest.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/DIRSERVER169ITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169ITest.java Mon Jan 22 15:25:45 2007
@@ -22,8 +22,8 @@
import org.apache.directory.server.core.unit.AbstractAdminTestCase;
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 javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
@@ -47,19 +47,19 @@
protected void setUp() throws Exception
{
super.setUp();
- Attributes people = new AttributesImpl( true );
- Attribute attribute = new AttributeImpl( "objectClass" );
+ Attributes people = new LockableAttributesImpl( true );
+ Attribute attribute = new LockableAttributeImpl( "objectClass" );
attribute.add( "top" );
attribute.add( "organizationalUnit" );
people.put( attribute );
people.put( "ou", "people" );
sysRoot.createSubcontext( "ou=people", people );
- Attributes user = new AttributesImpl( "uid", "bob" );
+ Attributes user = new LockableAttributesImpl( "uid", "bob" );
user.put( "cn", "Bob Hamilton" );
user.put( "userPassword", "bobspassword".getBytes( "UTF-8" ) );
- Attribute objectClass = new AttributeImpl( "objectClass" );
+ Attribute objectClass = new LockableAttributeImpl( "objectClass" );
user.put( objectClass );
objectClass.add( "top" );
objectClass.add( "person" );
Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER758ITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER758ITest.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/DIRSERVER758ITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER758ITest.java Mon Jan 22 15:25:45 2007
@@ -22,8 +22,8 @@
import org.apache.directory.server.core.unit.AbstractAdminTestCase;
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 javax.naming.directory.Attributes;
import javax.naming.directory.Attribute;
@@ -48,10 +48,10 @@
*/
public void testAddAttributesNotInObjectClasses() throws Exception
{
- Attributes attrs = new AttributesImpl( true );
- Attribute oc = new AttributeImpl( "ObjectClass", "top" );
- Attribute cn = new AttributeImpl( "cn", "kevin Spacey" );
- Attribute dc = new AttributeImpl( "dc", "ke" );
+ Attributes attrs = new LockableAttributesImpl( true );
+ Attribute oc = new LockableAttributeImpl( "ObjectClass", "top" );
+ Attribute cn = new LockableAttributeImpl( "cn", "kevin Spacey" );
+ Attribute dc = new LockableAttributeImpl( "dc", "ke" );
attrs.put( oc );
attrs.put( cn );
attrs.put( dc);
Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER783ITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER783ITest.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/DIRSERVER783ITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER783ITest.java Mon Jan 22 15:25:45 2007
@@ -14,8 +14,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;
/**
@@ -39,8 +39,8 @@
public void testAddAnotherValueToAnAttribute() throws NamingException
{
// create a person without sn
- Attributes attrs = new AttributesImpl();
- Attribute ocls = new AttributeImpl("objectClass");
+ Attributes attrs = new LockableAttributesImpl();
+ Attribute ocls = new LockableAttributeImpl("objectClass");
ocls.add("top");
ocls.add("person");
@@ -60,20 +60,20 @@
// Add the first value for description
String description1 = "an American singer-songwriter";
- Attribute firstDescr = new AttributeImpl("description", description1);
+ Attribute firstDescr = new LockableAttributeImpl("description", description1);
ModificationItemImpl modification = new ModificationItemImpl(DirContext.ADD_ATTRIBUTE, firstDescr);
ctx.modifyAttributes(rdn, new ModificationItemImpl[] { modification });
// Add a second value to description
String description2 = "Grammy award winning";
- Attribute otherDescr = new AttributeImpl("description", description2 );
+ Attribute otherDescr = new LockableAttributeImpl("description", description2 );
modification = new ModificationItemImpl(DirContext.ADD_ATTRIBUTE, otherDescr );
ctx.modifyAttributes(rdn, new ModificationItemImpl[] { modification } );
// Add a third value to description
String description3 = "MTV Music Award winning";
- Attribute thirdDescr = new AttributeImpl("description", description3 );
+ Attribute thirdDescr = new LockableAttributeImpl("description", description3 );
modification = new ModificationItemImpl(DirContext.ADD_ATTRIBUTE, thirdDescr );
ctx.modifyAttributes(rdn, new ModificationItemImpl[] { modification });
Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791ITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791ITest.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/DIRSERVER791ITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791ITest.java Mon Jan 22 15:25:45 2007
@@ -14,8 +14,8 @@
import javax.naming.directory.SchemaViolationException;
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;
/**
@@ -30,15 +30,15 @@
*/
protected Attributes getTestEntryAttributes() {
- Attributes attrs = new AttributesImpl();
- Attribute ocls = new AttributeImpl("objectClass");
+ Attributes attrs = new LockableAttributesImpl();
+ Attribute ocls = new LockableAttributeImpl("objectClass");
ocls.add("top");
ocls.add("person");
ocls.add("organizationalPerson");
ocls.add("inetOrgPerson");
attrs.put(ocls);
- Attribute cn = new AttributeImpl("cn");
+ Attribute cn = new LockableAttributeImpl("cn");
cn.add("test");
cn.add("aaa");
attrs.put(cn);
@@ -68,7 +68,7 @@
env.put( Context.PROVIDER_URL, "ou=system" );
DirContext ctx = new InitialDirContext( env );
- Attribute attr = new AttributeImpl("cn", "aaa");
+ Attribute attr = new LockableAttributeImpl("cn", "aaa");
ModificationItemImpl modification = new ModificationItemImpl( DirContext.REMOVE_ATTRIBUTE, attr );
ctx.modifyAttributes( "cn=test", new ModificationItemImpl[] { modification } );
@@ -92,7 +92,7 @@
DirContext ctx = new InitialDirContext( env );
- Attribute attr = new AttributeImpl("cn", "test");
+ Attribute attr = new LockableAttributeImpl("cn", "test");
ModificationItemImpl modification = new ModificationItemImpl(DirContext.REPLACE_ATTRIBUTE, attr);
ctx.modifyAttributes("cn=test", new ModificationItemImpl[] { modification });
@@ -118,7 +118,7 @@
DirContext ctx = new InitialDirContext( env );
- Attribute attr = new AttributeImpl( "objectclass", "test" );
+ Attribute attr = new LockableAttributeImpl( "objectclass", "test" );
ModificationItemImpl modification = new ModificationItemImpl(DirContext.ADD_ATTRIBUTE, attr);
try
@@ -163,7 +163,7 @@
DirContext ctx = new InitialDirContext( env );
- Attribute attr = new AttributeImpl("bootParameter", "test");
+ Attribute attr = new LockableAttributeImpl("bootParameter", "test");
ModificationItemImpl modification = new ModificationItemImpl(DirContext.ADD_ATTRIBUTE, attr);
try
Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER826ITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER826ITest.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/DIRSERVER826ITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER826ITest.java Mon Jan 22 15:25:45 2007
@@ -31,8 +31,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;
@@ -56,8 +56,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 );
@@ -79,8 +79,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 );
@@ -102,8 +102,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 );
@@ -128,8 +128,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 );
Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/DestroyContextITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/DestroyContextITest.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/DestroyContextITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/DestroyContextITest.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.LdapNameNotFoundException;
-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;
/**
@@ -46,8 +46,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 );
@@ -69,8 +69,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 );
@@ -92,8 +92,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 );
@@ -117,8 +117,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 );
Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/ExtensibleObjectITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/ExtensibleObjectITest.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/ExtensibleObjectITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/ExtensibleObjectITest.java Mon Jan 22 15:25:45 2007
@@ -25,8 +25,8 @@
import javax.naming.directory.DirContext;
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;
/**
* Tests the use of extensible objects.
@@ -38,8 +38,8 @@
{
public void testExtensibleObjectModify() throws Exception
{
- 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 );
@@ -58,11 +58,11 @@
assertTrue( attribute.contains( "top" ) );
assertTrue( attribute.contains( "organizationalUnit" ) );
- Attributes newattribs = new AttributesImpl( true );
- Attribute freeform = new AttributeImpl( "cn" );
+ Attributes newattribs = new LockableAttributesImpl( true );
+ Attribute freeform = new LockableAttributeImpl( "cn" );
freeform.add( "testing" );
newattribs.put( freeform );
- Attribute objectClass = new AttributeImpl( "objectClass" );
+ Attribute objectClass = new LockableAttributeImpl( "objectClass" );
objectClass.add( "top" );
objectClass.add( "extensibleObject" );
objectClass.add( "organizationalUnit" );
@@ -84,8 +84,8 @@
public void testExtensibleObjectAdd() throws Exception
{
- 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( "extensibleObject" );
attribute.add( "organizationalUnit" );
Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.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/MixedCaseITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java Mon Jan 22 15:25:45 2007
@@ -32,8 +32,8 @@
import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
import org.apache.directory.server.core.unit.AbstractAdminTestCase;
import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
-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 java.util.HashSet;
@@ -64,8 +64,8 @@
indexedAttributes.add( "uid" );
partition.setIndexedAttributes( indexedAttributes );
- Attributes attrs = new AttributesImpl( true );
- Attribute objectClass = new AttributeImpl( "objectClass" );
+ Attributes attrs = new LockableAttributesImpl( true );
+ Attribute objectClass = new LockableAttributeImpl( "objectClass" );
objectClass.add( "top" );
objectClass.add( "domain" );
objectClass.add( "extensibleObject" );
@@ -105,8 +105,8 @@
{
String dn = "ou=Test";
- 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 );
@@ -135,8 +135,8 @@
String dn = "ou=Test";
String description = "New Value";
- 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 );
@@ -147,7 +147,7 @@
assertNotNull( ctx );
ModificationItemImpl[] mods = new ModificationItemImpl[1];
- mods[0] = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, new AttributeImpl( "description", description ) );
+ mods[0] = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, new LockableAttributeImpl( "description", description ) );
sysRoot.modifyAttributes( dn, mods );
@@ -175,8 +175,8 @@
{
String dn = "ou=Test";
- 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/jndi/ModifyContextITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/ModifyContextITest.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/ModifyContextITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/ModifyContextITest.java Mon Jan 22 15:25:45 2007
@@ -26,8 +26,8 @@
import javax.naming.directory.DirContext;
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;
/**
@@ -48,8 +48,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 );
@@ -71,8 +71,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 );
@@ -94,8 +94,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 );
@@ -119,8 +119,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 );
@@ -147,7 +147,7 @@
public void testModifyOperation() throws NamingException
{
- Attributes attributes = new AttributesImpl( true );
+ Attributes attributes = new LockableAttributesImpl( true );
attributes.put( "ou", "testCases" );
sysRoot.modifyAttributes( "ou=testing00", DirContext.ADD_ATTRIBUTE, attributes );
attributes = null;
Modified: directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryITest.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/ObjStateFactoryITest.java (original)
+++ directory/apacheds/branches/1.0/core-unit/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryITest.java Mon Jan 22 15:25:45 2007
@@ -32,8 +32,8 @@
import javax.naming.spi.DirStateFactory;
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.util.ArrayUtils;
@@ -88,7 +88,7 @@
if ( inAttrs == null )
{
- outAttrs = new AttributesImpl( true );
+ outAttrs = new LockableAttributesImpl( true );
}
else
{
@@ -98,7 +98,7 @@
// Set up object class
if ( outAttrs.get( "objectclass" ) == null )
{
- Attribute oc = new AttributeImpl( "objectclass", "person" );
+ Attribute oc = new LockableAttributeImpl( "objectclass", "person" );
oc.add( "top" );
outAttrs.put( oc );
}