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 2008/09/02 11:58:47 UTC
svn commit: r691179 [1/2] - in /directory:
apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/
apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/
apacheds/trunk/core-integ/src/test/java/org/apach...
Author: elecharny
Date: Tue Sep 2 02:58:45 2008
New Revision: 691179
URL: http://svn.apache.org/viewvc?rev=691179&view=rev
Log:
o Removed all the references to the ModificationItemImpl class
o Removed the ModificationItemImpl class and its associated test
Removed:
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModificationItemImpl.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModificationItemImplTest.java
Modified:
directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER783IT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791IT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/RootDSEIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchWithIndicesITest.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceObjectClassChangeHandlingIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersIT.java
directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/DeadContext.java
directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
directory/apacheds/trunk/mitosis/src/test/java/org/apache/directory/mitosis/service/ReplicationServiceITest.java
directory/apacheds/trunk/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/kerberos/KeyDerivationServiceIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyAddIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyRemoveIT.java
directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java
Modified: directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java?rev=691179&r1=691178&r2=691179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java (original)
+++ directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java Tue Sep 2 02:58:45 2008
@@ -42,7 +42,6 @@
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.SchemaUtils;
@@ -349,9 +348,9 @@
}
- public static ModificationItemImpl toModificationItemImpl( Modification modification )
+ public static ModificationItem toModificationItem( Modification modification )
{
- ModificationItemImpl modificationItem = new ModificationItemImpl(
+ ModificationItem modificationItem = new ModificationItem(
modification.getOperation().getValue(),
toAttributeImpl( (ServerAttribute)modification.getAttribute() ) );
@@ -361,13 +360,13 @@
/**
- * Convert a ModificationItemImpl to an instance of a ServerModification object
+ * Convert a ModificationItem to an instance of a ServerModification object
*
* @param modificationImpl the modification instance to convert
* @param attributeType the associated attributeType
* @return a instance of a ServerModification object
*/
- private static Modification toServerModification( ModificationItemImpl modificationImpl, AttributeType attributeType )
+ private static Modification toServerModification( ModificationItem modificationImpl, AttributeType attributeType )
{
Modification modification = new ServerModification(
modificationImpl.getModificationOp(),
@@ -378,15 +377,15 @@
}
- public static List<ModificationItemImpl> toModificationItemImpl( List<Modification> modifications )
+ public static List<ModificationItem> toModificationItemImpl( List<Modification> modifications )
{
if ( modifications != null )
{
- List<ModificationItemImpl> modificationItems = new ArrayList<ModificationItemImpl>();
+ List<ModificationItem> modificationItems = new ArrayList<ModificationItem>();
for ( Modification modification: modifications )
{
- modificationItems.add( toModificationItemImpl( modification ) );
+ modificationItems.add( toModificationItem( modification ) );
}
return modificationItems;
@@ -407,17 +406,17 @@
* @return
* @throws NamingException
*/
- public static List<Modification> convertToServerModification( List<ModificationItemImpl> modificationImpls,
+ public static List<Modification> convertToServerModification( List<ModificationItem> modificationItems,
AttributeTypeRegistry atRegistry ) throws NamingException
{
- if ( modificationImpls != null )
+ if ( modificationItems != null )
{
- List<Modification> modifications = new ArrayList<Modification>( modificationImpls.size() );
+ List<Modification> modifications = new ArrayList<Modification>( modificationItems.size() );
- for ( ModificationItemImpl modificationImpl: modificationImpls )
+ for ( ModificationItem modificationItem: modificationItems )
{
- AttributeType attributeType = atRegistry.lookup( modificationImpl.getAttribute().getID() );
- modifications.add( toServerModification( modificationImpl, attributeType ) );
+ AttributeType attributeType = atRegistry.lookup( modificationItem.getAttribute().getID() );
+ modifications.add( toServerModification( modificationItem, attributeType ) );
}
return modifications;
@@ -464,7 +463,7 @@
// TODO : handle options
AttributeType attributeType = atRegistry.lookup( id );
- modificationsList.add( toServerModification( (ModificationItemImpl)modification, attributeType ) );
+ modificationsList.add( toServerModification( (ModificationItem)modification, attributeType ) );
}
return modificationsList;
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java?rev=691179&r1=691178&r2=691179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java Tue Sep 2 02:58:45 2008
@@ -24,9 +24,9 @@
import org.apache.directory.server.core.integ.CiRunner;
import org.apache.directory.server.core.jndi.ServerLdapContext;
-import static org.apache.directory.server.core.integ.IntegrationUtils.*;
+import static org.apache.directory.server.core.integ.IntegrationUtils.getUserAddLdif;
+import static org.apache.directory.server.core.integ.IntegrationUtils.apply;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.util.ArrayUtils;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -43,6 +43,7 @@
import javax.naming.directory.Attributes;
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
import javax.naming.ldap.LdapContext;
@@ -197,8 +198,8 @@
// now modify the password for akarasulu
Attribute userPasswordAttribute = new BasicAttribute( "userPassword", "newpwd" );
- ctx.modifyAttributes( "", new ModificationItemImpl[] {
- new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, userPasswordAttribute ) } );
+ ctx.modifyAttributes( "", new ModificationItem[] {
+ new ModificationItem( DirContext.REPLACE_ATTRIBUTE, userPasswordAttribute ) } );
// close and try with old password (should fail)
ctx.close();
@@ -256,8 +257,8 @@
// now modify the password for akarasulu : 'secret', encrypted using SHA
Attribute userPasswordAttribute = new BasicAttribute( "userPassword", "{SHA}5en6G6MezRroT3XKqkdPOmY/BfQ=" );
- ctx.modifyAttributes( "", new ModificationItemImpl[] {
- new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, userPasswordAttribute ) } );
+ ctx.modifyAttributes( "", new ModificationItem[] {
+ new ModificationItem( DirContext.REPLACE_ATTRIBUTE, userPasswordAttribute ) } );
// close and try with old password (should fail)
ctx.close();
@@ -313,8 +314,8 @@
// now modify the password for akarasulu : 'secret', encrypted using SHA
BasicAttribute userPasswordAttribute = new BasicAttribute( "userPassword", "{SSHA}mjVVxasFkk59wMW4L1Ldt+YCblfhULHs03WW7g==" );
- ctx.modifyAttributes( "", new ModificationItemImpl[] {
- new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, userPasswordAttribute ) } );
+ ctx.modifyAttributes( "", new ModificationItem[] {
+ new ModificationItem( DirContext.REPLACE_ATTRIBUTE, userPasswordAttribute ) } );
// close and try with old password (should fail)
ctx.close();
@@ -369,8 +370,8 @@
// now modify the password for akarasulu : 'secret', encrypted using MD5
Attribute userPasswordAttribute = new BasicAttribute( "userPassword", "{MD5}Xr4ilOzQ4PCOq3aQ0qbuaQ==" );
- ctx.modifyAttributes( "", new ModificationItemImpl[] {
- new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, userPasswordAttribute ) } );
+ ctx.modifyAttributes( "", new ModificationItem[] {
+ new ModificationItem( DirContext.REPLACE_ATTRIBUTE, userPasswordAttribute ) } );
// close and try with old password (should fail)
ctx.close();
@@ -425,8 +426,8 @@
// now modify the password for akarasulu : 'secret', encrypted using SHA
Attribute userPasswordAttribute = new BasicAttribute( "userPassword", "{SMD5}tQ9wo/VBuKsqBtylMMCcORbnYOJFMyDJ" );
- ctx.modifyAttributes( "", new ModificationItemImpl[] {
- new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, userPasswordAttribute ) } );
+ ctx.modifyAttributes( "", new ModificationItem[] {
+ new ModificationItem( DirContext.REPLACE_ATTRIBUTE, userPasswordAttribute ) } );
// close and try with old password (should fail)
ctx.close();
@@ -481,8 +482,8 @@
// now modify the password for akarasulu : 'secret', encrypted using CRYPT
Attribute userPasswordAttribute = new BasicAttribute( "userPassword", "{crypt}qFkH8Z1woBlXw" );
- ctx.modifyAttributes( "", new ModificationItemImpl[] {
- new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, userPasswordAttribute ) } );
+ ctx.modifyAttributes( "", new ModificationItem[] {
+ new ModificationItem( DirContext.REPLACE_ATTRIBUTE, userPasswordAttribute ) } );
// close and try with old password (should fail)
ctx.close();
@@ -540,8 +541,8 @@
// now modify the password for akarasulu (while we're admin)
Attribute userPasswordAttribute = new BasicAttribute( "userPassword", "newpwd" );
- ctx.modifyAttributes( "", new ModificationItemImpl[] {
- new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, userPasswordAttribute ) } );
+ ctx.modifyAttributes( "", new ModificationItem[] {
+ new ModificationItem( DirContext.REPLACE_ATTRIBUTE, userPasswordAttribute ) } );
ctx.close();
try
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=691179&r1=691178&r2=691179&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 Tue Sep 2 02:58:45 2008
@@ -21,7 +21,6 @@
import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.server.core.integ.CiRunner;
import org.apache.directory.server.core.integ.annotations.Factory;
@@ -36,6 +35,7 @@
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
import java.util.List;
import java.util.ArrayList;
@@ -85,7 +85,7 @@
* false otherwise.
* @throws javax.naming.NamingException if there are problems conducting the test
*/
- public boolean checkCanModifyAs( String uid, String password, String entryRdn, ModificationItemImpl[] mods )
+ public boolean checkCanModifyAs( String uid, String password, String entryRdn, ModificationItem[] mods )
throws Exception
{
// create the entry with the telephoneNumber attribute to modify
@@ -222,7 +222,7 @@
* false otherwise.
* @throws javax.naming.NamingException if there are problems conducting the test
*/
- public boolean checkCanSelfModify( String uid, String password, ModificationItemImpl[] mods ) throws Exception
+ public boolean checkCanSelfModify( String uid, String password, ModificationItem[] mods ) throws Exception
{
try
{
@@ -247,16 +247,16 @@
* @return the array of modification items represting the changes
* @throws NamingException if there are problems accessing attributes
*/
- private ModificationItemImpl[] toItems( int modOp, Attributes changes ) throws NamingException
+ private ModificationItem[] toItems( int modOp, Attributes changes ) throws NamingException
{
- List<ModificationItemImpl> mods = new ArrayList<ModificationItemImpl>();
+ List<ModificationItem> mods = new ArrayList<ModificationItem>();
NamingEnumeration<? extends Attribute> list = changes.getAll();
while ( list.hasMore() )
{
Attribute attr = list.next();
- mods.add( new ModificationItemImpl( modOp, attr ) );
+ mods.add( new ModificationItem( modOp, attr ) );
}
- ModificationItemImpl[] modArray = new ModificationItemImpl[mods.size()];
+ ModificationItem[] modArray = new ModificationItem[mods.size()];
return mods.toArray( modArray );
}
@@ -272,7 +272,7 @@
createUser( "billyd", "billyd" );
// create the password modification
- ModificationItemImpl[] mods = toItems( DirContext.REPLACE_ATTRIBUTE, new BasicAttributes( "userPassword",
+ ModificationItem[] mods = toItems( DirContext.REPLACE_ATTRIBUTE, new BasicAttributes( "userPassword",
"williams", true ) );
// try a modify operation which should fail without any ACI
@@ -306,7 +306,7 @@
// ----------------------------------------------------------------------------------
// create the add modifications
- ModificationItemImpl[] mods = toItems( DirContext.ADD_ATTRIBUTE, new BasicAttributes( "registeredAddress",
+ ModificationItem[] mods = toItems( DirContext.ADD_ATTRIBUTE, new BasicAttributes( "registeredAddress",
"100 Park Ave.", true ) );
// create the non-admin user
@@ -545,7 +545,7 @@
public void testPresciptiveACIModification() throws Exception
{
- ModificationItemImpl[] mods = toItems( DirContext.ADD_ATTRIBUTE,
+ ModificationItem[] mods = toItems( DirContext.ADD_ATTRIBUTE,
new BasicAttributes( "registeredAddress", "100 Park Ave.", true ) );
createUser( "billyd", "billyd" );
@@ -612,7 +612,7 @@
" }" +
" }" );
- ModificationItemImpl[] mods = toItems( DirContext.ADD_ATTRIBUTE,
+ ModificationItem[] mods = toItems( DirContext.ADD_ATTRIBUTE,
new BasicAttributes( "description", "description 1", true ) );
assertTrue( checkCanModifyAs( "billyd", "billyd", "ou=testou", mods ) );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java?rev=691179&r1=691178&r2=691179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java Tue Sep 2 02:58:45 2008
@@ -25,7 +25,6 @@
import static org.apache.directory.server.core.integ.state.TestServiceContext.startup;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertNotNull;
@@ -42,6 +41,7 @@
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
import javax.naming.ldap.LdapContext;
import java.util.Arrays;
@@ -350,13 +350,13 @@
new BasicAttributes( "userPassword", "to be replaced", true ) );
assertPassword( sysRoot.getAttributes( "ou=test5" ), "to be replaced" );
- ModificationItemImpl[] mods = new ModificationItemImpl[]
+ ModificationItem[] mods = new ModificationItem[]
{
- new ModificationItemImpl( DirContext.REMOVE_ATTRIBUTE,
+ new ModificationItem( DirContext.REMOVE_ATTRIBUTE,
new BasicAttribute( "description", "old value" ) ),
- new ModificationItemImpl( DirContext.ADD_ATTRIBUTE,
+ new ModificationItem( DirContext.ADD_ATTRIBUTE,
new BasicAttribute( "seeAlso", "ou=added" ) ),
- new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE,
+ new ModificationItem( DirContext.REPLACE_ATTRIBUTE,
new BasicAttribute( "userPassword", "a replaced value" ) )
};
Tag t3 = service.getChangeLog().tag();
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=691179&r1=691178&r2=691179&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 Tue Sep 2 02:58:45 2008
@@ -25,7 +25,6 @@
import org.apache.directory.server.core.integ.SetupMode;
import org.apache.directory.server.core.integ.annotations.Mode;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertNotNull;
@@ -41,6 +40,7 @@
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
@@ -123,8 +123,8 @@
{
Attribute attribute = new BasicAttribute( "administrativeRole" );
attribute.add( role );
- ModificationItemImpl item = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, attribute );
- getSystemContext( service ).modifyAttributes( "", new ModificationItemImpl[] { item } );
+ ModificationItem item = new ModificationItem( DirContext.ADD_ATTRIBUTE, attribute );
+ getSystemContext( service ).modifyAttributes( "", new ModificationItem[] { item } );
}
@@ -230,8 +230,8 @@
// now modify entries included by the subentry to have collectiveExclusions
// -------------------------------------------------------------------
- ModificationItemImpl[] items = new ModificationItemImpl[]
- { new ModificationItemImpl( DirContext.ADD_ATTRIBUTE,
+ ModificationItem[] items = new ModificationItem[]
+ { new ModificationItem( DirContext.ADD_ATTRIBUTE,
new BasicAttribute( "collectiveExclusions", "c-ou" ) ) };
getSystemContext( service ).modifyAttributes( "ou=services,ou=configuration", items );
@@ -302,8 +302,8 @@
// now modify an entry to exclude all collective attributes
// -------------------------------------------------------------------
- items = new ModificationItemImpl[]
- { new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, new BasicAttribute( "collectiveExclusions",
+ items = new ModificationItem[]
+ { new ModificationItem( DirContext.REPLACE_ATTRIBUTE, new BasicAttribute( "collectiveExclusions",
"excludeAllCollectiveAttributes" ) ) };
getSystemContext( service ).modifyAttributes( "ou=interceptors,ou=configuration", items );
@@ -367,8 +367,8 @@
// now modify entries included by the subentry to have collectiveExclusions
// -------------------------------------------------------------------
- ModificationItemImpl[] items = new ModificationItemImpl[]
- { new ModificationItemImpl( DirContext.ADD_ATTRIBUTE,
+ ModificationItem[] items = new ModificationItem[]
+ { new ModificationItem( DirContext.ADD_ATTRIBUTE,
new BasicAttribute( "collectiveExclusions", "c-ou" ) ) };
getSystemContext( service ).modifyAttributes( "ou=services,ou=configuration", items );
entries = getAllEntries();
@@ -426,8 +426,8 @@
// now modify an entry to exclude all collective attributes
// -------------------------------------------------------------------
- items = new ModificationItemImpl[]
- { new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, new BasicAttribute( "collectiveExclusions",
+ items = new ModificationItem[]
+ { new ModificationItem( DirContext.REPLACE_ATTRIBUTE, new BasicAttribute( "collectiveExclusions",
"excludeAllCollectiveAttributes" ) ) };
getSystemContext( service ).modifyAttributes( "ou=interceptors,ou=configuration", items );
entries = getAllEntries();
@@ -506,10 +506,10 @@
Attributes entry = getTestEntry( "Ersin Er" );
getSystemContext( service ).createSubcontext( "cn=Ersin Er", entry );
Attribute change = new BasicAttribute( "c-l", "Turkiye");
- ModificationItemImpl mod = new ModificationItemImpl(DirContext.ADD_ATTRIBUTE, change);
+ ModificationItem mod = new ModificationItem(DirContext.ADD_ATTRIBUTE, change);
try
{
- getSystemContext( service ).modifyAttributes( "cn=Ersin Er", new ModificationItemImpl[] { mod } );
+ getSystemContext( service ).modifyAttributes( "cn=Ersin Er", new ModificationItem[] { mod } );
fail( "Collective attribute addition to non-collectiveAttributeSubentry should have failed." );
}
catch ( NamingException e )
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java?rev=691179&r1=691178&r2=691179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java Tue Sep 2 02:58:45 2008
@@ -28,7 +28,6 @@
import org.apache.directory.shared.ldap.exception.LdapNameAlreadyBoundException;
import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
@@ -45,6 +44,7 @@
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
@@ -361,8 +361,8 @@
assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, e.getResultCode() );
}
- ModificationItemImpl[] mods = new ModificationItemImpl[]
- { new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, ou ) };
+ ModificationItem[] mods = new ModificationItem[]
+ { new ModificationItem( DirContext.ADD_ATTRIBUTE, ou ) };
try
{
@@ -399,8 +399,8 @@
attr = new BasicAttribute( "ou" );
attr.add( "another" );
- ModificationItemImpl[] mods = new ModificationItemImpl[]
- { new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, attr ) };
+ ModificationItem[] mods = new ModificationItem[]
+ { new ModificationItem( DirContext.ADD_ATTRIBUTE, attr ) };
sysRoot.modifyAttributes( "ou=users", mods );
ou = sysRoot.getAttributes( "ou=users" ).get( "ou" );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER783IT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER783IT.java?rev=691179&r1=691178&r2=691179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER783IT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER783IT.java Tue Sep 2 02:58:45 2008
@@ -22,7 +22,6 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.integ.CiRunner;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNotNull;
@@ -38,6 +37,7 @@
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
import javax.naming.directory.InitialDirContext;
+import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
@@ -87,22 +87,22 @@
// Add the first value for description
String description1 = "an American singer-songwriter";
Attribute firstDescr = new BasicAttribute( "description", description1 );
- ModificationItemImpl modification = new ModificationItemImpl(DirContext.ADD_ATTRIBUTE, firstDescr);
- ctx.modifyAttributes(rdn, new ModificationItemImpl[] { modification });
+ ModificationItem modification = new ModificationItem(DirContext.ADD_ATTRIBUTE, firstDescr);
+ ctx.modifyAttributes(rdn, new ModificationItem[] { modification });
// Add a second value to description
String description2 = "Grammy award winning";
Attribute otherDescr = new BasicAttribute( "description", description2 );
- modification = new ModificationItemImpl(DirContext.ADD_ATTRIBUTE, otherDescr );
- ctx.modifyAttributes(rdn, new ModificationItemImpl[] { modification } );
+ modification = new ModificationItem(DirContext.ADD_ATTRIBUTE, otherDescr );
+ ctx.modifyAttributes(rdn, new ModificationItem[] { modification } );
// Add a third value to description
String description3 = "MTV Music Award winning";
Attribute thirdDescr = new BasicAttribute( "description", description3 );
- modification = new ModificationItemImpl(DirContext.ADD_ATTRIBUTE, thirdDescr );
- ctx.modifyAttributes(rdn, new ModificationItemImpl[] { modification });
+ modification = new ModificationItem(DirContext.ADD_ATTRIBUTE, thirdDescr );
+ ctx.modifyAttributes(rdn, new ModificationItem[] { modification });
// Search Entry
SearchControls sctls = new SearchControls();
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791IT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791IT.java?rev=691179&r1=691178&r2=691179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791IT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791IT.java Tue Sep 2 02:58:45 2008
@@ -38,11 +38,11 @@
import javax.naming.directory.InitialDirContext;
import javax.naming.directory.InvalidAttributeIdentifierException;
import javax.naming.directory.InvalidAttributeValueException;
+import javax.naming.directory.ModificationItem;
import javax.naming.directory.SchemaViolationException;
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.integ.CiRunner;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -117,8 +117,8 @@
// remove "cn=aaa", which is not part of the RDN
Attribute attr = new BasicAttribute( "cn", "aaa" );
- ModificationItemImpl modification = new ModificationItemImpl( DirContext.REMOVE_ATTRIBUTE, attr );
- ctx.modifyAttributes( "cn=test", new ModificationItemImpl[]
+ ModificationItem modification = new ModificationItem( DirContext.REMOVE_ATTRIBUTE, attr );
+ ctx.modifyAttributes( "cn=test", new ModificationItem[]
{ modification } );
Attributes attrs = ctx.getAttributes( "cn=test", new String[]
@@ -152,8 +152,8 @@
// replace cn attribute with "cn=test", must remove the previous "cn=aaa"
Attribute attr = new BasicAttribute( "cn", "test" );
- ModificationItemImpl modification = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, attr );
- ctx.modifyAttributes( "cn=test", new ModificationItemImpl[]
+ ModificationItem modification = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr );
+ ctx.modifyAttributes( "cn=test", new ModificationItem[]
{ modification } );
Attributes attrs = ctx.getAttributes( "cn=test", new String[]
@@ -190,10 +190,10 @@
// try to add an non-existing objectClass "test", must be rejected
Attribute attr = new BasicAttribute( "objectclass", "test" );
- ModificationItemImpl modification = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, attr );
+ ModificationItem modification = new ModificationItem( DirContext.ADD_ATTRIBUTE, attr );
try
{
- ctx.modifyAttributes( "cn=test", new ModificationItemImpl[]
+ ctx.modifyAttributes( "cn=test", new ModificationItem[]
{ modification } );
fail( "Exception expected" );
}
@@ -244,10 +244,10 @@
// try to add an unallowed attribute, must be rejected
Attribute attr = new BasicAttribute( "javaDoc", "test" );
- ModificationItemImpl modification = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, attr );
+ ModificationItem modification = new ModificationItem( DirContext.ADD_ATTRIBUTE, attr );
try
{
- ctx.modifyAttributes( "cn=test", new ModificationItemImpl[]
+ ctx.modifyAttributes( "cn=test", new ModificationItem[]
{ modification } );
fail( "Exception expected" );
}
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java?rev=691179&r1=691178&r2=691179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java Tue Sep 2 02:58:45 2008
@@ -34,7 +34,6 @@
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
import static org.junit.Assert.assertEquals;
@@ -54,6 +53,7 @@
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
@@ -179,8 +179,8 @@
DirContext ctx = ctxRoot.createSubcontext( dn, attributes );
assertNotNull( ctx );
- ModificationItemImpl[] mods = new ModificationItemImpl[1];
- mods[0] = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, new BasicAttribute( "description", description ) );
+ ModificationItem[] mods = new ModificationItem[1];
+ mods[0] = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, new BasicAttribute( "description", description ) );
ctxRoot.modifyAttributes( dn, mods );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java?rev=691179&r1=691178&r2=691179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java Tue Sep 2 02:58:45 2008
@@ -28,7 +28,6 @@
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapNamingException;
import org.apache.directory.shared.ldap.ldif.LdifEntry;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import static org.junit.Assert.assertEquals;
@@ -52,6 +51,7 @@
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
@@ -458,8 +458,8 @@
td.refCtx.addToEnvironment( Context.REFERRAL, "throw" );
try
{
- ModificationItemImpl[] mods = new ModificationItemImpl[]
- { new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, new BasicAttribute( "description", "just some text" ) ) };
+ ModificationItem[] mods = new ModificationItem[]
+ { new ModificationItem( DirContext.ADD_ATTRIBUTE, new BasicAttribute( "description", "just some text" ) ) };
td.refCtx.modifyAttributes( "cn=alex karasulu", mods );
fail( "Should fail here throwing a ReferralException" );
}
@@ -490,8 +490,8 @@
td.refCtx.addToEnvironment( Context.REFERRAL, "throw" );
try
{
- ModificationItemImpl[] mods = new ModificationItemImpl[]
- { new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, new BasicAttribute( "description", "just some text" ) ) };
+ ModificationItem[] mods = new ModificationItem[]
+ { new ModificationItem( DirContext.ADD_ATTRIBUTE, new BasicAttribute( "description", "just some text" ) ) };
td.refCtx.modifyAttributes( "cn=alex karasulu,ou=apache", mods );
fail( "Should fail here throwing a ReferralException" );
}
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/RootDSEIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/RootDSEIT.java?rev=691179&r1=691178&r2=691179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/RootDSEIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/RootDSEIT.java Tue Sep 2 02:58:45 2008
@@ -23,7 +23,6 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.integ.CiRunner;
import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNotNull;
@@ -36,6 +35,8 @@
import javax.naming.NamingException;
import javax.naming.directory.Attributes;
import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
+
import java.util.Hashtable;
@@ -288,7 +289,7 @@
try
{
- ctx.modifyAttributes( "", new ModificationItemImpl[]
+ ctx.modifyAttributes( "", new ModificationItem[]
{} );
fail( "we should never get here" );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchIT.java?rev=691179&r1=691178&r2=691179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchIT.java Tue Sep 2 02:58:45 2008
@@ -28,7 +28,6 @@
import org.apache.directory.shared.ldap.exception.LdapSizeLimitExceededException;
import org.apache.directory.shared.ldap.exception.LdapTimeLimitExceededException;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
@@ -47,6 +46,7 @@
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
@@ -206,8 +206,8 @@
if ( isNisDisabled )
{
Attribute disabled = new BasicAttribute( "m-disabled" );
- ModificationItemImpl[] mods = new ModificationItemImpl[] {
- new ModificationItemImpl( DirContext.REMOVE_ATTRIBUTE, disabled ) };
+ ModificationItem[] mods = new ModificationItem[] {
+ new ModificationItem( DirContext.REMOVE_ATTRIBUTE, disabled ) };
schemaRoot.modifyAttributes( "cn=nis", mods );
}
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchWithIndicesITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchWithIndicesITest.java?rev=691179&r1=691178&r2=691179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchWithIndicesITest.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchWithIndicesITest.java Tue Sep 2 02:58:45 2008
@@ -33,7 +33,6 @@
import org.apache.directory.server.xdbm.Index;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -47,6 +46,7 @@
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
@@ -88,8 +88,8 @@
if ( isNisDisabled )
{
Attribute disabled = new BasicAttribute( "m-disabled" );
- ModificationItemImpl[] mods = new ModificationItemImpl[] {
- new ModificationItemImpl( DirContext.REMOVE_ATTRIBUTE, disabled ) };
+ ModificationItem[] mods = new ModificationItem[] {
+ new ModificationItem( DirContext.REMOVE_ATTRIBUTE, disabled ) };
schemaRoot.modifyAttributes( "cn=nis", mods );
}
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=691179&r1=691178&r2=691179&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 Tue Sep 2 02:58:45 2008
@@ -28,7 +28,6 @@
import org.apache.directory.shared.ldap.constants.JndiPropertyConstants;
import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.util.StringTools;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -438,7 +437,7 @@
LdapContext sysRoot = getSystemContext( service );
createData( sysRoot );
- ModificationItem modifyOp = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, new BasicAttribute(
+ ModificationItem modifyOp = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, new BasicAttribute(
"creatorsName", "cn=Tori Amos,dc=example,dc=com" ) );
try
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java?rev=691179&r1=691178&r2=691179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java Tue Sep 2 02:58:45 2008
@@ -28,7 +28,6 @@
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -45,6 +44,7 @@
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
import javax.naming.ldap.LdapContext;
@@ -228,11 +228,11 @@
LdapDN dn = getAttributeTypeContainer( "apachemeta" );
dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
- ModificationItemImpl[] mods = new ModificationItemImpl[2];
+ ModificationItem[] mods = new ModificationItem[2];
Attribute attr = new BasicAttribute( MetaSchemaConstants.M_DESCRIPTION_AT, DESCRIPTION1 );
- mods[0] = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, attr );
+ mods[0] = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr );
attr = new BasicAttribute( MetaSchemaConstants.M_SYNTAX_AT, DIRSTR_SYNTAX_OID );
- mods[1] = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, attr );
+ mods[1] = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr );
getSchemaContext( service ).modifyAttributes( dn, mods );
assertTrue( "attributeType OID should still be present",
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java?rev=691179&r1=691178&r2=691179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java Tue Sep 2 02:58:45 2008
@@ -32,7 +32,6 @@
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.MatchingRule;
@@ -51,6 +50,8 @@
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
+
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.util.Comparator;
@@ -274,9 +275,9 @@
LdapDN dn = getComparatorContainer( "apachemeta" );
dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
- ModificationItemImpl[] mods = new ModificationItemImpl[1];
+ ModificationItem[] mods = new ModificationItem[1];
Attribute attr = new BasicAttribute( MetaSchemaConstants.M_FQCN_AT, IntegerComparator.class.getName() );
- mods[0] = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, attr );
+ mods[0] = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr );
getSchemaContext( service ).modifyAttributes( dn, mods );
assertTrue( "comparator OID should still be present",
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java?rev=691179&r1=691178&r2=691179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java Tue Sep 2 02:58:45 2008
@@ -27,7 +27,6 @@
import org.apache.directory.server.schema.registries.MatchingRuleRegistry;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.MatchingRule;
@@ -44,6 +43,7 @@
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
/**
@@ -221,11 +221,11 @@
LdapDN dn = getMatchingRuleContainer( "apachemeta" );
dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
- ModificationItemImpl[] mods = new ModificationItemImpl[2];
+ ModificationItem[] mods = new ModificationItem[2];
Attribute attr = new BasicAttribute( MetaSchemaConstants.M_DESCRIPTION_AT, DESCRIPTION1 );
- mods[0] = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, attr );
+ mods[0] = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr );
attr = new BasicAttribute( MetaSchemaConstants.M_SYNTAX_AT, DIRSTR_SYNTAX_OID );
- mods[1] = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, attr );
+ mods[1] = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr );
getSchemaContext( service ).modifyAttributes( dn, mods );
assertTrue( "matchingRule OID should still be present",
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java?rev=691179&r1=691178&r2=691179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java Tue Sep 2 02:58:45 2008
@@ -30,7 +30,6 @@
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.DeepTrimNormalizer;
@@ -52,6 +51,8 @@
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
+
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.util.Comparator;
@@ -277,9 +278,9 @@
LdapDN dn = getNormalizerContainer( "apachemeta" );
dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
- ModificationItemImpl[] mods = new ModificationItemImpl[1];
+ ModificationItem[] mods = new ModificationItem[1];
Attribute attr = new BasicAttribute( MetaSchemaConstants.M_FQCN_AT, DeepTrimNormalizer.class.getName() );
- mods[0] = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, attr );
+ mods[0] = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr );
getSchemaContext( service ).modifyAttributes( dn, mods );
assertTrue( "normalizer OID should still be present",
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java?rev=691179&r1=691178&r2=691179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java Tue Sep 2 02:58:45 2008
@@ -26,7 +26,6 @@
import org.apache.directory.server.schema.registries.ObjectClassRegistry;
import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.ObjectClass;
@@ -43,6 +42,7 @@
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
/**
@@ -233,11 +233,11 @@
LdapDN dn = getObjectClassContainer( "apachemeta" );
dn.add( "m-oid" + "=" + OID );
- ModificationItemImpl[] mods = new ModificationItemImpl[2];
+ ModificationItem[] mods = new ModificationItem[2];
Attribute attr = new BasicAttribute( "m-description", DESCRIPTION1 );
- mods[0] = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, attr );
+ mods[0] = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr );
attr = new BasicAttribute( "m-name", NEW_NAME );
- mods[1] = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, attr );
+ mods[1] = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr );
getSchemaContext( service ).modifyAttributes( dn, mods );
assertTrue( "objectClass OID should still be present",
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java?rev=691179&r1=691178&r2=691179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java Tue Sep 2 02:58:45 2008
@@ -28,7 +28,6 @@
import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import static org.junit.Assert.assertEquals;
@@ -47,6 +46,7 @@
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
import javax.naming.ldap.LdapContext;
import java.util.Map;
@@ -287,8 +287,8 @@
assertNotNull( getLoadedSchemas().get( DUMMY_SCHEMA ) );
// make the nis schema depend on the dummy schema
- ModificationItemImpl[] mods = new ModificationItemImpl[1];
- mods[0] = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE,
+ ModificationItem[] mods = new ModificationItem[1];
+ mods[0] = new ModificationItem( DirContext.ADD_ATTRIBUTE,
new BasicAttribute( MetaSchemaConstants.M_DEPENDENCIES_AT, DUMMY_SCHEMA ) );
schemaRoot.modifyAttributes( "cn=" + TEST_SCHEMA, mods );
@@ -357,9 +357,9 @@
LdapContext schemaRoot = getSchemaContext( service );
// now enable the test schema
- ModificationItemImpl[] mods = new ModificationItemImpl[1];
+ ModificationItem[] mods = new ModificationItem[1];
Attribute attr = new BasicAttribute( "m-disabled", "FALSE" );
- mods[0] = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, attr );
+ mods[0] = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr );
schemaRoot.modifyAttributes( "cn=" + schemaName, mods );
}
@@ -369,9 +369,9 @@
LdapContext schemaRoot = getSchemaContext( service );
// now enable the test schema
- ModificationItemImpl[] mods = new ModificationItemImpl[1];
+ ModificationItem[] mods = new ModificationItem[1];
Attribute attr = new BasicAttribute( "m-disabled", "TRUE" );
- mods[0] = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, attr );
+ mods[0] = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr );
schemaRoot.modifyAttributes( "cn=" + schemaName, mods );
}
@@ -478,9 +478,9 @@
// now try to disable the test schema which should fail
// since it's dependent, the dummy schema, is enabled
- ModificationItemImpl[] mods = new ModificationItemImpl[1];
+ ModificationItem[] mods = new ModificationItem[1];
Attribute attr = new BasicAttribute( "m-disabled", "TRUE" );
- mods[0] = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, attr );
+ mods[0] = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr );
try
{
@@ -625,9 +625,9 @@
{
LdapContext schemaRoot = getSchemaContext( service );
- ModificationItemImpl[] mods = new ModificationItemImpl[1];
+ ModificationItem[] mods = new ModificationItem[1];
Attribute attr = new BasicAttribute( "m-dependencies", "bogus" );
- mods[0] = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, attr );
+ mods[0] = new ModificationItem( DirContext.ADD_ATTRIBUTE, attr );
try
{
@@ -654,9 +654,9 @@
{
LdapContext schemaRoot = getSchemaContext( service );
enableSchema( TEST_SCHEMA );
- ModificationItemImpl[] mods = new ModificationItemImpl[1];
+ ModificationItem[] mods = new ModificationItem[1];
Attribute attr = new BasicAttribute( "m-dependencies", "mozilla" );
- mods[0] = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, attr );
+ mods[0] = new ModificationItem( DirContext.ADD_ATTRIBUTE, attr );
try
{
@@ -680,9 +680,9 @@
public void testAddOfDisabledDependencyToDisabledSchema() throws Exception
{
LdapContext schemaRoot = getSchemaContext( service );
- ModificationItemImpl[] mods = new ModificationItemImpl[1];
+ ModificationItem[] mods = new ModificationItem[1];
Attribute attr = new BasicAttribute( "m-dependencies", "mozilla" );
- mods[0] = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, attr );
+ mods[0] = new ModificationItem( DirContext.ADD_ATTRIBUTE, attr );
schemaRoot.modifyAttributes( "cn=" + TEST_SCHEMA, mods );
Attributes attrs = schemaRoot.getAttributes( "cn=" + TEST_SCHEMA );
Attribute dependencies = attrs.get( "m-dependencies" );
@@ -700,9 +700,9 @@
public void testAddOfEnabledDependencyToDisabledSchema() throws Exception
{
LdapContext schemaRoot = getSchemaContext( service );
- ModificationItemImpl[] mods = new ModificationItemImpl[1];
+ ModificationItem[] mods = new ModificationItem[1];
Attribute attr = new BasicAttribute( "m-dependencies", "java" );
- mods[0] = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, attr );
+ mods[0] = new ModificationItem( DirContext.ADD_ATTRIBUTE, attr );
schemaRoot.modifyAttributes( "cn=" + TEST_SCHEMA, mods );
Attributes attrs = schemaRoot.getAttributes( "cn=" + TEST_SCHEMA );
Attribute dependencies = attrs.get( "m-dependencies" );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java?rev=691179&r1=691178&r2=691179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java Tue Sep 2 02:58:45 2008
@@ -30,7 +30,6 @@
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.Syntax;
@@ -49,6 +48,8 @@
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
+
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
@@ -273,9 +274,9 @@
LdapDN dn = getSyntaxCheckerContainer( "apachemeta" );
dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
- ModificationItemImpl[] mods = new ModificationItemImpl[1];
+ ModificationItem[] mods = new ModificationItem[1];
Attribute attr = new BasicAttribute( MetaSchemaConstants.M_FQCN_AT, BogusSyntaxChecker.class.getName() );
- mods[0] = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, attr );
+ mods[0] = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr );
getSchemaContext( service ).modifyAttributes( dn, mods );
assertTrue( "syntaxChecker OID should still be present",
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java?rev=691179&r1=691178&r2=691179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java Tue Sep 2 02:58:45 2008
@@ -30,7 +30,6 @@
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.Syntax;
@@ -49,6 +48,7 @@
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
@@ -240,9 +240,9 @@
LdapDN dn = getSyntaxContainer( "apachemeta" );
dn.add( MetaSchemaConstants.M_OID_AT + "=" + OID );
- ModificationItemImpl[] mods = new ModificationItemImpl[1];
+ ModificationItem[] mods = new ModificationItem[1];
Attribute attr = new BasicAttribute( MetaSchemaConstants.M_DESCRIPTION_AT, DESCRIPTION1 );
- mods[0] = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, attr );
+ mods[0] = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr );
getSchemaContext( service ).modifyAttributes( dn, mods );
assertTrue( "syntax OID should still be present",
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java?rev=691179&r1=691178&r2=691179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java Tue Sep 2 02:58:45 2008
@@ -24,7 +24,6 @@
import org.apache.directory.server.core.integ.CiRunner;
import static org.apache.directory.server.core.integ.IntegrationUtils.getRootContext;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSchemaContext;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.syntax.AttributeTypeDescription;
import org.apache.directory.shared.ldap.schema.syntax.parser.AttributeTypeDescriptionSchemaParser;
@@ -44,6 +43,7 @@
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
@@ -143,9 +143,9 @@
private void enableSchema( String schemaName ) throws Exception
{
// now enable the test schema
- ModificationItemImpl[] mods = new ModificationItemImpl[1];
+ ModificationItem[] mods = new ModificationItem[1];
Attribute attr = new BasicAttribute( "m-disabled", "FALSE" );
- mods[0] = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, attr );
+ mods[0] = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr );
getSchemaContext( service ).modifyAttributes( "cn=" + schemaName, mods );
}
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java?rev=691179&r1=691178&r2=691179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java Tue Sep 2 02:58:45 2008
@@ -30,7 +30,6 @@
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
import org.apache.directory.shared.ldap.exception.LdapNameAlreadyBoundException;
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -72,6 +71,7 @@
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
import javax.naming.directory.InitialDirContext;
+import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
@@ -1393,8 +1393,8 @@
LdapDN dn = new LdapDN( getSubschemaSubentryDN() );
String substrate = "( 1.3.6.1.4.1.18060.0.4.0.2.10000 NAME ( 'bogus' 'bogusName' ) " +
"DESC 'bogus description' SUP name SINGLE-VALUE X-SCHEMA 'nis' )";
- ModificationItemImpl[] mods = new ModificationItemImpl[1];
- mods[0] = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE,
+ ModificationItem[] mods = new ModificationItem[1];
+ mods[0] = new ModificationItem( DirContext.ADD_ATTRIBUTE,
new BasicAttribute( "attributeTypes", substrate ) );
getRootContext( service ).modifyAttributes( dn, mods );
@@ -1447,8 +1447,8 @@
LdapDN dn = new LdapDN( getSubschemaSubentryDN() );
String substrate = "( 1.3.6.1.4.1.18060.0.4.0.2.10000 NAME ( 'bogus' 'bogusName' ) " +
"DESC 'bogus description' SUP name SINGLE-VALUE X-SCHEMA 'nis' )";
- ModificationItemImpl[] mods = new ModificationItemImpl[1];
- mods[0] = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE,
+ ModificationItem[] mods = new ModificationItem[1];
+ mods[0] = new ModificationItem( DirContext.ADD_ATTRIBUTE,
new BasicAttribute( "attributeTypes", substrate ) );
getRootContext( service ).modifyAttributes( dn, mods );
@@ -1883,8 +1883,8 @@
LdapDN dn = new LdapDN( getSubschemaSubentryDN() );
String substrate = "( 1.3.6.1.4.1.18060.0.4.0.2.10000 NAME ( 'bogus' 'bogusName' ) " +
"DESC 'bogus description' SUP name SINGLE-VALUE X-SCHEMA 'nis' )";
- ModificationItemImpl[] mods = new ModificationItemImpl[1];
- mods[0] = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE,
+ ModificationItem[] mods = new ModificationItem[1];
+ mods[0] = new ModificationItem( DirContext.ADD_ATTRIBUTE,
new BasicAttribute( "attributeTypes", substrate ) );
getRootContext( service ).modifyAttributes( dn, mods );
@@ -1940,7 +1940,7 @@
substrate = "( 1.3.6.1.4.1.18060.0.4.0.2.10001 NAME ( 'bogus2' 'bogusName2' ) " +
"DESC 'bogus description' SUP name SINGLE-VALUE X-SCHEMA 'nis' )";
- mods[0] = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE,
+ mods[0] = new ModificationItem( DirContext.ADD_ATTRIBUTE,
new BasicAttribute( "attributeTypes", substrate ) );
ctx.modifyAttributes( dn, mods );
@@ -1993,9 +1993,9 @@
private void enableSchema( String schemaName ) throws Exception
{
// now enable the test schema
- ModificationItemImpl[] mods = new ModificationItemImpl[1];
+ ModificationItem[] mods = new ModificationItem[1];
Attribute attr = new BasicAttribute( "m-disabled", "FALSE" );
- mods[0] = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, attr );
+ mods[0] = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr );
getSchemaContext( service ).modifyAttributes( "cn=" + schemaName, mods );
}
@@ -2003,9 +2003,9 @@
private void disableSchema( String schemaName ) throws Exception
{
// now enable the test schema
- ModificationItemImpl[] mods = new ModificationItemImpl[1];
+ ModificationItem[] mods = new ModificationItem[1];
Attribute attr = new BasicAttribute( "m-disabled", "TRUE" );
- mods[0] = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, attr );
+ mods[0] = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr );
getSchemaContext( service ).modifyAttributes( "cn=" + schemaName, mods );
}
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceIT.java?rev=691179&r1=691178&r2=691179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceIT.java Tue Sep 2 02:58:45 2008
@@ -25,7 +25,6 @@
import org.apache.directory.server.core.integ.CiRunner;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
@@ -38,6 +37,7 @@
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
@@ -136,8 +136,8 @@
attribute.add( "autonomousArea" );
attribute.add( "collectiveAttributeSpecificArea" );
attribute.add( "accessControlSpecificArea" );
- ModificationItemImpl item = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, attribute );
- sysRoot.modifyAttributes( "", new ModificationItemImpl[] { item } );
+ ModificationItem item = new ModificationItem( DirContext.ADD_ATTRIBUTE, attribute );
+ sysRoot.modifyAttributes( "", new ModificationItem[] { item } );
}
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingIT.java?rev=691179&r1=691178&r2=691179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingIT.java Tue Sep 2 02:58:45 2008
@@ -25,7 +25,6 @@
import org.apache.directory.server.core.integ.CiRunner;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import org.junit.Test;
@@ -37,6 +36,7 @@
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
@@ -93,8 +93,8 @@
Attribute attribute = new BasicAttribute( "administrativeRole" );
attribute.add( "autonomousArea" );
attribute.add( "collectiveAttributeSpecificArea" );
- ModificationItemImpl item = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, attribute );
- sysRoot.modifyAttributes( "", new ModificationItemImpl[]
+ ModificationItem item = new ModificationItem( DirContext.ADD_ATTRIBUTE, attribute );
+ sysRoot.modifyAttributes( "", new ModificationItem[]
{ item } );
}
@@ -140,8 +140,8 @@
//----------------------------------------------------------------------
Attribute attr = new BasicAttribute( "sn", "changedSn");
- ModificationItemImpl mod = new ModificationItemImpl(DirContext.REPLACE_ATTRIBUTE, attr);
- ModificationItemImpl[] mods = new ModificationItemImpl[] { mod };
+ ModificationItem mod = new ModificationItem(DirContext.REPLACE_ATTRIBUTE, attr);
+ ModificationItem[] mods = new ModificationItem[] { mod };
sysRoot.modifyAttributes( "cn=testEntry", mods );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java?rev=691179&r1=691178&r2=691179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java Tue Sep 2 02:58:45 2008
@@ -24,7 +24,6 @@
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.message.SubentriesControl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -42,6 +41,7 @@
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
import javax.naming.ldap.Control;
@@ -112,8 +112,8 @@
LdapContext sysRoot = getSystemContext( service );
Attribute attribute = new BasicAttribute( "administrativeRole" );
attribute.add( role );
- ModificationItemImpl item = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, attribute );
- sysRoot.modifyAttributes( "", new ModificationItemImpl[]
+ ModificationItem item = new ModificationItem( DirContext.ADD_ATTRIBUTE, attribute );
+ sysRoot.modifyAttributes( "", new ModificationItem[]
{ item } );
}
@@ -298,8 +298,8 @@
Attribute subtreeSpecification = new BasicAttribute( "subtreeSpecification" );
subtreeSpecification.add( "{ base \"ou=configuration\", specificExclusions { chopBefore:\"ou=services\" } }" );
- ModificationItemImpl item = new ModificationItemImpl( DirContext.REPLACE_ATTRIBUTE, subtreeSpecification );
- sysRoot.modifyAttributes( "cn=testsubentry", new ModificationItemImpl[]
+ ModificationItem item = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, subtreeSpecification );
+ sysRoot.modifyAttributes( "cn=testsubentry", new ModificationItem[]
{ item } );
results = getAllEntries();
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceObjectClassChangeHandlingIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceObjectClassChangeHandlingIT.java?rev=691179&r1=691178&r2=691179&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceObjectClassChangeHandlingIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceObjectClassChangeHandlingIT.java Tue Sep 2 02:58:45 2008
@@ -25,7 +25,6 @@
import org.apache.directory.server.core.integ.CiRunner;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import org.junit.Test;
@@ -38,6 +37,7 @@
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
import javax.naming.ldap.LdapContext;
@@ -103,8 +103,8 @@
Attribute attribute = new BasicAttribute( "administrativeRole" );
attribute.add( "autonomousArea" );
attribute.add( "collectiveAttributeSpecificArea" );
- ModificationItemImpl item = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, attribute );
- sysRoot.modifyAttributes( "", new ModificationItemImpl[]
+ ModificationItem item = new ModificationItem( DirContext.ADD_ATTRIBUTE, attribute );
+ sysRoot.modifyAttributes( "", new ModificationItem[]
{ item } );
}