You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2011/04/01 02:09:03 UTC
svn commit: r1087516 [2/3] - in /directory/apacheds/trunk:
core-api/src/main/java/org/apache/directory/server/core/entry/
core-api/src/main/java/org/apache/directory/server/core/schema/
core-api/src/test/java/org/apache/directory/server/core/entry/ cor...
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/admin/AdministrativePointServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/admin/AdministrativePointServiceIT.java?rev=1087516&r1=1087515&r2=1087516&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/admin/AdministrativePointServiceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/admin/AdministrativePointServiceIT.java Fri Apr 1 00:09:01 2011
@@ -30,7 +30,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.server.core.integ.IntegrationUtils;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.DefaultModification;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Modification;
@@ -278,7 +278,7 @@ public class AdministrativePointServiceI
// Add another specific area
Modification modification = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE,
- new DefaultEntryAttribute( "administrativeRole", "accessControlSpecificArea" ) );
+ new DefaultAttribute( "administrativeRole", "accessControlSpecificArea" ) );
ModifyResponse response = connection.modify( "ou=caArea, ou=system", modification );
assertEquals( ResultCodeEnum.SUCCESS, response.getLdapResult().getResultCode() );
@@ -308,7 +308,7 @@ public class AdministrativePointServiceI
// Add another specific area
Modification modification = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE,
- new DefaultEntryAttribute( "administrativeRole", "accessControlInnerArea" ) );
+ new DefaultAttribute( "administrativeRole", "accessControlInnerArea" ) );
ModifyResponse response = connection.modify( "ou=caArea, ou=system", modification );
assertEquals( ResultCodeEnum.SUCCESS, response.getLdapResult().getResultCode() );
@@ -338,7 +338,7 @@ public class AdministrativePointServiceI
// Add another specific area
Modification modification = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE,
- new DefaultEntryAttribute( "administrativeRole", "collectiveAttributeInnerArea" ) );
+ new DefaultAttribute( "administrativeRole", "collectiveAttributeInnerArea" ) );
ModifyResponse response = connection.modify( "ou=caArea, ou=system", modification );
assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, response.getLdapResult().getResultCode() );
@@ -364,7 +364,7 @@ public class AdministrativePointServiceI
// Add another specific area
Modification modification = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE,
- new DefaultEntryAttribute( "administrativeRole", "collectiveAttributeSpecificArea" ) );
+ new DefaultAttribute( "administrativeRole", "collectiveAttributeSpecificArea" ) );
ModifyResponse response = connection.modify( "ou=caArea, ou=system", modification );
assertEquals( ResultCodeEnum.ATTRIBUTE_OR_VALUE_EXISTS, response.getLdapResult().getResultCode() );
@@ -391,7 +391,7 @@ public class AdministrativePointServiceI
// Add another specific area
Modification modification = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE,
- new DefaultEntryAttribute( "administrativeRole" ) );
+ new DefaultAttribute( "administrativeRole" ) );
ModifyResponse response = connection.modify( "ou=caArea, ou=system", modification );
assertEquals( ResultCodeEnum.SUCCESS, response.getLdapResult().getResultCode() );
@@ -421,7 +421,7 @@ public class AdministrativePointServiceI
// Add another specific area
Modification modification = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE,
- new DefaultEntryAttribute( "administrativeRole", "collectiveAttributeSpecificArea",
+ new DefaultAttribute( "administrativeRole", "collectiveAttributeSpecificArea",
"accessControlSpecificArea" ) );
ModifyResponse response = connection.modify( "ou=caArea, ou=system", modification );
@@ -452,7 +452,7 @@ public class AdministrativePointServiceI
// Add another specific area
Modification modification = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE,
- new DefaultEntryAttribute( "administrativeRole", "accessControlSpecificArea" ) );
+ new DefaultAttribute( "administrativeRole", "accessControlSpecificArea" ) );
ModifyResponse response = connection.modify( "ou=caArea, ou=system", modification );
assertEquals( ResultCodeEnum.SUCCESS, response.getLdapResult().getResultCode() );
@@ -484,7 +484,7 @@ public class AdministrativePointServiceI
// Add another specific area
Modification modification = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE,
- new DefaultEntryAttribute( "administrativeRole", "triggerExecutionSpecificArea" ) );
+ new DefaultAttribute( "administrativeRole", "triggerExecutionSpecificArea" ) );
ModifyResponse response = connection.modify( "ou=caArea, ou=system", modification );
assertEquals( ResultCodeEnum.NO_SUCH_ATTRIBUTE, response.getLdapResult().getResultCode() );
@@ -511,9 +511,9 @@ public class AdministrativePointServiceI
// Add another specific area
Modification modification1 = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE,
- new DefaultEntryAttribute( "administrativeRole", "triggerExecutionSpecificArea" ) );
+ new DefaultAttribute( "administrativeRole", "triggerExecutionSpecificArea" ) );
Modification modification2 = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE,
- new DefaultEntryAttribute( "administrativeRole", "triggerExecutionSpecificArea" ) );
+ new DefaultAttribute( "administrativeRole", "triggerExecutionSpecificArea" ) );
ModifyResponse response = connection.modify( "ou=caArea, ou=system", modification1, modification2,
modification1 );
@@ -547,7 +547,7 @@ public class AdministrativePointServiceI
// Try to modify it to an InnerArea
Modification modification = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE,
- new DefaultEntryAttribute( "administrativeRole", "collectiveAttributeSpecificArea" ) );
+ new DefaultAttribute( "administrativeRole", "collectiveAttributeSpecificArea" ) );
ModifyResponse response = connection.modify( "ou=caArea, ou=system", modification );
// Should fail
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java?rev=1087516&r1=1087515&r2=1087516&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java Fri Apr 1 00:09:01 2011
@@ -36,7 +36,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.DefaultModification;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Attribute;
@@ -136,7 +136,7 @@ public class AuthorizationServiceAsNonAd
assertTrue( Arrays.equals( akarasulu.get( "userPassword" ).getBytes(), readEntry.get( "userPassword" ).getBytes() ) );
- Attribute attribute = new DefaultEntryAttribute( "userPassword", "replaced" );
+ Attribute attribute = new DefaultAttribute( "userPassword", "replaced" );
List<Modification> mods = new ArrayList<Modification>();
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java?rev=1087516&r1=1087515&r2=1087516&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java Fri Apr 1 00:09:01 2011
@@ -38,7 +38,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.IntegrationUtils;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.DefaultModification;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Attribute;
@@ -271,7 +271,7 @@ public class ModifyAuthorizationIT exten
createUser( "billyd", "billyd" );
// create the password modification
- Modification[] mods = toItems( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultEntryAttribute(
+ Modification[] mods = toItems( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultAttribute(
"userPassword", "williams" ) );
// try a modify operation which should fail without any ACI
@@ -305,7 +305,7 @@ public class ModifyAuthorizationIT exten
// ----------------------------------------------------------------------------------
// create the add modifications
- Attribute attr = new DefaultEntryAttribute( "registeredAddress", "100 Park Ave." );
+ Attribute attr = new DefaultAttribute( "registeredAddress", "100 Park Ave." );
Modification[] mods = toItems( ModificationOperation.ADD_ATTRIBUTE, attr );
// create the non-admin user
@@ -343,7 +343,7 @@ public class ModifyAuthorizationIT exten
// ----------------------------------------------------------------------------------
// now let's test to see if we can perform a modify with a delete op
- mods = toItems( ModificationOperation.REMOVE_ATTRIBUTE, new DefaultEntryAttribute( "telephoneNumber",
+ mods = toItems( ModificationOperation.REMOVE_ATTRIBUTE, new DefaultAttribute( "telephoneNumber",
"867-5309" ) );
// make sure we cannot remove the telephone number from the test entry
@@ -369,7 +369,7 @@ public class ModifyAuthorizationIT exten
// ----------------------------------------------------------------------------------
// now let's test to see if we can perform a modify with a delete op
- mods = toItems( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultEntryAttribute( "telephoneNumber",
+ mods = toItems( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultAttribute( "telephoneNumber",
"867-5309" ) );
// make sure we cannot remove the telephone number from the test entry
@@ -398,7 +398,7 @@ public class ModifyAuthorizationIT exten
// Modify with Attribute Addition
// ----------------------------------------------------------------------------------
// create the add modifications
- Attribute changes = new DefaultEntryAttribute( "registeredAddress", "100 Park Ave." );
+ Attribute changes = new DefaultAttribute( "registeredAddress", "100 Park Ave." );
// try a modify operation which should fail without any ACI
assertFalse( checkCanModifyAs( "billyd", "billyd", "ou=testou", ModificationOperation.ADD_ATTRIBUTE, changes ) );
@@ -423,7 +423,7 @@ public class ModifyAuthorizationIT exten
// ----------------------------------------------------------------------------------
// now let's test to see if we can perform a modify with a delete op
- changes = new DefaultEntryAttribute( "telephoneNumber", "867-5309" );
+ changes = new DefaultAttribute( "telephoneNumber", "867-5309" );
// make sure we cannot remove the telephone number from the test entry
assertFalse( checkCanModifyAs( "billyd", "billyd", "ou=testou", ModificationOperation.REMOVE_ATTRIBUTE, changes ) );
@@ -448,7 +448,7 @@ public class ModifyAuthorizationIT exten
// ----------------------------------------------------------------------------------
// now let's test to see if we can perform a modify with a delete op
- changes = new DefaultEntryAttribute( "telephoneNumber", "867-5309" );
+ changes = new DefaultAttribute( "telephoneNumber", "867-5309" );
// make sure we cannot remove the telephone number from the test entry
assertFalse( checkCanModifyAs( "billyd", "billyd", "ou=testou", ModificationOperation.REPLACE_ATTRIBUTE,
@@ -479,7 +479,7 @@ public class ModifyAuthorizationIT exten
@Test
public void testGrantModifyByName() throws Exception
{
- Modification[] mods = toItems( ModificationOperation.ADD_ATTRIBUTE, new DefaultEntryAttribute(
+ Modification[] mods = toItems( ModificationOperation.ADD_ATTRIBUTE, new DefaultAttribute(
"telephoneNumber", "012-3456" ) );
// create the non-admin user
@@ -510,7 +510,7 @@ public class ModifyAuthorizationIT exten
@Test
public void testGrantModifyBySubtree() throws Exception
{
- Modification[] mods = toItems( ModificationOperation.ADD_ATTRIBUTE, new DefaultEntryAttribute(
+ Modification[] mods = toItems( ModificationOperation.ADD_ATTRIBUTE, new DefaultAttribute(
"telephoneNumber", "012-345678" ) );
// create the non-admin user
@@ -543,7 +543,7 @@ public class ModifyAuthorizationIT exten
@Test
public void testGrantModifyAllUsers() throws Exception
{
- Modification[] mods = toItems( ModificationOperation.ADD_ATTRIBUTE, new DefaultEntryAttribute(
+ Modification[] mods = toItems( ModificationOperation.ADD_ATTRIBUTE, new DefaultAttribute(
"telephoneNumber", "001-012345" ) );
// create the non-admin user
@@ -570,7 +570,7 @@ public class ModifyAuthorizationIT exten
public void testPresciptiveACIModification() throws Exception
{
- Modification[] mods = toItems( ModificationOperation.ADD_ATTRIBUTE, new DefaultEntryAttribute(
+ Modification[] mods = toItems( ModificationOperation.ADD_ATTRIBUTE, new DefaultAttribute(
"registeredAddress", "100 Park Ave." ) );
createUser( "billyd", "billyd" );
@@ -584,7 +584,7 @@ public class ModifyAuthorizationIT exten
assertTrue( checkCanModifyAs( "billyd", "billyd", "ou=testou", mods ) );
- mods = toItems( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultEntryAttribute( "registeredAddress",
+ mods = toItems( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultAttribute( "registeredAddress",
"200 Park Ave." ) );
changePresciptiveACI( "modifyACI", "{ " + " identificationTag \"modifyAci\", " + " precedence 14, "
@@ -613,12 +613,12 @@ public class ModifyAuthorizationIT exten
+ " maxValueCount { { type description, maxCount 1 } }" + " } ,"
+ " grantsAndDenials { grantRemove, grantAdd }" + " }" + " }" + " }" + "}" );
- Modification[] mods = toItems( ModificationOperation.ADD_ATTRIBUTE, new DefaultEntryAttribute( "description",
+ Modification[] mods = toItems( ModificationOperation.ADD_ATTRIBUTE, new DefaultAttribute( "description",
"description 1" ) );
assertTrue( checkCanModifyAs( "billyd", "billyd", "ou=testou", mods ) );
- Attribute attr = new DefaultEntryAttribute( "description" );
+ Attribute attr = new DefaultAttribute( "description" );
attr.add( "description 1" );
attr.add( "description 2" );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java?rev=1087516&r1=1087515&r2=1087516&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java Fri Apr 1 00:09:01 2011
@@ -34,7 +34,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.server.core.integ.IntegrationUtils;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.DefaultModification;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Attribute;
@@ -110,7 +110,7 @@ public class CollectiveAttributeServiceI
private void addAdministrativeRole( String role ) throws Exception
{
- Attribute attribute = new DefaultEntryAttribute( "administrativeRole", role );
+ Attribute attribute = new DefaultAttribute( "administrativeRole", role );
connection.modify( "ou=system", new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attribute ) );
}
@@ -226,7 +226,7 @@ public class CollectiveAttributeServiceI
// now modify entries included by the subentry to have collectiveExclusions
// -------------------------------------------------------------------
Modification modification = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE,
- new DefaultEntryAttribute( "collectiveExclusions", "c-ou" ) );
+ new DefaultAttribute( "collectiveExclusions", "c-ou" ) );
connection.modify( "ou=services,ou=configuration, ou=system", modification );
// entry should not show the c-ou collective attribute anymore
@@ -299,7 +299,7 @@ public class CollectiveAttributeServiceI
// -------------------------------------------------------------------
// now modify an entry to exclude all collective attributes
// -------------------------------------------------------------------
- modification = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultEntryAttribute(
+ modification = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultAttribute(
"collectiveExclusions", "excludeAllCollectiveAttributes" ) );
connection.modify( "ou=interceptors,ou=configuration, ou=system", modification );
@@ -408,7 +408,7 @@ public class CollectiveAttributeServiceI
// now modify entries included by the subentry to have collectiveExclusions
// -------------------------------------------------------------------
Modification modification = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE,
- new DefaultEntryAttribute( "collectiveExclusions", "c-ou" ) );
+ new DefaultAttribute( "collectiveExclusions", "c-ou" ) );
connection.modify( "ou=services,ou=configuration, ou=system", modification );
entries = getAllEntries();
@@ -467,7 +467,7 @@ public class CollectiveAttributeServiceI
// -------------------------------------------------------------------
// now modify an entry to exclude all collective attributes
// -------------------------------------------------------------------
- modification = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultEntryAttribute(
+ modification = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultAttribute(
"collectiveExclusions", "excludeAllCollectiveAttributes" ) );
connection.modify( "ou=interceptors,ou=configuration, ou=system", modification );
@@ -527,7 +527,7 @@ public class CollectiveAttributeServiceI
connection.add( entry );
ModifyResponse response = connection.modify( "cn=Ersin Er,ou=system", new DefaultModification(
- ModificationOperation.ADD_ATTRIBUTE, new DefaultEntryAttribute( "c-l", "Turkiye" ) ) );
+ ModificationOperation.ADD_ATTRIBUTE, new DefaultAttribute( "c-l", "Turkiye" ) ) );
assertEquals( ResultCodeEnum.OBJECT_CLASS_VIOLATION, response.getLdapResult().getResultCode() );
}
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java?rev=1087516&r1=1087515&r2=1087516&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java Fri Apr 1 00:09:01 2011
@@ -48,7 +48,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.DefaultModification;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Modification;
@@ -240,7 +240,7 @@ public class ModifyReferralIT extends Ab
try
{
- Attribute attr = new DefaultEntryAttribute( "Description", "this is a test" );
+ Attribute attr = new DefaultAttribute( "Description", "this is a test" );
Modification mod = new DefaultModification(
ModificationOperation.ADD_ATTRIBUTE, attr );
List<Modification> mods = new ArrayList<Modification>();
@@ -268,7 +268,7 @@ public class ModifyReferralIT extends Ab
try
{
- Attribute attr = new DefaultEntryAttribute( "Description", "this is a test" );
+ Attribute attr = new DefaultAttribute( "Description", "this is a test" );
Modification mod = new DefaultModification(
ModificationOperation.ADD_ATTRIBUTE, attr );
List<Modification> mods = new ArrayList<Modification>();
@@ -376,7 +376,7 @@ public class ModifyReferralIT extends Ab
try
{
- Attribute attr = new DefaultEntryAttribute( "Description", "this is a test" );
+ Attribute attr = new DefaultAttribute( "Description", "this is a test" );
Modification mod = new DefaultModification(
ModificationOperation.ADD_ATTRIBUTE, attr );
List<Modification> mods = new ArrayList<Modification>();
@@ -415,7 +415,7 @@ public class ModifyReferralIT extends Ab
{
CoreSession session = getService().getAdminSession();
- Attribute attr = new DefaultEntryAttribute( "Description", "This is a description" );
+ Attribute attr = new DefaultAttribute( "Description", "This is a description" );
Modification mod = new DefaultModification(
ModificationOperation.ADD_ATTRIBUTE, attr );
List<Modification> mods = new ArrayList<Modification>();
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java?rev=1087516&r1=1087515&r2=1087516&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java Fri Apr 1 00:09:01 2011
@@ -34,7 +34,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.server.core.integ.IntegrationUtils;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.DefaultModification;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Attribute;
@@ -250,7 +250,7 @@ public class OperationalAttributeService
assertNull( entry.get( "modifyTimestamp" ) );
Modification modifyOp = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE,
- new DefaultEntryAttribute( "description", "Singer Songwriter" ) );
+ new DefaultAttribute( "description", "Singer Songwriter" ) );
connection.modify( DN_KATE_BUSH, modifyOp );
@@ -272,7 +272,7 @@ public class OperationalAttributeService
{
// Add attribute description to entry
Modification modifyAddOp = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE,
- new DefaultEntryAttribute( "description", "an English singer, songwriter, musician" ) );
+ new DefaultAttribute( "description", "an English singer, songwriter, musician" ) );
connection.modify( DN_KATE_BUSH, modifyAddOp );
@@ -288,7 +288,7 @@ public class OperationalAttributeService
// Change value of attribute description
Modification modifyOp = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE,
- new DefaultEntryAttribute( "description", "one of England's most successful solo female performers" ) );
+ new DefaultAttribute( "description", "one of England's most successful solo female performers" ) );
connection.modify( DN_KATE_BUSH, modifyOp );
@@ -313,7 +313,7 @@ public class OperationalAttributeService
{
// Add attribute description to entry
Modification modifyOp = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE,
- new DefaultEntryAttribute( "modifiersName", "cn=Tori Amos,dc=example,dc=com" ) );
+ new DefaultAttribute( "modifiersName", "cn=Tori Amos,dc=example,dc=com" ) );
connection.modify( DN_KATE_BUSH, modifyOp );
}
@@ -328,7 +328,7 @@ public class OperationalAttributeService
public void testModifyOperationalAttributeRemove() throws Exception
{
Modification modifyOp = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE,
- new DefaultEntryAttribute( "creatorsName" ) );
+ new DefaultAttribute( "creatorsName" ) );
ModifyResponse response = connection.modify( DN_KATE_BUSH, modifyOp );
@@ -345,7 +345,7 @@ public class OperationalAttributeService
public void testModifyOperationalAttributeReplace() throws Exception
{
Modification modifyOp = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE,
- new DefaultEntryAttribute( "creatorsName", "cn=Tori Amos,dc=example,dc=com" ) );
+ new DefaultAttribute( "creatorsName", "cn=Tori Amos,dc=example,dc=com" ) );
ModifyResponse response = connection.modify( DN_KATE_BUSH, modifyOp );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/PasswordHashingInterceptorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/PasswordHashingInterceptorTest.java?rev=1087516&r1=1087515&r2=1087516&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/PasswordHashingInterceptorTest.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/PasswordHashingInterceptorTest.java Fri Apr 1 00:09:01 2011
@@ -37,7 +37,7 @@ import org.apache.directory.server.core.
import org.apache.directory.shared.ldap.model.constants.LdapSecurityConstants;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.DefaultModification;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Attribute;
@@ -91,7 +91,7 @@ public class PasswordHashingInterceptorT
AttributeType pwdAtType = getService().getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.USER_PASSWORD_AT );
- Attribute pwdAt = new DefaultEntryAttribute( pwdAtType );
+ Attribute pwdAt = new DefaultAttribute( pwdAtType );
pwdAt.add( plainPwd );
Modification mod = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, pwdAt );
@@ -141,7 +141,7 @@ public class PasswordHashingInterceptorT
AttributeType pwdAtType = getService().getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.USER_PASSWORD_AT );
- Attribute pwdAt = new DefaultEntryAttribute( pwdAtType );
+ Attribute pwdAt = new DefaultAttribute( pwdAtType );
pwdAt.add( hashedPwd );
Modification mod = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, pwdAt );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java?rev=1087516&r1=1087515&r2=1087516&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java Fri Apr 1 00:09:01 2011
@@ -29,7 +29,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.server.core.integ.IntegrationUtils;
import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.DefaultModification;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Attribute;
@@ -108,7 +108,7 @@ public class ModifyPerfIT extends Abstra
ModifyRequest modRequest = new ModifyRequestImpl();
modRequest.setName( dn );
Modification modification = new DefaultModification();
- Attribute attribute = new DefaultEntryAttribute( "sn" );
+ Attribute attribute = new DefaultAttribute( "sn" );
attribute.add( "test" + i );
Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java?rev=1087516&r1=1087515&r2=1087516&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java Fri Apr 1 00:09:01 2011
@@ -30,7 +30,7 @@ import javax.naming.NamingException;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.exception.LdapException;
@@ -198,7 +198,7 @@ class JavaLdapSupport
// Add all the class names this object can be cast to:
Class<?>[] classes = obj.getClass().getClasses();
AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( JCLASSNAMES_ATTR );
- Attribute javaClassNames = new DefaultEntryAttribute( attributeType, JCLASSNAMES_ATTR );
+ Attribute javaClassNames = new DefaultAttribute( attributeType, JCLASSNAMES_ATTR );
for ( int ii = 0; ii < classes.length; ii++ )
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java?rev=1087516&r1=1087515&r2=1087516&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java Fri Apr 1 00:09:01 2011
@@ -66,7 +66,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.Modification;
@@ -1317,7 +1317,7 @@ public class AdministrativePointIntercep
if ( modifiedAdminRole == null )
{
// Create the attribute
- modifiedAdminRole = new DefaultEntryAttribute( ADMINISTRATIVE_ROLE_AT );
+ modifiedAdminRole = new DefaultAttribute( ADMINISTRATIVE_ROLE_AT );
}
else
{
@@ -1348,7 +1348,7 @@ public class AdministrativePointIntercep
if ( modifiedAdminRole == null )
{
// Create the attribute
- modifiedAdminRole = new DefaultEntryAttribute( ADMINISTRATIVE_ROLE_AT, attribute.get() );
+ modifiedAdminRole = new DefaultAttribute( ADMINISTRATIVE_ROLE_AT, attribute.get() );
}
for ( Value<?> role : attribute )
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?rev=1087516&r1=1087515&r2=1087516&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java Fri Apr 1 00:09:01 2011
@@ -89,7 +89,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.constants.LdapSecurityConstants;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.entry.BinaryValue;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.DefaultModification;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Attribute;
@@ -384,21 +384,21 @@ public class AuthenticationInterceptor e
String pwdChangedTime = DateUtils.getGeneralizedTime();
if ( ( policyConfig.getPwdMinAge() > 0 ) || ( policyConfig.getPwdMaxAge() > 0 ) )
{
- Attribute pwdChangedTimeAt = new DefaultEntryAttribute( AT_PWD_CHANGED_TIME );
+ Attribute pwdChangedTimeAt = new DefaultAttribute( AT_PWD_CHANGED_TIME );
pwdChangedTimeAt.add( pwdChangedTime );
entry.add( pwdChangedTimeAt );
}
if ( policyConfig.isPwdMustChange() && addContext.getSession().isAnAdministrator() )
{
- Attribute pwdResetAt = new DefaultEntryAttribute( AT_PWD_RESET );
+ Attribute pwdResetAt = new DefaultAttribute( AT_PWD_RESET );
pwdResetAt.add( "TRUE" );
entry.add( pwdResetAt );
}
if ( policyConfig.getPwdInHistory() > 0 )
{
- Attribute pwdHistoryAt = new DefaultEntryAttribute( AT_PWD_HISTORY );
+ Attribute pwdHistoryAt = new DefaultAttribute( AT_PWD_HISTORY );
byte[] pwdHistoryVal = new PasswordHistory( pwdChangedTime, userPassword.getValue() ).getHistoryValue();
pwdHistoryAt.add( pwdHistoryVal );
entry.add( pwdHistoryAt );
@@ -653,13 +653,13 @@ public class AuthenticationInterceptor e
PasswordHistory newPwdHist = new PasswordHistory( pwdChangedTime, newPassword );
pwdHistSet.add( newPwdHist );
- pwdHistoryAt = new DefaultEntryAttribute( pwdHistoryAt.getAttributeType() );
+ pwdHistoryAt = new DefaultAttribute( pwdHistoryAt.getAttributeType() );
pwdHistoryAt.add( newPwdHist.getHistoryValue() );
pwdAddHistMod = new DefaultModification( ADD_ATTRIBUTE, pwdHistoryAt );
if ( pwdHistSet.size() > histSize )
{
- pwdHistoryAt = new DefaultEntryAttribute( pwdHistoryAt.getAttributeType() );
+ pwdHistoryAt = new DefaultAttribute( pwdHistoryAt.getAttributeType() );
PasswordHistory remPwdHist = ( PasswordHistory ) pwdHistSet.toArray()[histSize - 1];
pwdHistoryAt.add( remPwdHist.getHistoryValue() );
pwdRemHistMod = new DefaultModification( REMOVE_ATTRIBUTE, pwdHistoryAt );
@@ -672,7 +672,7 @@ public class AuthenticationInterceptor e
List<Modification> mods = new ArrayList<Modification>();
if ( ( policyConfig.getPwdMinAge() > 0 ) || ( policyConfig.getPwdMaxAge() > 0 ) )
{
- Attribute pwdChangedTimeAt = new DefaultEntryAttribute( AT_PWD_CHANGED_TIME );
+ Attribute pwdChangedTimeAt = new DefaultAttribute( AT_PWD_CHANGED_TIME );
pwdChangedTimeAt.add( pwdChangedTime );
Modification pwdChangedTimeMod = new DefaultModification( REPLACE_ATTRIBUTE, pwdChangedTimeAt );
mods.add( pwdChangedTimeMod );
@@ -691,7 +691,7 @@ public class AuthenticationInterceptor e
boolean removeFromPwdResetSet = false;
if ( policyConfig.isPwdMustChange() )
{
- Attribute pwdMustChangeAt = new DefaultEntryAttribute( AT_PWD_RESET );
+ Attribute pwdMustChangeAt = new DefaultAttribute( AT_PWD_RESET );
Modification pwdMustChangeMod = null;
if ( modifyContext.getSession().isAnAdministrator() )
@@ -965,7 +965,7 @@ public class AuthenticationInterceptor e
Attribute pwdFailTimeAt = userEntry.get( PWD_FAILURE_TIME_AT );
if ( pwdFailTimeAt == null )
{
- pwdFailTimeAt = new DefaultEntryAttribute( AT_PWD_FAILURE_TIME );
+ pwdFailTimeAt = new DefaultAttribute( AT_PWD_FAILURE_TIME );
}
else
{
@@ -983,7 +983,7 @@ public class AuthenticationInterceptor e
if ( policyConfig.isPwdLockout() && ( numFailures >= policyConfig.getPwdMaxFailure() ) )
{
- Attribute pwdAccountLockedTimeAt = new DefaultEntryAttribute( AT_PWD_ACCOUNT_LOCKED_TIME );
+ Attribute pwdAccountLockedTimeAt = new DefaultAttribute( AT_PWD_ACCOUNT_LOCKED_TIME );
pwdAccountLockedTimeAt.add( failureTime );
Modification pwdAccountLockedMod = new DefaultModification( ADD_ATTRIBUTE, pwdAccountLockedTimeAt );
mods.add( pwdAccountLockedMod );
@@ -1028,7 +1028,7 @@ public class AuthenticationInterceptor e
if ( policyConfig.getPwdMaxIdle() > 0 )
{
- Attribute pwdLastSuccesTimeAt = new DefaultEntryAttribute( AT_PWD_LAST_SUCCESS );
+ Attribute pwdLastSuccesTimeAt = new DefaultAttribute( AT_PWD_LAST_SUCCESS );
pwdLastSuccesTimeAt.add( DateUtils.getGeneralizedTime() );
Modification pwdLastSuccesTimeMod = new DefaultModification( REPLACE_ATTRIBUTE, pwdLastSuccesTimeAt );
mods.add( pwdLastSuccesTimeMod );
@@ -1066,7 +1066,7 @@ public class AuthenticationInterceptor e
}
else
{
- pwdGraceUseAttr = new DefaultEntryAttribute( AT_PWD_GRACE_USE_TIME );
+ pwdGraceUseAttr = new DefaultAttribute( AT_PWD_GRACE_USE_TIME );
}
pwdGraceUseAttr.add( DateUtils.getGeneralizedTime() );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java?rev=1087516&r1=1087515&r2=1087516&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java Fri Apr 1 00:09:01 2011
@@ -40,7 +40,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.partition.ByPassConstants;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.Modification;
@@ -458,7 +458,7 @@ public class CollectiveAttributeIntercep
*/
if ( entryColAttr == null )
{
- entryColAttr = new DefaultEntryAttribute( attrId, schemaManager
+ entryColAttr = new DefaultAttribute( attrId, schemaManager
.lookupAttributeTypeRegistry( attrId ) );
entry.put( entryColAttr );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=1087516&r1=1087515&r2=1087516&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Fri Apr 1 00:09:01 2011
@@ -46,7 +46,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.interceptor.context.SearchingOperationContext;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.DefaultModification;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Attribute;
@@ -300,7 +300,7 @@ public class OperationalAttributeInterce
if ( !modifierAtPresent )
{
// Inject the ModifiersName AT if it's not present
- Attribute attribute = new DefaultEntryAttribute( MODIFIERS_NAME_AT, getPrincipal()
+ Attribute attribute = new DefaultAttribute( MODIFIERS_NAME_AT, getPrincipal()
.getName() );
Modification modifiersName = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attribute );
@@ -311,7 +311,7 @@ public class OperationalAttributeInterce
if ( !modifiedTimeAtPresent )
{
// Inject the ModifyTimestamp AT if it's not present
- Attribute attribute = new DefaultEntryAttribute( MODIFY_TIMESTAMP_AT, DateUtils
+ Attribute attribute = new DefaultAttribute( MODIFY_TIMESTAMP_AT, DateUtils
.getGeneralizedTime() );
Modification timestamp = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attribute );
@@ -322,7 +322,7 @@ public class OperationalAttributeInterce
if ( !entryCsnAtPresent )
{
String csn = directoryService.getCSN().toString();
- Attribute attribute = new DefaultEntryAttribute( ENTRY_CSN_AT, csn );
+ Attribute attribute = new DefaultAttribute( ENTRY_CSN_AT, csn );
Modification updatedCsn = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attribute );
mods.add( updatedCsn );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=1087516&r1=1087515&r2=1087516&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Fri Apr 1 00:09:01 2011
@@ -65,7 +65,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.cursor.EmptyCursor;
import org.apache.directory.shared.ldap.model.cursor.SingletonCursor;
import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.DefaultModification;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Attribute;
@@ -339,7 +339,7 @@ public class DefaultPartitionNexus exten
if ( namingContexts == null )
{
- namingContexts = new DefaultEntryAttribute( schemaManager
+ namingContexts = new DefaultAttribute( schemaManager
.getAttributeType( SchemaConstants.NAMING_CONTEXTS_AT ), system.getSuffix().getName() );
rootDSE.put( namingContexts );
}
@@ -949,7 +949,7 @@ public class DefaultPartitionNexus exten
if ( namingContexts == null )
{
- namingContexts = new DefaultEntryAttribute( schemaManager
+ namingContexts = new DefaultAttribute( schemaManager
.lookupAttributeTypeRegistry( SchemaConstants.NAMING_CONTEXTS_AT ), partitionSuffix.getName() );
rootDSE.put( namingContexts );
}
@@ -1155,7 +1155,7 @@ public class DefaultPartitionNexus exten
{
Modification contextCsnMod = new DefaultModification();
contextCsnMod.setOperation( ModificationOperation.REPLACE_ATTRIBUTE );
- DefaultEntryAttribute contextCsnAt = new DefaultEntryAttribute( schemaManager
+ DefaultAttribute contextCsnAt = new DefaultAttribute( schemaManager
.lookupAttributeTypeRegistry( SchemaConstants.CONTEXT_CSN_AT ) );
contextCsnMod.setAttribute( contextCsnAt );
@@ -1163,7 +1163,7 @@ public class DefaultPartitionNexus exten
Modification timeStampMod = new DefaultModification();
timeStampMod.setOperation( ModificationOperation.REPLACE_ATTRIBUTE );
- DefaultEntryAttribute timeStampAt = new DefaultEntryAttribute( schemaManager
+ DefaultAttribute timeStampAt = new DefaultAttribute( schemaManager
.lookupAttributeTypeRegistry( SchemaConstants.MODIFY_TIMESTAMP_AT ) );
timeStampMod.setAttribute( timeStampAt );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java?rev=1087516&r1=1087515&r2=1087516&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java Fri Apr 1 00:09:01 2011
@@ -34,7 +34,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.DefaultModification;
import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.Modification;
@@ -272,7 +272,7 @@ public class ServerSystemPreferences ext
try
{
at = directoryService.getSchemaManager().lookupAttributeTypeRegistry( key );
- Attribute attr = new DefaultEntryAttribute( at );
+ Attribute attr = new DefaultAttribute( at );
Modification mi = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attr );
addDelta( mi );
}
@@ -346,7 +346,7 @@ public class ServerSystemPreferences ext
try
{
at = directoryService.getSchemaManager().lookupAttributeTypeRegistry( key );
- Attribute attr = new DefaultEntryAttribute( at, value );
+ Attribute attr = new DefaultAttribute( at, value );
Modification mi = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attr );
addDelta( mi );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/AttributesFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/AttributesFactory.java?rev=1087516&r1=1087515&r2=1087516&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/AttributesFactory.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/AttributesFactory.java Fri Apr 1 00:09:01 2011
@@ -26,7 +26,7 @@ import org.apache.directory.server.i18n.
import org.apache.directory.shared.ldap.model.constants.MetaSchemaConstants;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.exception.LdapException;
@@ -112,7 +112,7 @@ public class AttributesFactory
if ( dependencies != null && dependencies.length > 0 )
{
- Attribute attr = new DefaultEntryAttribute( schemaManager.getAttributeType( MetaSchemaConstants.M_DEPENDENCIES_AT ) );
+ Attribute attr = new DefaultAttribute( schemaManager.getAttributeType( MetaSchemaConstants.M_DEPENDENCIES_AT ) );
for ( String dependency:dependencies )
{
@@ -335,7 +335,7 @@ public class AttributesFactory
// handle the superior objectClasses
if ( objectClass.getSuperiorOids() != null && objectClass.getSuperiorOids().size() != 0 )
{
- Attribute attr = new DefaultEntryAttribute( schemaManager.getAttributeType( MetaSchemaConstants.M_SUP_OBJECT_CLASS_AT ) );
+ Attribute attr = new DefaultAttribute( schemaManager.getAttributeType( MetaSchemaConstants.M_SUP_OBJECT_CLASS_AT ) );
for ( String superior:objectClass.getSuperiorOids() )
{
@@ -348,7 +348,7 @@ public class AttributesFactory
// add the must list
if ( objectClass.getMustAttributeTypeOids() != null && objectClass.getMustAttributeTypeOids().size() != 0 )
{
- Attribute attr = new DefaultEntryAttribute( schemaManager.getAttributeType( MetaSchemaConstants.M_MUST_AT ) );
+ Attribute attr = new DefaultAttribute( schemaManager.getAttributeType( MetaSchemaConstants.M_MUST_AT ) );
for ( String mustOid :objectClass.getMustAttributeTypeOids() )
{
@@ -361,7 +361,7 @@ public class AttributesFactory
// add the may list
if ( objectClass.getMayAttributeTypeOids() != null && objectClass.getMayAttributeTypeOids().size() != 0 )
{
- Attribute attr = new DefaultEntryAttribute( schemaManager.getAttributeType( MetaSchemaConstants.M_MAY_AT ) );
+ Attribute attr = new DefaultAttribute( schemaManager.getAttributeType( MetaSchemaConstants.M_MAY_AT ) );
for ( String mayOid :objectClass.getMayAttributeTypeOids() )
{
@@ -395,7 +395,7 @@ public class AttributesFactory
return;
}
- Attribute attr = new DefaultEntryAttribute( schemaManager.getAttributeType( MetaSchemaConstants.M_NAME_AT ) );
+ Attribute attr = new DefaultAttribute( schemaManager.getAttributeType( MetaSchemaConstants.M_NAME_AT ) );
for ( String name:names )
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java?rev=1087516&r1=1087515&r2=1087516&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java Fri Apr 1 00:09:01 2011
@@ -27,7 +27,7 @@ import org.apache.directory.server.const
import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.exception.LdapException;
@@ -107,7 +107,7 @@ public class DefaultSchemaService implem
*/
private Attribute generateComparators() throws LdapException
{
- Attribute attr = new DefaultEntryAttribute(
+ Attribute attr = new DefaultAttribute(
getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.COMPARATORS_AT ) );
for ( LdapComparator<?> comparator : getSchemaManager().getComparatorRegistry() )
@@ -121,7 +121,7 @@ public class DefaultSchemaService implem
private Attribute generateNormalizers() throws LdapException
{
- Attribute attr = new DefaultEntryAttribute(
+ Attribute attr = new DefaultAttribute(
getSchemaManager().getAttributeType( SchemaConstants.NORMALIZERS_AT ) );
NormalizerRegistry nr = getSchemaManager().getNormalizerRegistry();
@@ -137,7 +137,7 @@ public class DefaultSchemaService implem
private Attribute generateSyntaxCheckers() throws LdapException
{
- Attribute attr = new DefaultEntryAttribute(
+ Attribute attr = new DefaultAttribute(
getSchemaManager().getAttributeType( SchemaConstants.SYNTAX_CHECKERS_AT ) );
for ( SyntaxChecker syntaxChecker : getSchemaManager().getSyntaxCheckerRegistry() )
@@ -151,7 +151,7 @@ public class DefaultSchemaService implem
private Attribute generateObjectClasses() throws LdapException
{
- Attribute attr = new DefaultEntryAttribute(
+ Attribute attr = new DefaultAttribute(
getSchemaManager().getAttributeType( SchemaConstants.OBJECT_CLASSES_AT ) );
for ( ObjectClass objectClass : getSchemaManager().getObjectClassRegistry() )
@@ -165,7 +165,7 @@ public class DefaultSchemaService implem
private Attribute generateAttributeTypes() throws LdapException
{
- Attribute attr = new DefaultEntryAttribute(
+ Attribute attr = new DefaultAttribute(
getSchemaManager().getAttributeType( SchemaConstants.ATTRIBUTE_TYPES_AT ) );
for ( AttributeType attributeType : getSchemaManager().getAttributeTypeRegistry() )
@@ -179,7 +179,7 @@ public class DefaultSchemaService implem
private Attribute generateMatchingRules() throws LdapException
{
- Attribute attr = new DefaultEntryAttribute(
+ Attribute attr = new DefaultAttribute(
getSchemaManager().getAttributeType( SchemaConstants.MATCHING_RULES_AT ) );
for ( MatchingRule matchingRule : getSchemaManager().getMatchingRuleRegistry() )
@@ -193,7 +193,7 @@ public class DefaultSchemaService implem
private Attribute generateMatchingRuleUses() throws LdapException
{
- Attribute attr = new DefaultEntryAttribute(
+ Attribute attr = new DefaultAttribute(
getSchemaManager().getAttributeType( SchemaConstants.MATCHING_RULE_USE_AT ) );
for ( MatchingRuleUse matchingRuleUse : getSchemaManager().getMatchingRuleUseRegistry() )
@@ -207,7 +207,7 @@ public class DefaultSchemaService implem
private Attribute generateSyntaxes() throws LdapException
{
- Attribute attr = new DefaultEntryAttribute(
+ Attribute attr = new DefaultAttribute(
getSchemaManager().getAttributeType( SchemaConstants.LDAP_SYNTAXES_AT ) );
for ( LdapSyntax syntax : getSchemaManager().getLdapSyntaxRegistry() )
@@ -221,7 +221,7 @@ public class DefaultSchemaService implem
private Attribute generateDitContextRules() throws LdapException
{
- Attribute attr = new DefaultEntryAttribute(
+ Attribute attr = new DefaultAttribute(
getSchemaManager().getAttributeType( SchemaConstants.DIT_CONTENT_RULES_AT ) );
for ( DITContentRule ditContentRule : getSchemaManager().getDITContentRuleRegistry() )
@@ -235,7 +235,7 @@ public class DefaultSchemaService implem
private Attribute generateDitStructureRules() throws LdapException
{
- Attribute attr = new DefaultEntryAttribute(
+ Attribute attr = new DefaultAttribute(
getSchemaManager().getAttributeType( SchemaConstants.DIT_STRUCTURE_RULES_AT ) );
for ( DITStructureRule ditStructureRule : getSchemaManager().getDITStructureRuleRegistry() )
@@ -249,7 +249,7 @@ public class DefaultSchemaService implem
private Attribute generateNameForms() throws LdapException
{
- Attribute attr = new DefaultEntryAttribute(
+ Attribute attr = new DefaultAttribute(
getSchemaManager().getAttributeType( SchemaConstants.NAME_FORMS_AT ) );
for ( NameForm nameForm : getSchemaManager().getNameFormRegistry() )
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=1087516&r1=1087515&r2=1087516&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Fri Apr 1 00:09:01 2011
@@ -55,7 +55,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.cursor.EmptyCursor;
import org.apache.directory.shared.ldap.model.cursor.SingletonCursor;
import org.apache.directory.shared.ldap.model.entry.BinaryValue;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.DefaultModification;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Attribute;
@@ -973,7 +973,7 @@ public class SchemaInterceptor extends B
if ( !entry.contains( type, atav.getNormValue() ) )
{
- entry.add( new DefaultEntryAttribute( type, atav.getUpValue() ) );
+ entry.add( new DefaultAttribute( type, atav.getUpValue() ) );
}
}
@@ -994,7 +994,7 @@ public class SchemaInterceptor extends B
AttributeType attributeType = attribute.getAttributeType();
// Create the new Attribute
- Attribute newAttribute = new DefaultEntryAttribute( attribute.getUpId(), attributeType );
+ Attribute newAttribute = new DefaultAttribute( attribute.getUpId(), attributeType );
for ( Value<?> value : attribute )
{
@@ -1378,7 +1378,7 @@ public class SchemaInterceptor extends B
// In this case, we create an new one, empty
if ( objectClassAttr == null )
{
- objectClassAttr = new DefaultEntryAttribute( OBJECT_CLASS_AT );
+ objectClassAttr = new DefaultAttribute( OBJECT_CLASS_AT );
}
List<ObjectClass> ocs = new ArrayList<ObjectClass>();
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=1087516&r1=1087515&r2=1087516&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Fri Apr 1 00:09:01 2011
@@ -55,7 +55,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.DefaultModification;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Attribute;
@@ -528,7 +528,7 @@ public class SubentryInterceptor extends
for ( AttributeType operationalAttribute : SUBENTRY_OPATTRS )
{
ModificationOperation op = ModificationOperation.ADD_ATTRIBUTE;
- Attribute opAttr = new DefaultEntryAttribute( operationalAttribute );
+ Attribute opAttr = new DefaultAttribute( operationalAttribute );
opAttr.add( subentryDn.getNormName() );
modifications.add( new DefaultModification( op, opAttr ) );
}
@@ -599,7 +599,7 @@ public class SubentryInterceptor extends
if ( operational == null )
{
- operational = new DefaultEntryAttribute( attributeType, newDnStr );
+ operational = new DefaultAttribute( attributeType, newDnStr );
}
else
{
@@ -640,25 +640,25 @@ public class SubentryInterceptor extends
if ( subentry.isAccessControlAdminRole() )
{
- Attribute accessControlSubentries = new DefaultEntryAttribute( ACCESS_CONTROL_SUBENTRIES_AT, dn.getNormName() );
+ Attribute accessControlSubentries = new DefaultAttribute( ACCESS_CONTROL_SUBENTRIES_AT, dn.getNormName() );
attributes.add( accessControlSubentries );
}
if ( subentry.isSchemaAdminRole() )
{
- Attribute subschemaSubentry = new DefaultEntryAttribute( SUBSCHEMA_SUBENTRY_AT, dn.getNormName() );
+ Attribute subschemaSubentry = new DefaultAttribute( SUBSCHEMA_SUBENTRY_AT, dn.getNormName() );
attributes.add( subschemaSubentry );
}
if ( subentry.isCollectiveAdminRole() )
{
- Attribute collectiveAttributeSubentries = new DefaultEntryAttribute( COLLECTIVE_ATTRIBUTE_SUBENTRIES_AT, dn.getNormName() );
+ Attribute collectiveAttributeSubentries = new DefaultAttribute( COLLECTIVE_ATTRIBUTE_SUBENTRIES_AT, dn.getNormName() );
attributes.add( collectiveAttributeSubentries );
}
if ( subentry.isTriggersAdminRole() )
{
- Attribute tiggerExecutionSubentries = new DefaultEntryAttribute( TRIGGER_EXECUTION_SUBENTRIES_AT, dn.getNormName() );
+ Attribute tiggerExecutionSubentries = new DefaultAttribute( TRIGGER_EXECUTION_SUBENTRIES_AT, dn.getNormName() );
attributes.add( tiggerExecutionSubentries );
}
@@ -690,7 +690,7 @@ public class SubentryInterceptor extends
if ( ( opAttr != null ) && opAttr.contains( dn ) )
{
- Attribute attr = new DefaultEntryAttribute( operationalAttribute, dn );
+ Attribute attr = new DefaultAttribute( operationalAttribute, dn );
modifications.add( new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, attr ) );
}
}
@@ -784,7 +784,7 @@ public class SubentryInterceptor extends
for ( AttributeType operationalAttribute : SUBENTRY_OPATTRS )
{
ModificationOperation op = ModificationOperation.ADD_ATTRIBUTE;
- Attribute opAttr = new DefaultEntryAttribute( operationalAttribute );
+ Attribute opAttr = new DefaultAttribute( operationalAttribute );
opAttr.add( subentryDn.getNormName() );
modList.add( new DefaultModification( op, opAttr ) );
}
@@ -804,7 +804,7 @@ public class SubentryInterceptor extends
if ( operational == null )
{
- operational = new DefaultEntryAttribute( opAttr );
+ operational = new DefaultAttribute( opAttr );
entry.put( operational );
}
@@ -1494,7 +1494,7 @@ public class SubentryInterceptor extends
if ( operational == null )
{
- operational = new DefaultEntryAttribute( ACCESS_CONTROL_SUBENTRIES_AT );
+ operational = new DefaultAttribute( ACCESS_CONTROL_SUBENTRIES_AT );
subentryAttrs.put( operational );
}
@@ -1507,7 +1507,7 @@ public class SubentryInterceptor extends
if ( operational == null )
{
- operational = new DefaultEntryAttribute( SUBSCHEMA_SUBENTRY_AT );
+ operational = new DefaultAttribute( SUBSCHEMA_SUBENTRY_AT );
subentryAttrs.put( operational );
}
@@ -1520,7 +1520,7 @@ public class SubentryInterceptor extends
if ( operational == null )
{
- operational = new DefaultEntryAttribute( COLLECTIVE_ATTRIBUTE_SUBENTRIES_AT );
+ operational = new DefaultAttribute( COLLECTIVE_ATTRIBUTE_SUBENTRIES_AT );
subentryAttrs.put( operational );
}
@@ -1533,7 +1533,7 @@ public class SubentryInterceptor extends
if ( operational == null )
{
- operational = new DefaultEntryAttribute( TRIGGER_EXECUTION_SUBENTRIES_AT );
+ operational = new DefaultAttribute( TRIGGER_EXECUTION_SUBENTRIES_AT );
subentryAttrs.put( operational );
}
Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java?rev=1087516&r1=1087515&r2=1087516&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java Fri Apr 1 00:09:01 2011
@@ -46,7 +46,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.aci.protectedItem.SelfValueItem;
import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.StringValue;
@@ -259,7 +259,7 @@ public class RelatedProtectedItemFilterT
public void testAttributeValue() throws Exception
{
Set<Attribute> attributes = new HashSet<Attribute>();
- attributes.add( new DefaultEntryAttribute( "cn", CN_AT, "valueA" ) );
+ attributes.add( new DefaultAttribute( "cn", CN_AT, "valueA" ) );
Collection<ACITuple> tuples = getTuples( new AttributeValueItem( attributes ) );
// Test wrong scope
Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java?rev=1087516&r1=1087515&r2=1087516&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java Fri Apr 1 00:09:01 2011
@@ -25,7 +25,7 @@ import static org.junit.Assert.fail;
import com.mycila.junit.concurrent.Concurrency;
import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.StringValue;
import org.apache.directory.shared.ldap.model.filter.EqualityNode;
@@ -110,7 +110,7 @@ public class RefinementEvaluatorTest
{
try
{
- assertFalse( evaluator.evaluate( null, new DefaultEntryAttribute( OBJECT_CLASS_AT ) ) );
+ assertFalse( evaluator.evaluate( null, new DefaultAttribute( OBJECT_CLASS_AT ) ) );
fail( "should never get here due to an IAE" );
}
catch ( IllegalArgumentException iae )
@@ -129,7 +129,7 @@ public class RefinementEvaluatorTest
try
{
assertFalse( evaluator.evaluate( new EqualityNode( (String)null, new StringValue( "" ) ),
- new DefaultEntryAttribute( "cn", CN_AT ) ) );
+ new DefaultAttribute( "cn", CN_AT ) ) );
fail( "should never get here due to an IAE" );
}
catch ( IllegalArgumentException iae )
@@ -144,17 +144,17 @@ public class RefinementEvaluatorTest
Attribute objectClasses = null;
// positive test
- objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "person" );
+ objectClasses = new DefaultAttribute( OBJECT_CLASS_AT, "person" );
assertTrue( evaluator.evaluate( new EqualityNode( OBJECT_CLASS_AT, new StringValue( "person" ) ), objectClasses ) );
- objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "person", "blah" );
+ objectClasses = new DefaultAttribute( OBJECT_CLASS_AT, "person", "blah" );
assertTrue( evaluator.evaluate( new EqualityNode( OBJECT_CLASS_AT, new StringValue( "person" ) ), objectClasses ) );
// negative tests
- objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "person" );
+ objectClasses = new DefaultAttribute( OBJECT_CLASS_AT, "person" );
assertFalse( evaluator.evaluate( new EqualityNode( OBJECT_CLASS_AT, new StringValue( "blah" ) ), objectClasses ) );
- objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "blah" );
+ objectClasses = new DefaultAttribute( OBJECT_CLASS_AT, "blah" );
assertFalse( evaluator.evaluate( new EqualityNode( OBJECT_CLASS_AT, new StringValue( "person" ) ), objectClasses ) );
}
@@ -162,19 +162,19 @@ public class RefinementEvaluatorTest
@Test
public void testMatchByOID() throws Exception
{
- Attribute objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "person" );
+ Attribute objectClasses = new DefaultAttribute( OBJECT_CLASS_AT, "person" );
// positive test
assertTrue( evaluator.evaluate( new EqualityNode( OBJECT_CLASS_AT, new StringValue( "2.5.6.6" ) ), objectClasses ) );
- objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "person", "blah" );
+ objectClasses = new DefaultAttribute( OBJECT_CLASS_AT, "person", "blah" );
assertTrue( evaluator.evaluate( new EqualityNode( OBJECT_CLASS_AT, new StringValue( "2.5.6.6" ) ), objectClasses ) );
// negative tests
- objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "person" );
+ objectClasses = new DefaultAttribute( OBJECT_CLASS_AT, "person" );
assertFalse( evaluator.evaluate( new EqualityNode( OBJECT_CLASS_AT, new StringValue( "2.5.6.5" ) ), objectClasses ) );
- objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "blah" );
+ objectClasses = new DefaultAttribute( OBJECT_CLASS_AT, "blah" );
assertFalse( evaluator.evaluate( new EqualityNode( OBJECT_CLASS_AT, new StringValue( "2.5.6.5" ) ), objectClasses ) );
}
@@ -183,17 +183,17 @@ public class RefinementEvaluatorTest
public void testComplexOrRefinement() throws Exception
{
ExprNode refinement = null;
- Attribute objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "person" );
+ Attribute objectClasses = new DefaultAttribute( OBJECT_CLASS_AT, "person" );
String refStr = "(|(objectClass=person)(objectClass=organizationalUnit))";
refinement = FilterParser.parse( schemaManager, refStr );
assertTrue( evaluator.evaluate( refinement, objectClasses ) );
- objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "organizationalUnit" );
+ objectClasses = new DefaultAttribute( OBJECT_CLASS_AT, "organizationalUnit" );
assertTrue( evaluator.evaluate( refinement, objectClasses ) );
- objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "domain" );
+ objectClasses = new DefaultAttribute( OBJECT_CLASS_AT, "domain" );
assertFalse( evaluator.evaluate( refinement, objectClasses ) );
}
@@ -202,7 +202,7 @@ public class RefinementEvaluatorTest
public void testComplexAndRefinement() throws Exception
{
ExprNode refinement = null;
- Attribute objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "person" );
+ Attribute objectClasses = new DefaultAttribute( OBJECT_CLASS_AT, "person" );
objectClasses.add( "organizationalUnit" );
String refStr = "(&(objectClass=person)(objectClass=organizationalUnit))";
@@ -210,13 +210,13 @@ public class RefinementEvaluatorTest
assertTrue( evaluator.evaluate( refinement, objectClasses ) );
- objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "organizationalUnit" );
+ objectClasses = new DefaultAttribute( OBJECT_CLASS_AT, "organizationalUnit" );
assertFalse( evaluator.evaluate( refinement, objectClasses ) );
- objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "person" );
+ objectClasses = new DefaultAttribute( OBJECT_CLASS_AT, "person" );
assertFalse( evaluator.evaluate( refinement, objectClasses ) );
- objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "domain" );
+ objectClasses = new DefaultAttribute( OBJECT_CLASS_AT, "domain" );
assertFalse( evaluator.evaluate( refinement, objectClasses ) );
}
@@ -225,22 +225,22 @@ public class RefinementEvaluatorTest
public void testComplexNotRefinement() throws Exception
{
ExprNode refinement = null;
- Attribute objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "person" );
+ Attribute objectClasses = new DefaultAttribute( OBJECT_CLASS_AT, "person" );
String refStr = "(!(objectClass=person))";
refinement = FilterParser.parse( schemaManager, refStr );
assertFalse( evaluator.evaluate( refinement, objectClasses ) );
- objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "organizationalUnit" );
+ objectClasses = new DefaultAttribute( OBJECT_CLASS_AT, "organizationalUnit" );
assertTrue( evaluator.evaluate( refinement, objectClasses ) );
- objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "domain" );
+ objectClasses = new DefaultAttribute( OBJECT_CLASS_AT, "domain" );
assertTrue( evaluator.evaluate( refinement, objectClasses ) );
try
{
- assertFalse( evaluator.evaluate( new NotNode(), new DefaultEntryAttribute( OBJECT_CLASS_AT ) ) );
+ assertFalse( evaluator.evaluate( new NotNode(), new DefaultAttribute( OBJECT_CLASS_AT ) ) );
fail( "should never get here due to an IAE" );
}
catch ( IllegalArgumentException iae )
Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java?rev=1087516&r1=1087515&r2=1087516&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java Fri Apr 1 00:09:01 2011
@@ -27,7 +27,7 @@ import static org.junit.Assert.fail;
import com.mycila.junit.concurrent.Concurrency;
import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.StringValue;
import org.apache.directory.shared.ldap.model.exception.LdapException;
@@ -148,7 +148,7 @@ public class RefinementLeafEvaluatorTest
try
{
- objectClasses = new DefaultEntryAttribute( "cn", OBJECT_CLASS_AT.getName() );
+ objectClasses = new DefaultAttribute( "cn", OBJECT_CLASS_AT.getName() );
assertFalse( evaluator.evaluate( new EqualityNode( CN_AT, new StringValue( "" ) ), objectClasses ) );
fail( "should never get here due to an IAE" );
}
@@ -163,19 +163,19 @@ public class RefinementLeafEvaluatorTest
public void testMatchByName() throws Exception
{
// positive test
- Attribute objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "person" );
+ Attribute objectClasses = new DefaultAttribute( OBJECT_CLASS_AT, "person" );
assertTrue( evaluator.evaluate( new EqualityNode( OBJECT_CLASS_AT, new StringValue( "person" ) ), objectClasses ) );
- objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT );
+ objectClasses = new DefaultAttribute( OBJECT_CLASS_AT );
objectClasses.add( "person" );
objectClasses.add( "blah" );
assertTrue( evaluator.evaluate( new EqualityNode( OBJECT_CLASS_AT, new StringValue( "person" ) ), objectClasses ) );
// negative tests
- objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "person" );
+ objectClasses = new DefaultAttribute( OBJECT_CLASS_AT, "person" );
assertFalse( evaluator.evaluate( new EqualityNode( OBJECT_CLASS_AT, new StringValue( "blah" ) ), objectClasses ) );
- objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "blah" );
+ objectClasses = new DefaultAttribute( OBJECT_CLASS_AT, "blah" );
assertFalse( evaluator.evaluate( new EqualityNode( OBJECT_CLASS_AT, new StringValue( "person" ) ), objectClasses ) );
}
@@ -183,21 +183,21 @@ public class RefinementLeafEvaluatorTest
@Test
public void testMatchByOID() throws Exception
{
- Attribute objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "person" );
+ Attribute objectClasses = new DefaultAttribute( OBJECT_CLASS_AT, "person" );
// positive test
assertTrue( evaluator.evaluate( new EqualityNode( OBJECT_CLASS_AT, new StringValue( "2.5.6.6" ) ), objectClasses ) );
- objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT );
+ objectClasses = new DefaultAttribute( OBJECT_CLASS_AT );
objectClasses.add( "person" );
objectClasses.add( "blah" );
assertTrue( evaluator.evaluate( new EqualityNode( OBJECT_CLASS_AT, new StringValue( "2.5.6.6" ) ), objectClasses ) );
// negative tests
- objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "person" );
+ objectClasses = new DefaultAttribute( OBJECT_CLASS_AT, "person" );
assertFalse( evaluator.evaluate( new EqualityNode( OBJECT_CLASS_AT, new StringValue( "2.5.6.5" ) ), objectClasses ) );
- objectClasses = new DefaultEntryAttribute( OBJECT_CLASS_AT, "blah" );
+ objectClasses = new DefaultAttribute( OBJECT_CLASS_AT, "blah" );
assertFalse( evaluator.evaluate( new EqualityNode( OBJECT_CLASS_AT, new StringValue( "2.5.6.5" ) ), objectClasses ) );
}
}