directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r379013 [44/45] - in /directory/trunks/apacheds: ./ core-plugin/ core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/ core-plugin/src/test/java/org/apache/directory/server/core/tools/schema/ core-shared/ core-shared/src/...
Date Mon, 20 Feb 2006 03:58:21 GMT
Modified: directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/MiscTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/MiscTest.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/MiscTest.java (original)
+++ directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/MiscTest.java Sun Feb 19 19:57:02 2006
@@ -41,7 +41,7 @@
  * A set of miscellanous tests.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev: 375632 $
+ * @version $Rev$
  */
 public class MiscTest extends AbstractServerTest
 {
@@ -84,12 +84,12 @@
             partition.setIndexedAttributes( Collections.singleton( "dc" ) );
             partitions.add( partition );
             configuration.setContextPartitionConfigurations( partitions );
-	}
+        }
         else if ( this.getName().equals( "testAnonymousBindsEnabledBaseSearch" ) )
         {
             // allow anonymous access
             configuration.setAllowAnonymousAccess( true );
-            
+
             // create a partition to search
             Set partitions = new HashSet();
             partitions.addAll( configuration.getContextPartitionConfigurations() );
@@ -106,7 +106,6 @@
             partitions.add( partition );
             configuration.setContextPartitionConfigurations( partitions );
         }
- 
 
         super.setUp();
     }
@@ -129,18 +128,18 @@
         env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
 
         boolean connected = false;
-        while( ! connected )
+        while ( !connected )
         {
             try
             {
                 ic = new InitialDirContext( env );
                 connected = true;
             }
-            catch( Exception e )
+            catch ( Exception e )
             {
             }
         }
-        
+
         try
         {
             ic.search( "", "(objectClass=*)", new SearchControls() );
@@ -160,7 +159,7 @@
         {
             ic.createSubcontext( "ou=blah", attrs );
         }
-        catch( NoPermissionException e )
+        catch ( NoPermissionException e )
         {
         }
     }
@@ -198,6 +197,7 @@
         assertEquals( "", result.getName().trim() );
     }
 
+
     /**
      * Test to make sure that if anonymous binds are allowed a user may search 
      * within a a partition.
@@ -227,9 +227,10 @@
         list.close();
 
         assertNotNull( result );
-        assertNotNull( result.getAttributes().get("dc") );
+        assertNotNull( result.getAttributes().get( "dc" ) );
     }
 
+
     /**
      * Reproduces the problem with
      * <a href="http://issues.apache.org/jira/browse/DIREVE-239">DIREVE-239</a>.
@@ -243,7 +244,7 @@
         final Hashtable env = new Hashtable();
 
         env.put( Context.PROVIDER_URL, "ldap://localhost:" + port );
-        env.put("java.naming.ldap.version", "3");
+        env.put( "java.naming.ldap.version", "3" );
         env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
 
         Attributes attributes = new BasicAttributes();
@@ -256,7 +257,8 @@
         ctx.createSubcontext( "ou=blah,ou=system", attributes );
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.OBJECT_SCOPE );
-        controls.setReturningAttributes( new String[] { "+" } );
+        controls.setReturningAttributes( new String[]
+            { "+" } );
         NamingEnumeration list = ctx.search( "ou=blah,ou=system", "(objectClass=*)", controls );
         SearchResult result = ( SearchResult ) list.next();
         list.close();
@@ -278,7 +280,7 @@
         final Hashtable env = new Hashtable();
 
         env.put( Context.PROVIDER_URL, "ldap://localhost:" + port + "/dc=aPache,dc=org" );
-        env.put("java.naming.ldap.version", "3");
+        env.put( "java.naming.ldap.version", "3" );
         env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
         InitialDirContext ctx = new InitialDirContext( env );
         Attributes attrs = ctx.getAttributes( "" );
@@ -332,8 +334,8 @@
         assertNotNull( e );
         assertFalse( e.getClass().equals( EmptyEnumeration.class ) );
     }
-    
-    
+
+
     public void testFailureWithUnsupportedControl() throws Exception
     {
         Control unsupported = new Control()
@@ -341,39 +343,47 @@
             boolean isCritical = true;
             private static final long serialVersionUID = 1L;
 
+
             public String getType()
             {
                 return "1.1.1.1";
             }
 
-            public void setType(String oid)
+
+            public void setType( String oid )
             {
             }
 
+
             public byte[] getValue()
             {
                 return new byte[0];
             }
 
-            public void setValue(byte[] value)
+
+            public void setValue( byte[] value )
             {
             }
 
+
             public boolean isCritical()
             {
                 return isCritical;
             }
 
-            public void setCritical(boolean isCritical)
+
+            public void setCritical( boolean isCritical )
             {
                 this.isCritical = isCritical;
             }
 
+
             public String getID()
             {
                 return "1.1.1.1";
             }
 
+
             public byte[] getEncodedValue()
             {
                 return new byte[0];
@@ -382,7 +392,7 @@
         final Hashtable env = new Hashtable();
 
         env.put( Context.PROVIDER_URL, "ldap://localhost:" + port + "/ou=system" );
-        env.put("java.naming.ldap.version", "3");
+        env.put( "java.naming.ldap.version", "3" );
         env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
         env.put( Context.SECURITY_AUTHENTICATION, "simple" );
         env.put( Context.SECURITY_CREDENTIALS, "secret" );
@@ -398,18 +408,21 @@
         user.put( oc );
         user.put( "sn", "Bush" );
         user.put( "userPassword", "Aerial" );
-        ctx.setRequestControls( new Control[] { unsupported } );
-        
+        ctx.setRequestControls( new Control[]
+            { unsupported } );
+
         try
         {
             ctx.createSubcontext( "cn=Kate Bush", user );
         }
-        catch( OperationNotSupportedException e ) {}
-        
+        catch ( OperationNotSupportedException e )
+        {
+        }
+
         unsupported.setCritical( false );
         DirContext kate = ctx.createSubcontext( "cn=Kate Bush", user );
         assertNotNull( kate );
-        assertTrue( ArrayUtils.isEquals( Asn1StringUtils.getBytesUtf8( "Aerial" ), 
-            kate.getAttributes( "" ).get( "userPassword" ).get() ) );
+        assertTrue( ArrayUtils.isEquals( Asn1StringUtils.getBytesUtf8( "Aerial" ), kate.getAttributes( "" ).get(
+            "userPassword" ).get() ) );
     }
 }

Propchange: directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/MiscTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/MiscTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyAddTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyAddTest.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyAddTest.java (original)
+++ directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyAddTest.java Sun Feb 19 19:57:02 2006
@@ -15,6 +15,7 @@
  */
 package org.apache.directory.server;
 
+
 import java.util.Hashtable;
 
 import javax.naming.NamingException;
@@ -45,25 +46,25 @@
     private LdapContext ctx = null;
     public static final String RDN = "cn=Tori Amos";
     public static final String PERSON_DESCRIPTION = "an American singer-songwriter";
-    
-    
+
 
     /**
      * Creation of required attributes of a person entry.
      */
-    protected Attributes getPersonAttributes(String sn, String cn)
+    protected Attributes getPersonAttributes( String sn, String cn )
     {
         Attributes attributes = new BasicAttributes();
-        Attribute attribute = new BasicAttribute("objectClass");
-        attribute.add("top");
-        attribute.add("person");
-        attributes.put(attribute);
-        attributes.put("cn", cn);
-        attributes.put("sn", sn);
+        Attribute attribute = new BasicAttribute( "objectClass" );
+        attribute.add( "top" );
+        attribute.add( "person" );
+        attributes.put( attribute );
+        attributes.put( "cn", cn );
+        attributes.put( "sn", sn );
 
         return attributes;
     }
 
+
     /**
      * Create context and a person entry.
      */
@@ -72,33 +73,35 @@
         super.setUp();
 
         Hashtable env = new Hashtable();
-        env.put("java.naming.factory.initial", "com.sun.jndi.ldap.LdapCtxFactory");
-        env.put("java.naming.provider.url", "ldap://localhost:" + port + "/ou=system");
-        env.put("java.naming.security.principal", "uid=admin,ou=system");
-        env.put("java.naming.security.credentials", "secret");
-        env.put("java.naming.security.authentication", "simple");
+        env.put( "java.naming.factory.initial", "com.sun.jndi.ldap.LdapCtxFactory" );
+        env.put( "java.naming.provider.url", "ldap://localhost:" + port + "/ou=system" );
+        env.put( "java.naming.security.principal", "uid=admin,ou=system" );
+        env.put( "java.naming.security.credentials", "secret" );
+        env.put( "java.naming.security.authentication", "simple" );
 
-        ctx = new InitialLdapContext(env, null);
-        assertNotNull(ctx);
+        ctx = new InitialLdapContext( env, null );
+        assertNotNull( ctx );
 
         // Create a person with description
-        Attributes attributes = this.getPersonAttributes("Amos", "Tori Amos");
-        attributes.put("description", "an American singer-songwriter");
-        ctx.createSubcontext(RDN, attributes);
+        Attributes attributes = this.getPersonAttributes( "Amos", "Tori Amos" );
+        attributes.put( "description", "an American singer-songwriter" );
+        ctx.createSubcontext( RDN, attributes );
 
     }
 
+
     /**
      * Remove person entry and close context.
      */
     public void tearDown() throws Exception
     {
-        ctx.unbind(RDN);
+        ctx.unbind( RDN );
         ctx.close();
         ctx = null;
         super.tearDown();
     }
 
+
     /**
      * Add a new attribute to a person entry.
      * 
@@ -109,17 +112,18 @@
 
         // Add telephoneNumber attribute
         String newValue = "1234567890";
-        Attributes attrs = new BasicAttributes("telephoneNumber", newValue);
-        ctx.modifyAttributes(RDN, DirContext.ADD_ATTRIBUTE, attrs);
+        Attributes attrs = new BasicAttributes( "telephoneNumber", newValue );
+        ctx.modifyAttributes( RDN, DirContext.ADD_ATTRIBUTE, attrs );
 
         // Verify, that attribute value is added
-        attrs = ctx.getAttributes(RDN);
-        Attribute attr = attrs.get("telephoneNumber");
-        assertNotNull(attr);
-        assertTrue(attr.contains(newValue));
-        assertEquals(1, attr.size());
+        attrs = ctx.getAttributes( RDN );
+        Attribute attr = attrs.get( "telephoneNumber" );
+        assertNotNull( attr );
+        assertTrue( attr.contains( newValue ) );
+        assertEquals( 1, attr.size() );
     }
 
+
     /**
      * Add a new attribute with two values.
      * 
@@ -129,23 +133,25 @@
     {
 
         // Add telephoneNumber attribute
-        String[] newValues = { "1234567890", "999999999" };
-        Attribute attr = new BasicAttribute("telephoneNumber");
-        attr.add(newValues[0]);
-        attr.add(newValues[1]);
+        String[] newValues =
+            { "1234567890", "999999999" };
+        Attribute attr = new BasicAttribute( "telephoneNumber" );
+        attr.add( newValues[0] );
+        attr.add( newValues[1] );
         Attributes attrs = new BasicAttributes();
-        attrs.put(attr);
-        ctx.modifyAttributes(RDN, DirContext.ADD_ATTRIBUTE, attrs);
+        attrs.put( attr );
+        ctx.modifyAttributes( RDN, DirContext.ADD_ATTRIBUTE, attrs );
 
         // Verify, that attribute values are present
-        attrs = ctx.getAttributes(RDN);
-        attr = attrs.get("telephoneNumber");
-        assertNotNull(attr);
-        assertTrue(attr.contains(newValues[0]));
-        assertTrue(attr.contains(newValues[1]));
-        assertEquals(newValues.length, attr.size());
+        attrs = ctx.getAttributes( RDN );
+        attr = attrs.get( "telephoneNumber" );
+        assertNotNull( attr );
+        assertTrue( attr.contains( newValues[0] ) );
+        assertTrue( attr.contains( newValues[1] ) );
+        assertEquals( newValues.length, attr.size() );
     }
 
+
     /**
      * Add an additional value.
      * 
@@ -156,20 +162,21 @@
 
         // A new description attribute value
         String newValue = "A new description for this person";
-        assertFalse(newValue.equals(PERSON_DESCRIPTION));
-        Attributes attrs = new BasicAttributes("description", newValue);
+        assertFalse( newValue.equals( PERSON_DESCRIPTION ) );
+        Attributes attrs = new BasicAttributes( "description", newValue );
 
-        ctx.modifyAttributes(RDN, DirContext.ADD_ATTRIBUTE, attrs);
+        ctx.modifyAttributes( RDN, DirContext.ADD_ATTRIBUTE, attrs );
 
         // Verify, that attribute value is added
-        attrs = ctx.getAttributes(RDN);
-        Attribute attr = attrs.get("description");
-        assertNotNull(attr);
-        assertTrue(attr.contains(newValue));
-        assertTrue(attr.contains(PERSON_DESCRIPTION));
-        assertEquals(2, attr.size());
+        attrs = ctx.getAttributes( RDN );
+        Attribute attr = attrs.get( "description" );
+        assertNotNull( attr );
+        assertTrue( attr.contains( newValue ) );
+        assertTrue( attr.contains( PERSON_DESCRIPTION ) );
+        assertEquals( 2, attr.size() );
     }
 
+
     /**
      * Try to add an already existing attribute value.
      * 
@@ -184,25 +191,26 @@
     {
 
         // Change description attribute
-        Attributes attrs = new BasicAttributes("description", PERSON_DESCRIPTION);
+        Attributes attrs = new BasicAttributes( "description", PERSON_DESCRIPTION );
         try
         {
-            ctx.modifyAttributes(RDN, DirContext.ADD_ATTRIBUTE, attrs);
-            fail("Adding an already existing atribute value should fail.");
+            ctx.modifyAttributes( RDN, DirContext.ADD_ATTRIBUTE, attrs );
+            fail( "Adding an already existing atribute value should fail." );
         }
-        catch (AttributeInUseException e)
+        catch ( AttributeInUseException e )
         {
             // expected behaviour
         }
 
         // Verify, that attribute is still there, and is the only one
-        attrs = ctx.getAttributes(RDN);
-        Attribute attr = attrs.get("description");
-        assertNotNull(attr);
-        assertTrue(attr.contains(PERSON_DESCRIPTION));
-        assertEquals(1, attr.size());
+        attrs = ctx.getAttributes( RDN );
+        Attribute attr = attrs.get( "description" );
+        assertNotNull( attr );
+        assertTrue( attr.contains( PERSON_DESCRIPTION ) );
+        assertEquals( 1, attr.size() );
     }
 
+
     /**
      * Try to add a duplicate attribute value to an entry, where this attribute
      * is already present (objectclass in this case). Expected behaviour is that
@@ -214,23 +222,28 @@
     public void testAddDuplicateValueToExistingAttribute() throws NamingException
     {
         // modify object classes, add a new value twice
-        Attribute ocls = new BasicAttribute("objectClass", "organizationalPerson");
+        Attribute ocls = new BasicAttribute( "objectClass", "organizationalPerson" );
         ModificationItem[] modItems = new ModificationItem[2];
-        modItems[0] = new ModificationItem(DirContext.ADD_ATTRIBUTE, ocls);
-        modItems[1] = new ModificationItem(DirContext.ADD_ATTRIBUTE, ocls);
-        try {
-            ctx.modifyAttributes(RDN, modItems);
-            fail("Adding a duplicate attribute value should cause an error.");
-        } catch (AttributeInUseException ex) {}
+        modItems[0] = new ModificationItem( DirContext.ADD_ATTRIBUTE, ocls );
+        modItems[1] = new ModificationItem( DirContext.ADD_ATTRIBUTE, ocls );
+        try
+        {
+            ctx.modifyAttributes( RDN, modItems );
+            fail( "Adding a duplicate attribute value should cause an error." );
+        }
+        catch ( AttributeInUseException ex )
+        {
+        }
 
         // Check, whether attribute objectClass is unchanged
-        Attributes attrs = ctx.getAttributes(RDN);
-        ocls = attrs.get("objectClass");
-        assertEquals(ocls.size(), 2);
-        assertTrue(ocls.contains("top"));
-        assertTrue(ocls.contains("person"));
+        Attributes attrs = ctx.getAttributes( RDN );
+        ocls = attrs.get( "objectClass" );
+        assertEquals( ocls.size(), 2 );
+        assertTrue( ocls.contains( "top" ) );
+        assertTrue( ocls.contains( "person" ) );
     }
 
+
     /**
      * Try to add a duplicate attribute value to an entry, where this attribute
      * is not present. Expected behaviour is that the modify operation causes an
@@ -241,20 +254,25 @@
     public void testAddDuplicateValueToNewAttribute() throws NamingException
     {
         // add the same description value twice
-        Attribute desc = new BasicAttribute("description", "another description value besides songwriter");
+        Attribute desc = new BasicAttribute( "description", "another description value besides songwriter" );
         ModificationItem[] modItems = new ModificationItem[2];
-        modItems[0] = new ModificationItem(DirContext.ADD_ATTRIBUTE, desc);
-        modItems[1] = new ModificationItem(DirContext.ADD_ATTRIBUTE, desc);
-        try {
-            ctx.modifyAttributes(RDN, modItems);
-            fail("Adding a duplicate attribute value should cause an error.");
-        } catch (AttributeInUseException ex) {}
+        modItems[0] = new ModificationItem( DirContext.ADD_ATTRIBUTE, desc );
+        modItems[1] = new ModificationItem( DirContext.ADD_ATTRIBUTE, desc );
+        try
+        {
+            ctx.modifyAttributes( RDN, modItems );
+            fail( "Adding a duplicate attribute value should cause an error." );
+        }
+        catch ( AttributeInUseException ex )
+        {
+        }
 
         // Check, whether attribute description is still not present
-        Attributes attrs = ctx.getAttributes(RDN);
-        assertEquals( 1, attrs.get("description").size() );
+        Attributes attrs = ctx.getAttributes( RDN );
+        assertEquals( 1, attrs.get( "description" ).size() );
     }
-    
+
+
     /**
      * Create an entry with a bad attribute : this should fail.
      * 
@@ -263,32 +281,33 @@
     public void testAddUnexistingAttribute() throws NamingException
     {
         Hashtable env = new Hashtable();
-        env.put("java.naming.factory.initial", "com.sun.jndi.ldap.LdapCtxFactory");
-        env.put("java.naming.provider.url", "ldap://localhost:" + port + "/ou=system");
-        env.put("java.naming.security.principal", "uid=admin,ou=system");
-        env.put("java.naming.security.credentials", "secret");
-        env.put("java.naming.security.authentication", "simple");
-
-        ctx = new InitialLdapContext(env, null);
-        assertNotNull(ctx);
-    
+        env.put( "java.naming.factory.initial", "com.sun.jndi.ldap.LdapCtxFactory" );
+        env.put( "java.naming.provider.url", "ldap://localhost:" + port + "/ou=system" );
+        env.put( "java.naming.security.principal", "uid=admin,ou=system" );
+        env.put( "java.naming.security.credentials", "secret" );
+        env.put( "java.naming.security.authentication", "simple" );
+
+        ctx = new InitialLdapContext( env, null );
+        assertNotNull( ctx );
+
         // Create a third person with a voice attribute
-        Attributes attributes = this.getPersonAttributes("Jackson", "Michael Jackson");
-        attributes.put("voice", "He is bad ...");
-        
+        Attributes attributes = this.getPersonAttributes( "Jackson", "Michael Jackson" );
+        attributes.put( "voice", "He is bad ..." );
+
         try
         {
-        ctx.createSubcontext( "cn=Mickael Jackson", attributes);
+            ctx.createSubcontext( "cn=Mickael Jackson", attributes );
         }
-        catch ( InvalidAttributeIdentifierException iaie)
+        catch ( InvalidAttributeIdentifierException iaie )
         {
             assertTrue( true );
             return;
         }
-        
+
         fail( "Should never reach this point" );
     }
 
+
     /**
      * Modu=ify the entry with a bad attribute : this should fail 
      * 
@@ -299,18 +318,18 @@
         // Add a not existing attribute
         String newValue = "unbelievable";
         Attributes attrs = new BasicAttributes( "voice", newValue );
-        
+
         try
         {
             ctx.modifyAttributes( RDN, DirContext.ADD_ATTRIBUTE, attrs );
         }
-        catch (InvalidAttributeIdentifierException iaie )
+        catch ( InvalidAttributeIdentifierException iaie )
         {
             // We have a failure : the attribute is unknown in the schema
             assertTrue( true );
             return;
         }
-        
+
         fail( "Cannot reach this point" );
     }
 }

Propchange: directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyAddTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyAddTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyRdnTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyRdnTest.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyRdnTest.java (original)
+++ directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyRdnTest.java Sun Feb 19 19:57:02 2006
@@ -1,277 +1,299 @@
-/*
- *   Copyright 2004 The Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-package org.apache.directory.server;
-
-import java.util.Hashtable;
-
-import javax.naming.NameNotFoundException;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttribute;
-import javax.naming.directory.BasicAttributes;
-import javax.naming.directory.DirContext;
-import javax.naming.ldap.InitialLdapContext;
-import javax.naming.ldap.LdapContext;
-
-import org.apache.directory.server.unit.AbstractServerTest;
-
-
-/**
- * Testcase with different modify DN operations on a person entry.
- * Originally created to demonstrate DIREVE-173.
- * 
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
- */
-public class ModifyRdnTest extends AbstractServerTest
-{
-
-    private LdapContext ctx = null;
-
-    /**
-     * Create attributes for a person entry.
-     */
-    protected Attributes getPersonAttributes(String sn, String cn)
-    {
-        Attributes attributes = new BasicAttributes();
-        Attribute attribute = new BasicAttribute("objectClass");
-        attribute.add("top");
-        attribute.add("person");
-        attributes.put(attribute);
-        attributes.put("cn", cn);
-        attributes.put("sn", sn);
-        attributes.put("description", cn + " is a person.");
-
-        return attributes;
-    }
-
-    /**
-     * Create context
-     */
-    public void setUp() throws Exception
-    {
-        super.setUp();
-
-        Hashtable env = new Hashtable();
-        env.put("java.naming.factory.initial", "com.sun.jndi.ldap.LdapCtxFactory");
-        env.put("java.naming.provider.url", "ldap://localhost:" + port + "/ou=system" ); 
-        env.put("java.naming.security.principal", "uid=admin,ou=system" ); 
-        env.put("java.naming.security.credentials", "secret" );
-        env.put("java.naming.security.authentication", "simple");
-        ctx = new InitialLdapContext(env, null);
-        assertNotNull(ctx);
-    }
-
-    /**
-     * Close context
-     */
-    public void tearDown() throws Exception
-    {
-        ctx.close();
-        ctx = null;
-
-        super.tearDown();
-    }
-
-    /**
-     * Just a little test to check wether opening the connection succeeds.
-     */
-    public void testSetUpTearDown() throws NamingException
-    {
-        assertNotNull(ctx);
-    }
-
-    /**
-     * Modify Rdn of an entry, delete its old rdn value.
-     * 
-     * @throws NamingException
-     */
-    public void testModifyRdnAndDeleteOld() throws NamingException
-    {
-        // Create a person, cn value is rdn
-        String oldCn = "Myra Ellen Amos";
-        String oldRdn = "cn=" + oldCn;
-        Attributes attributes = this.getPersonAttributes("Amos", oldCn);
-        ctx.createSubcontext(oldRdn, attributes);
-
-        // modify Rdn
-        String newCn = "Tori Amos";
-        String newRdn = "cn=" + newCn;
-        ctx.addToEnvironment("java.naming.ldap.deleteRDN", "true");
-        ctx.rename(oldRdn, newRdn);
-
-        // Check, whether old Entry does not exists
-        try {
-            ctx.lookup(oldRdn);
-            fail("Entry must not exist");
-        } catch (NameNotFoundException ignored) {
-            // expected behaviour
-            assertTrue(true);
-        }
-
-        // Check, whether new Entry exists
-        DirContext tori = (DirContext) ctx.lookup(newRdn);
-        assertNotNull(tori);
-
-        // Check values of cn
-        Attribute cn = tori.getAttributes("").get("cn");
-        assertTrue(cn.contains(newCn));
-        assertTrue(!cn.contains(oldCn)); // old value is gone
-        assertEquals(1, cn.size());
-
-        // Remove entry (use new rdn)
-        ctx.unbind(newRdn);
-    }
-
-    /**
-     * Modify Rdn of an entry, keep its old rdn value.
-     * 
-     * @throws NamingException
-     */
-    public void testModifyRdnAndKeepOld() throws NamingException
-    {
-        // Create a person, cn value is rdn
-        String oldCn = "Myra Ellen Amos";
-        String oldRdn = "cn=" + oldCn;
-        Attributes attributes = this.getPersonAttributes("Amos", oldCn);
-        ctx.createSubcontext(oldRdn, attributes);
-
-        // modify Rdn
-        String newCn = "Tori Amos";
-        String newRdn = "cn=" + newCn;
-        ctx.addToEnvironment("java.naming.ldap.deleteRDN", "false");
-        ctx.rename(oldRdn, newRdn);
-
-        // Check, whether old entry does not exist
-        try {
-            ctx.lookup(oldRdn);
-            fail("Entry must not exist");
-        } catch (NameNotFoundException ignored) {
-            // expected behaviour
-            assertTrue(true);
-        }
-
-        // Check, whether new entry exists
-        DirContext tori = (DirContext) ctx.lookup(newRdn);
-        assertNotNull(tori);
-
-        // Check values of cn
-        Attribute cn = tori.getAttributes("").get("cn");
-        assertTrue(cn.contains(newCn));
-        assertTrue(cn.contains(oldCn)); // old value is still there
-        assertEquals(2, cn.size());
-
-        // Remove entry (use new rdn)
-        ctx.unbind(newRdn);
-    }
-
-    /**
-     * Modify Rdn of an entry, delete its old rdn value. Here, the rdn attribute
-     * cn has another value as well.
-     * 
-     * @throws NamingException
-     */
-    public void testModifyRdnAndDeleteOldVariant() throws NamingException
-    {
-        // Create a person, cn value is rdn
-        String oldCn = "Myra Ellen Amos";
-        String oldRdn = "cn=" + oldCn;
-        Attributes attributes = this.getPersonAttributes("Amos", oldCn);
-
-        // add a second cn value
-        String alternateCn = "Myra E. Amos";
-        Attribute cn = attributes.get("cn");
-        cn.add(alternateCn);
-        assertEquals(2, cn.size());
-
-        ctx.createSubcontext(oldRdn, attributes);
-
-        // modify Rdn
-        String newCn = "Tori Amos";
-        String newRdn = "cn=" + newCn;
-        ctx.addToEnvironment("java.naming.ldap.deleteRDN", "true");
-        ctx.rename(oldRdn, newRdn);
-
-        // Check, whether old Entry does not exist anymore
-        try {
-            ctx.lookup(oldRdn);
-            fail("Entry must not exist");
-        } catch (NameNotFoundException ignored) {
-            // expected behaviour
-            assertTrue(true);
-        }
-
-        // Check, whether new Entry exists
-        DirContext tori = (DirContext) ctx.lookup(newRdn);
-        assertNotNull(tori);
-
-        // Check values of cn
-        cn = tori.getAttributes("").get("cn");
-        assertTrue(cn.contains(newCn));
-        assertTrue(!cn.contains(oldCn)); // old value is gone
-        assertTrue(cn.contains(alternateCn)); // alternate value is still available
-        assertEquals(2, cn.size());
-
-        // Remove entry (use new rdn)
-        ctx.unbind(newRdn);
-    }
-    
-    /**
-     * Modify DN of an entry, changing RDN from cn to sn.
-     * 
-     * @throws NamingException
-     */
-    public void testModifyRdnDifferentAttribute() throws NamingException {
-
-        // Create a person, cn value is rdn
-        String cnVal = "Tori Amos";
-        String snVal = "Amos";
-        String oldRdn = "cn=" + cnVal;
-        Attributes attributes = this.getPersonAttributes(snVal, cnVal);
-        ctx.createSubcontext(oldRdn, attributes);
-
-        // modify Rdn from cn=... to sn=...
-        String newRdn = "sn=" + snVal;
-        ctx.addToEnvironment("java.naming.ldap.deleteRDN", "false");
-        ctx.rename(oldRdn, newRdn);
-
-        // Check, whether old Entry does not exists
-        try {
-            ctx.lookup(oldRdn);
-            fail("Entry must not exist");
-        } catch (NameNotFoundException ignored) {
-            // expected behaviour
-        }
-
-        // Check, whether new Entry exists
-        DirContext tori = (DirContext) ctx.lookup(newRdn);
-        assertNotNull(tori);
-
-        // Check values of cn and sn
-        // especially the number of cn and sn occurences
-        Attribute cn = tori.getAttributes("").get("cn");
-        assertTrue(cn.contains(cnVal));
-        assertEquals("Number of cn occurences", 1, cn.size());
-        Attribute sn = tori.getAttributes("").get("sn");
-        assertTrue(sn.contains(snVal));
-        assertEquals("Number of sn occurences", 1, sn.size());
-        
-        // Remove entry (use new rdn)
-        ctx.unbind(newRdn);
-    }
-}
+/*
+ *   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+package org.apache.directory.server;
+
+
+import java.util.Hashtable;
+
+import javax.naming.NameNotFoundException;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.BasicAttribute;
+import javax.naming.directory.BasicAttributes;
+import javax.naming.directory.DirContext;
+import javax.naming.ldap.InitialLdapContext;
+import javax.naming.ldap.LdapContext;
+
+import org.apache.directory.server.unit.AbstractServerTest;
+
+
+/**
+ * Testcase with different modify DN operations on a person entry.
+ * Originally created to demonstrate DIREVE-173.
+ * 
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public class ModifyRdnTest extends AbstractServerTest
+{
+
+    private LdapContext ctx = null;
+
+
+    /**
+     * Create attributes for a person entry.
+     */
+    protected Attributes getPersonAttributes( String sn, String cn )
+    {
+        Attributes attributes = new BasicAttributes();
+        Attribute attribute = new BasicAttribute( "objectClass" );
+        attribute.add( "top" );
+        attribute.add( "person" );
+        attributes.put( attribute );
+        attributes.put( "cn", cn );
+        attributes.put( "sn", sn );
+        attributes.put( "description", cn + " is a person." );
+
+        return attributes;
+    }
+
+
+    /**
+     * Create context
+     */
+    public void setUp() throws Exception
+    {
+        super.setUp();
+
+        Hashtable env = new Hashtable();
+        env.put( "java.naming.factory.initial", "com.sun.jndi.ldap.LdapCtxFactory" );
+        env.put( "java.naming.provider.url", "ldap://localhost:" + port + "/ou=system" );
+        env.put( "java.naming.security.principal", "uid=admin,ou=system" );
+        env.put( "java.naming.security.credentials", "secret" );
+        env.put( "java.naming.security.authentication", "simple" );
+        ctx = new InitialLdapContext( env, null );
+        assertNotNull( ctx );
+    }
+
+
+    /**
+     * Close context
+     */
+    public void tearDown() throws Exception
+    {
+        ctx.close();
+        ctx = null;
+
+        super.tearDown();
+    }
+
+
+    /**
+     * Just a little test to check wether opening the connection succeeds.
+     */
+    public void testSetUpTearDown() throws NamingException
+    {
+        assertNotNull( ctx );
+    }
+
+
+    /**
+     * Modify Rdn of an entry, delete its old rdn value.
+     * 
+     * @throws NamingException
+     */
+    public void testModifyRdnAndDeleteOld() throws NamingException
+    {
+        // Create a person, cn value is rdn
+        String oldCn = "Myra Ellen Amos";
+        String oldRdn = "cn=" + oldCn;
+        Attributes attributes = this.getPersonAttributes( "Amos", oldCn );
+        ctx.createSubcontext( oldRdn, attributes );
+
+        // modify Rdn
+        String newCn = "Tori Amos";
+        String newRdn = "cn=" + newCn;
+        ctx.addToEnvironment( "java.naming.ldap.deleteRDN", "true" );
+        ctx.rename( oldRdn, newRdn );
+
+        // Check, whether old Entry does not exists
+        try
+        {
+            ctx.lookup( oldRdn );
+            fail( "Entry must not exist" );
+        }
+        catch ( NameNotFoundException ignored )
+        {
+            // expected behaviour
+            assertTrue( true );
+        }
+
+        // Check, whether new Entry exists
+        DirContext tori = ( DirContext ) ctx.lookup( newRdn );
+        assertNotNull( tori );
+
+        // Check values of cn
+        Attribute cn = tori.getAttributes( "" ).get( "cn" );
+        assertTrue( cn.contains( newCn ) );
+        assertTrue( !cn.contains( oldCn ) ); // old value is gone
+        assertEquals( 1, cn.size() );
+
+        // Remove entry (use new rdn)
+        ctx.unbind( newRdn );
+    }
+
+
+    /**
+     * Modify Rdn of an entry, keep its old rdn value.
+     * 
+     * @throws NamingException
+     */
+    public void testModifyRdnAndKeepOld() throws NamingException
+    {
+        // Create a person, cn value is rdn
+        String oldCn = "Myra Ellen Amos";
+        String oldRdn = "cn=" + oldCn;
+        Attributes attributes = this.getPersonAttributes( "Amos", oldCn );
+        ctx.createSubcontext( oldRdn, attributes );
+
+        // modify Rdn
+        String newCn = "Tori Amos";
+        String newRdn = "cn=" + newCn;
+        ctx.addToEnvironment( "java.naming.ldap.deleteRDN", "false" );
+        ctx.rename( oldRdn, newRdn );
+
+        // Check, whether old entry does not exist
+        try
+        {
+            ctx.lookup( oldRdn );
+            fail( "Entry must not exist" );
+        }
+        catch ( NameNotFoundException ignored )
+        {
+            // expected behaviour
+            assertTrue( true );
+        }
+
+        // Check, whether new entry exists
+        DirContext tori = ( DirContext ) ctx.lookup( newRdn );
+        assertNotNull( tori );
+
+        // Check values of cn
+        Attribute cn = tori.getAttributes( "" ).get( "cn" );
+        assertTrue( cn.contains( newCn ) );
+        assertTrue( cn.contains( oldCn ) ); // old value is still there
+        assertEquals( 2, cn.size() );
+
+        // Remove entry (use new rdn)
+        ctx.unbind( newRdn );
+    }
+
+
+    /**
+     * Modify Rdn of an entry, delete its old rdn value. Here, the rdn attribute
+     * cn has another value as well.
+     * 
+     * @throws NamingException
+     */
+    public void testModifyRdnAndDeleteOldVariant() throws NamingException
+    {
+        // Create a person, cn value is rdn
+        String oldCn = "Myra Ellen Amos";
+        String oldRdn = "cn=" + oldCn;
+        Attributes attributes = this.getPersonAttributes( "Amos", oldCn );
+
+        // add a second cn value
+        String alternateCn = "Myra E. Amos";
+        Attribute cn = attributes.get( "cn" );
+        cn.add( alternateCn );
+        assertEquals( 2, cn.size() );
+
+        ctx.createSubcontext( oldRdn, attributes );
+
+        // modify Rdn
+        String newCn = "Tori Amos";
+        String newRdn = "cn=" + newCn;
+        ctx.addToEnvironment( "java.naming.ldap.deleteRDN", "true" );
+        ctx.rename( oldRdn, newRdn );
+
+        // Check, whether old Entry does not exist anymore
+        try
+        {
+            ctx.lookup( oldRdn );
+            fail( "Entry must not exist" );
+        }
+        catch ( NameNotFoundException ignored )
+        {
+            // expected behaviour
+            assertTrue( true );
+        }
+
+        // Check, whether new Entry exists
+        DirContext tori = ( DirContext ) ctx.lookup( newRdn );
+        assertNotNull( tori );
+
+        // Check values of cn
+        cn = tori.getAttributes( "" ).get( "cn" );
+        assertTrue( cn.contains( newCn ) );
+        assertTrue( !cn.contains( oldCn ) ); // old value is gone
+        assertTrue( cn.contains( alternateCn ) ); // alternate value is still available
+        assertEquals( 2, cn.size() );
+
+        // Remove entry (use new rdn)
+        ctx.unbind( newRdn );
+    }
+
+
+    /**
+     * Modify DN of an entry, changing RDN from cn to sn.
+     * 
+     * @throws NamingException
+     */
+    public void testModifyRdnDifferentAttribute() throws NamingException
+    {
+
+        // Create a person, cn value is rdn
+        String cnVal = "Tori Amos";
+        String snVal = "Amos";
+        String oldRdn = "cn=" + cnVal;
+        Attributes attributes = this.getPersonAttributes( snVal, cnVal );
+        ctx.createSubcontext( oldRdn, attributes );
+
+        // modify Rdn from cn=... to sn=...
+        String newRdn = "sn=" + snVal;
+        ctx.addToEnvironment( "java.naming.ldap.deleteRDN", "false" );
+        ctx.rename( oldRdn, newRdn );
+
+        // Check, whether old Entry does not exists
+        try
+        {
+            ctx.lookup( oldRdn );
+            fail( "Entry must not exist" );
+        }
+        catch ( NameNotFoundException ignored )
+        {
+            // expected behaviour
+        }
+
+        // Check, whether new Entry exists
+        DirContext tori = ( DirContext ) ctx.lookup( newRdn );
+        assertNotNull( tori );
+
+        // Check values of cn and sn
+        // especially the number of cn and sn occurences
+        Attribute cn = tori.getAttributes( "" ).get( "cn" );
+        assertTrue( cn.contains( cnVal ) );
+        assertEquals( "Number of cn occurences", 1, cn.size() );
+        Attribute sn = tori.getAttributes( "" ).get( "sn" );
+        assertTrue( sn.contains( snVal ) );
+        assertEquals( "Number of sn occurences", 1, sn.size() );
+
+        // Remove entry (use new rdn)
+        ctx.unbind( newRdn );
+    }
+}

Propchange: directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyRdnTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyRdnTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyRemoveTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyRemoveTest.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyRemoveTest.java (original)
+++ directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyRemoveTest.java Sun Feb 19 19:57:02 2006
@@ -15,6 +15,7 @@
  */
 package org.apache.directory.server;
 
+
 import java.util.Hashtable;
 
 import javax.naming.NamingException;
@@ -46,22 +47,24 @@
 
     public static final String RDN = "cn=Tori Amos";
 
+
     /**
      * Creation of required attributes of a person entry.
      */
-    protected Attributes getPersonAttributes(String sn, String cn)
+    protected Attributes getPersonAttributes( String sn, String cn )
     {
         Attributes attributes = new BasicAttributes();
-        Attribute attribute = new BasicAttribute("objectClass");
-        attribute.add("top");
-        attribute.add("person");
-        attributes.put(attribute);
-        attributes.put("cn", cn);
-        attributes.put("sn", sn);
+        Attribute attribute = new BasicAttribute( "objectClass" );
+        attribute.add( "top" );
+        attribute.add( "person" );
+        attributes.put( attribute );
+        attributes.put( "cn", cn );
+        attributes.put( "sn", sn );
 
         return attributes;
     }
 
+
     /**
      * Create context and a person entry.
      */
@@ -70,44 +73,47 @@
         super.setUp();
 
         Hashtable env = new Hashtable();
-        env.put("java.naming.factory.initial", "com.sun.jndi.ldap.LdapCtxFactory");
-        env.put("java.naming.provider.url", "ldap://localhost:" + port + "/ou=system");
-        env.put("java.naming.security.principal", "uid=admin,ou=system");
-        env.put("java.naming.security.credentials", "secret");
-        env.put("java.naming.security.authentication", "simple");
+        env.put( "java.naming.factory.initial", "com.sun.jndi.ldap.LdapCtxFactory" );
+        env.put( "java.naming.provider.url", "ldap://localhost:" + port + "/ou=system" );
+        env.put( "java.naming.security.principal", "uid=admin,ou=system" );
+        env.put( "java.naming.security.credentials", "secret" );
+        env.put( "java.naming.security.authentication", "simple" );
 
-        ctx = new InitialLdapContext(env, null);
-        assertNotNull(ctx);
+        ctx = new InitialLdapContext( env, null );
+        assertNotNull( ctx );
 
         // Create a person with description
-        Attributes attributes = this.getPersonAttributes("Amos", "Tori Amos");
-        attributes.put("description", "an American singer-songwriter");
-        ctx.createSubcontext(RDN, attributes);
+        Attributes attributes = this.getPersonAttributes( "Amos", "Tori Amos" );
+        attributes.put( "description", "an American singer-songwriter" );
+        ctx.createSubcontext( RDN, attributes );
 
     }
 
+
     /**
      * Remove person entry and close context.
      */
     public void tearDown() throws Exception
     {
-        ctx.unbind(RDN);
+        ctx.unbind( RDN );
         ctx.close();
         ctx = null;
         super.tearDown();
     }
 
+
     /**
      * Just a little test to check wether opening the connection and creation of
      * the person succeeds succeeds.
      */
     public void testSetUpTearDown() throws NamingException
     {
-        assertNotNull(ctx);
-        DirContext tori = (DirContext) ctx.lookup(RDN);
-        assertNotNull(tori);
+        assertNotNull( ctx );
+        DirContext tori = ( DirContext ) ctx.lookup( RDN );
+        assertNotNull( tori );
     }
 
+
     /**
      * Remove an attribute, which is not required.
      * 
@@ -119,17 +125,18 @@
     public void testRemoveNotRequiredAttribute() throws NamingException
     {
         // Remove description Attribute
-        Attribute attr = new BasicAttribute("description");
+        Attribute attr = new BasicAttribute( "description" );
         Attributes attrs = new BasicAttributes();
-        attrs.put(attr);
-        ctx.modifyAttributes(RDN, DirContext.REMOVE_ATTRIBUTE, attrs);
+        attrs.put( attr );
+        ctx.modifyAttributes( RDN, DirContext.REMOVE_ATTRIBUTE, attrs );
 
         // Verify, that attribute is deleted
-        attrs = ctx.getAttributes(RDN);
-        attr = attrs.get("description");
-        assertNull(attr);
+        attrs = ctx.getAttributes( RDN );
+        attr = attrs.get( "description" );
+        assertNull( attr );
     }
 
+
     /**
      * Remove two not required attributes.
      * 
@@ -142,23 +149,24 @@
     {
 
         // add telephoneNumber to entry
-        Attributes tn = new BasicAttributes("telephoneNumber", "12345678");
-        ctx.modifyAttributes(RDN, DirContext.ADD_ATTRIBUTE, tn);
+        Attributes tn = new BasicAttributes( "telephoneNumber", "12345678" );
+        ctx.modifyAttributes( RDN, DirContext.ADD_ATTRIBUTE, tn );
 
         // Remove description and telephoneNumber to Attribute
         Attributes attrs = new BasicAttributes();
-        attrs.put(new BasicAttribute("description"));
-        attrs.put(new BasicAttribute("telephoneNumber"));
-        ctx.modifyAttributes(RDN, DirContext.REMOVE_ATTRIBUTE, attrs);
+        attrs.put( new BasicAttribute( "description" ) );
+        attrs.put( new BasicAttribute( "telephoneNumber" ) );
+        ctx.modifyAttributes( RDN, DirContext.REMOVE_ATTRIBUTE, attrs );
 
         // Verify, that attributes are deleted
-        attrs = ctx.getAttributes(RDN);
-        assertNull(attrs.get("description"));
-        assertNull(attrs.get("telephoneNumber"));
-        assertNotNull(attrs.get("cn"));
-        assertNotNull(attrs.get("sn"));
+        attrs = ctx.getAttributes( RDN );
+        assertNull( attrs.get( "description" ) );
+        assertNull( attrs.get( "telephoneNumber" ) );
+        assertNotNull( attrs.get( "cn" ) );
+        assertNotNull( attrs.get( "sn" ) );
     }
 
+
     /**
      * Remove a required attribute. The sn attribute of the person entry is used
      * here.
@@ -171,18 +179,22 @@
     {
 
         // Remove sn attribute
-        Attribute attr = new BasicAttribute("sn");
+        Attribute attr = new BasicAttribute( "sn" );
         Attributes attrs = new BasicAttributes();
-        attrs.put(attr);
+        attrs.put( attr );
 
-        try {
-            ctx.modifyAttributes(RDN, DirContext.REMOVE_ATTRIBUTE, attrs);
-            fail("Deletion of required attribute should fail.");
-        } catch (SchemaViolationException e) {
+        try
+        {
+            ctx.modifyAttributes( RDN, DirContext.REMOVE_ATTRIBUTE, attrs );
+            fail( "Deletion of required attribute should fail." );
+        }
+        catch ( SchemaViolationException e )
+        {
             // expected behaviour
         }
     }
 
+
     /**
      * Remove a required attribute from RDN.
      * 
@@ -194,18 +206,22 @@
     {
 
         // Remove sn attribute
-        Attribute attr = new BasicAttribute("cn");
+        Attribute attr = new BasicAttribute( "cn" );
         Attributes attrs = new BasicAttributes();
-        attrs.put(attr);
+        attrs.put( attr );
 
-        try {
-            ctx.modifyAttributes(RDN, DirContext.REMOVE_ATTRIBUTE, attrs);
-            fail("Deletion of RDN attribute should fail.");
-        } catch (SchemaViolationException e) {
+        try
+        {
+            ctx.modifyAttributes( RDN, DirContext.REMOVE_ATTRIBUTE, attrs );
+            fail( "Deletion of RDN attribute should fail." );
+        }
+        catch ( SchemaViolationException e )
+        {
             // expected behaviour
         }
     }
 
+
     /**
      * Remove a not required attribute from RDN.
      * 
@@ -218,26 +234,30 @@
 
         // Change RDN to another attribute
         String newRdn = "description=an American singer-songwriter";
-        ctx.addToEnvironment("java.naming.ldap.deleteRDN", "false");
-        ctx.rename(RDN, newRdn);
+        ctx.addToEnvironment( "java.naming.ldap.deleteRDN", "false" );
+        ctx.rename( RDN, newRdn );
 
         // Remove description, which is now RDN attribute
-        Attribute attr = new BasicAttribute("description");
+        Attribute attr = new BasicAttribute( "description" );
         Attributes attrs = new BasicAttributes();
-        attrs.put(attr);
+        attrs.put( attr );
 
-        try {
-            ctx.modifyAttributes(newRdn, DirContext.REMOVE_ATTRIBUTE, attrs);
-            fail("Deletion of RDN attribute should fail.");
-        } catch (SchemaViolationException e) {
+        try
+        {
+            ctx.modifyAttributes( newRdn, DirContext.REMOVE_ATTRIBUTE, attrs );
+            fail( "Deletion of RDN attribute should fail." );
+        }
+        catch ( SchemaViolationException e )
+        {
             // expected behaviour
         }
 
         // Change RDN back to original
-        ctx.addToEnvironment("java.naming.ldap.deleteRDN", "false");
-        ctx.rename(newRdn, RDN);
+        ctx.addToEnvironment( "java.naming.ldap.deleteRDN", "false" );
+        ctx.rename( newRdn, RDN );
     }
 
+
     /**
      * Remove a an attribute which is not present on the entry, but in the
      * schema.
@@ -250,18 +270,22 @@
     {
 
         // Remove telephoneNumber Attribute
-        Attribute attr = new BasicAttribute("telephoneNumber");
+        Attribute attr = new BasicAttribute( "telephoneNumber" );
         Attributes attrs = new BasicAttributes();
-        attrs.put(attr);
+        attrs.put( attr );
 
-        try {
-            ctx.modifyAttributes(RDN, DirContext.REMOVE_ATTRIBUTE, attrs);
-            fail("Deletion of attribute, which is not present in the entry, should fail.");
-        } catch (NoSuchAttributeException e) {
+        try
+        {
+            ctx.modifyAttributes( RDN, DirContext.REMOVE_ATTRIBUTE, attrs );
+            fail( "Deletion of attribute, which is not present in the entry, should fail." );
+        }
+        catch ( NoSuchAttributeException e )
+        {
             // expected behaviour
         }
     }
 
+
     /**
      * Remove a an attribute which is not present in the schema.
      * 
@@ -273,16 +297,21 @@
     {
 
         // Remove phantasy attribute
-        Attribute attr = new BasicAttribute("XXX");
+        Attribute attr = new BasicAttribute( "XXX" );
         Attributes attrs = new BasicAttributes();
-        attrs.put(attr);
+        attrs.put( attr );
 
-        try {
-            ctx.modifyAttributes(RDN, DirContext.REMOVE_ATTRIBUTE, attrs);
-            fail("Deletion of an invalid attribute should fail.");
-        } catch (NoSuchAttributeException e) {
+        try
+        {
+            ctx.modifyAttributes( RDN, DirContext.REMOVE_ATTRIBUTE, attrs );
+            fail( "Deletion of an invalid attribute should fail." );
+        }
+        catch ( NoSuchAttributeException e )
+        {
             // expected behaviour
-        } catch (InvalidAttributeIdentifierException e) {
+        }
+        catch ( InvalidAttributeIdentifierException e )
+        {
             // expected behaviour
         }
     }

Propchange: directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyRemoveTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/ModifyRemoveTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/PersistentSearchTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/PersistentSearchTest.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/PersistentSearchTest.java (original)
+++ directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/PersistentSearchTest.java Sun Feb 19 19:57:02 2006
@@ -61,7 +61,6 @@
     private LdapContext ctx = null;
 
 
-
     /**
      * Creation of required attributes of a person entry.
      */
@@ -115,7 +114,7 @@
             ctx = null;
             super.tearDown();
         }
-        catch( Throwable t )
+        catch ( Throwable t )
         {
         }
     }
@@ -129,15 +128,15 @@
         PSearchListener listener = new PSearchListener();
         Thread t = new Thread( listener, "PSearchListener" );
         t.start();
-        
-        while( ! listener.isReady )
+
+        while ( !listener.isReady )
         {
             Thread.sleep( 100 );
         }
         Thread.sleep( 250 );
 
-        ctx.modifyAttributes( RDN, DirContext.REMOVE_ATTRIBUTE, 
-            new BasicAttributes( "description", PERSON_DESCRIPTION, true ) );
+        ctx.modifyAttributes( RDN, DirContext.REMOVE_ATTRIBUTE, new BasicAttributes( "description", PERSON_DESCRIPTION,
+            true ) );
         long start = System.currentTimeMillis();
         while ( t.isAlive() )
         {
@@ -147,7 +146,7 @@
                 break;
             }
         }
-        
+
         assertNotNull( listener.result );
         // darn it getting normalized name back
         assertEquals( RDN.toLowerCase(), listener.result.getName().toLowerCase() );
@@ -162,15 +161,15 @@
         PSearchListener listener = new PSearchListener();
         Thread t = new Thread( listener );
         t.start();
-        
-        while( ! listener.isReady )
+
+        while ( !listener.isReady )
         {
             Thread.sleep( 100 );
         }
         Thread.sleep( 250 );
 
         ctx.rename( RDN, "cn=Jack Black" );
-        
+
         long start = System.currentTimeMillis();
         while ( t.isAlive() )
         {
@@ -180,13 +179,13 @@
                 break;
             }
         }
-        
+
         assertNotNull( listener.result );
         // darn it getting normalized name back
         assertEquals( "cn=Jack Black".toLowerCase(), listener.result.getName().toLowerCase() );
     }
 
-    
+
     /**
      * Shows correct notifications for delete(2) changes.
      */
@@ -195,15 +194,15 @@
         PSearchListener listener = new PSearchListener();
         Thread t = new Thread( listener );
         t.start();
-        
-        while( ! listener.isReady )
+
+        while ( !listener.isReady )
         {
             Thread.sleep( 100 );
         }
         Thread.sleep( 250 );
 
         ctx.destroySubcontext( RDN );
-        
+
         long start = System.currentTimeMillis();
         while ( t.isAlive() )
         {
@@ -213,13 +212,13 @@
                 break;
             }
         }
-        
+
         assertNotNull( listener.result );
         // darn it getting normalized name back
         assertEquals( RDN.toLowerCase(), listener.result.getName().toLowerCase() );
     }
 
-    
+
     /**
      * Shows correct notifications for add(1) changes.
      */
@@ -228,15 +227,15 @@
         PSearchListener listener = new PSearchListener();
         Thread t = new Thread( listener );
         t.start();
-        
-        while( ! listener.isReady )
+
+        while ( !listener.isReady )
         {
             Thread.sleep( 100 );
         }
         Thread.sleep( 250 );
 
         ctx.createSubcontext( "cn=Jack Black", getPersonAttributes( "Black", "Jack Black" ) );
-        
+
         long start = System.currentTimeMillis();
         while ( t.isAlive() )
         {
@@ -246,7 +245,7 @@
                 break;
             }
         }
-        
+
         assertNotNull( listener.result );
         // darn it getting normalized name back
         assertEquals( "cn=Jack Black".toLowerCase(), listener.result.getName().toLowerCase() );
@@ -264,15 +263,15 @@
         PSearchListener listener = new PSearchListener( control );
         Thread t = new Thread( listener, "PSearchListener" );
         t.start();
-        
-        while( ! listener.isReady )
+
+        while ( !listener.isReady )
         {
             Thread.sleep( 100 );
         }
         Thread.sleep( 250 );
 
-        ctx.modifyAttributes( RDN, DirContext.REMOVE_ATTRIBUTE, 
-            new BasicAttributes( "description", PERSON_DESCRIPTION, true ) );
+        ctx.modifyAttributes( RDN, DirContext.REMOVE_ATTRIBUTE, new BasicAttributes( "description", PERSON_DESCRIPTION,
+            true ) );
         long start = System.currentTimeMillis();
         while ( t.isAlive() )
         {
@@ -282,7 +281,7 @@
                 break;
             }
         }
-        
+
         assertNotNull( listener.result );
         // darn it getting normalized name back
         assertEquals( RDN.toLowerCase(), listener.result.getName().toLowerCase() );
@@ -301,15 +300,15 @@
         PSearchListener listener = new PSearchListener( control );
         Thread t = new Thread( listener );
         t.start();
-        
-        while( ! listener.isReady )
+
+        while ( !listener.isReady )
         {
             Thread.sleep( 100 );
         }
         Thread.sleep( 250 );
 
         ctx.rename( RDN, "cn=Jack Black" );
-        
+
         long start = System.currentTimeMillis();
         while ( t.isAlive() )
         {
@@ -319,7 +318,7 @@
                 break;
             }
         }
-        
+
         assertNotNull( listener.result );
         // darn it getting normalized name back
         assertEquals( "cn=Jack Black".toLowerCase(), listener.result.getName().toLowerCase() );
@@ -327,7 +326,7 @@
         assertEquals( ( RDN + ",ou=system" ).toLowerCase(), listener.result.control.getPreviousDn().toLowerCase() );
     }
 
-    
+
     /**
      * Shows correct notifications for delete(2) changes with returned 
      * EntryChangeControl.
@@ -339,15 +338,15 @@
         PSearchListener listener = new PSearchListener( control );
         Thread t = new Thread( listener );
         t.start();
-        
-        while( ! listener.isReady )
+
+        while ( !listener.isReady )
         {
             Thread.sleep( 100 );
         }
         Thread.sleep( 250 );
 
         ctx.destroySubcontext( RDN );
-        
+
         long start = System.currentTimeMillis();
         while ( t.isAlive() )
         {
@@ -357,14 +356,14 @@
                 break;
             }
         }
-        
+
         assertNotNull( listener.result );
         // darn it getting normalized name back
         assertEquals( RDN.toLowerCase(), listener.result.getName().toLowerCase() );
         assertEquals( listener.result.control.getChangeType(), ChangeType.DELETE );
     }
 
-    
+
     /**
      * Shows correct notifications for add(1) changes with returned 
      * EntryChangeControl.
@@ -376,15 +375,15 @@
         PSearchListener listener = new PSearchListener( control );
         Thread t = new Thread( listener );
         t.start();
-        
-        while( ! listener.isReady )
+
+        while ( !listener.isReady )
         {
             Thread.sleep( 100 );
         }
         Thread.sleep( 250 );
 
         ctx.createSubcontext( "cn=Jack Black", getPersonAttributes( "Black", "Jack Black" ) );
-        
+
         long start = System.currentTimeMillis();
         while ( t.isAlive() )
         {
@@ -394,14 +393,14 @@
                 break;
             }
         }
-        
+
         assertNotNull( listener.result );
         // darn it getting normalized name back
         assertEquals( "cn=Jack Black".toLowerCase(), listener.result.getName().toLowerCase() );
         assertEquals( listener.result.control.getChangeType(), ChangeType.ADD );
     }
 
-    
+
     /**
      * Shows correct notifications for only add(1) and modify(4) registered changes with returned 
      * EntryChangeControl.
@@ -415,15 +414,15 @@
         PSearchListener listener = new PSearchListener( control );
         Thread t = new Thread( listener );
         t.start();
-        
-        while( ! listener.isReady )
+
+        while ( !listener.isReady )
         {
             Thread.sleep( 100 );
         }
         Thread.sleep( 250 );
 
         ctx.createSubcontext( "cn=Jack Black", getPersonAttributes( "Black", "Jack Black" ) );
-        
+
         long start = System.currentTimeMillis();
         while ( t.isAlive() )
         {
@@ -433,7 +432,7 @@
                 break;
             }
         }
-        
+
         assertNotNull( listener.result );
         // darn it getting normalized name back
         assertEquals( "cn=Jack Black".toLowerCase(), listener.result.getName().toLowerCase() );
@@ -441,9 +440,9 @@
         listener.result = null;
         t = new Thread( listener );
         t.start();
-        
+
         ctx.destroySubcontext( "cn=Jack Black" );
-        
+
         start = System.currentTimeMillis();
         while ( t.isAlive() )
         {
@@ -457,8 +456,8 @@
         assertNull( listener.result );
 
         // thread is still waiting for notifications try a modify
-        ctx.modifyAttributes( RDN, DirContext.REMOVE_ATTRIBUTE, 
-            new BasicAttributes( "description", PERSON_DESCRIPTION, true ) );
+        ctx.modifyAttributes( RDN, DirContext.REMOVE_ATTRIBUTE, new BasicAttributes( "description", PERSON_DESCRIPTION,
+            true ) );
         start = System.currentTimeMillis();
         while ( t.isAlive() )
         {
@@ -468,13 +467,13 @@
                 break;
             }
         }
-        
+
         assertNotNull( listener.result );
         // darn it getting normalized name back
         assertEquals( RDN.toLowerCase(), listener.result.getName().toLowerCase() );
         assertEquals( listener.result.control.getChangeType(), ChangeType.MODIFY );
     }
-    
+
 
     /**
      * Shows correct notifications for add(1) changes with returned 
@@ -486,37 +485,36 @@
      * 
      * PLUS ALL THIS GARBAGE IS TIME DEPENDENT!!!!!
      */
-//    public void testPsearchAddWithECAndFalseChangesOnly() throws Exception
-//    {
-//        PersistentSearchControl control = new PersistentSearchControl();
-//        control.setReturnECs( true );
-//        control.setChangesOnly( false );
-//        PSearchListener listener = new PSearchListener( control );
-//        Thread t = new Thread( listener );
-//        t.start();
-//        
-//        Thread.sleep( 3000 );
-//
-//        assertEquals( 5, listener.count );
-//        ctx.createSubcontext( "cn=Jack Black", getPersonAttributes( "Black", "Jack Black" ) );
-//        
-//        long start = System.currentTimeMillis();
-//        while ( t.isAlive() )
-//        {
-//            Thread.sleep( 100 );
-//            if ( System.currentTimeMillis() - start > 3000 )
-//            {
-//                break;
-//            }
-//        }
-//        
-//        assertEquals( 6, listener.count );
-//        assertNotNull( listener.result );
-//        // darn it getting normalized name back
-//        assertEquals( "cn=Jack Black".toLowerCase(), listener.result.getName().toLowerCase() );
-//        assertEquals( listener.result.control.getChangeType(), ChangeType.ADD );
-//    }
-
+    //    public void testPsearchAddWithECAndFalseChangesOnly() throws Exception
+    //    {
+    //        PersistentSearchControl control = new PersistentSearchControl();
+    //        control.setReturnECs( true );
+    //        control.setChangesOnly( false );
+    //        PSearchListener listener = new PSearchListener( control );
+    //        Thread t = new Thread( listener );
+    //        t.start();
+    //        
+    //        Thread.sleep( 3000 );
+    //
+    //        assertEquals( 5, listener.count );
+    //        ctx.createSubcontext( "cn=Jack Black", getPersonAttributes( "Black", "Jack Black" ) );
+    //        
+    //        long start = System.currentTimeMillis();
+    //        while ( t.isAlive() )
+    //        {
+    //            Thread.sleep( 100 );
+    //            if ( System.currentTimeMillis() - start > 3000 )
+    //            {
+    //                break;
+    //            }
+    //        }
+    //        
+    //        assertEquals( 6, listener.count );
+    //        assertNotNull( listener.result );
+    //        // darn it getting normalized name back
+    //        assertEquals( "cn=Jack Black".toLowerCase(), listener.result.getName().toLowerCase() );
+    //        assertEquals( listener.result.control.getChangeType(), ChangeType.ADD );
+    //    }
 
     /**
      * Shows notifications functioning with the JNDI notification API of the SUN
@@ -535,7 +533,7 @@
         InitialDirContext idc = new InitialDirContext( env );
         EventDirContext edc = ( EventDirContext ) ( idc.lookup( "" ) );
         edc.addNamingListener( "", EventContext.ONELEVEL_SCOPE, listener );
-        
+
         while ( listener.list.isEmpty() )
         {
             Thread.sleep( 250 );
@@ -543,12 +541,12 @@
             ctx.createSubcontext( rdn, getPersonAttributes( "Black", "Jack Black" ) );
             ctx.destroySubcontext( rdn );
         }
-        
+
         NamingEvent event = ( NamingEvent ) listener.list.get( 0 );
         assertEquals( edc, event.getSource() );
     }
 
-    
+
     /**
      * Shows notifications functioning with the JNDI notification API of the SUN
      * provider.
@@ -560,15 +558,15 @@
         PSearchListener listener = new PSearchListener( control );
         Thread t = new Thread( listener );
         t.start();
-        
-        while( ! listener.isReady )
+
+        while ( !listener.isReady )
         {
             Thread.sleep( 100 );
         }
         Thread.sleep( 250 );
 
         ctx.createSubcontext( "cn=Jack Black", getPersonAttributes( "Black", "Jack Black" ) );
-        
+
         long start = System.currentTimeMillis();
         while ( t.isAlive() )
         {
@@ -578,7 +576,7 @@
                 break;
             }
         }
-        
+
         assertNotNull( listener.result );
         // darn it getting normalized name back
         assertEquals( "cn=Jack Black".toLowerCase(), listener.result.getName().toLowerCase() );
@@ -586,9 +584,9 @@
         listener.result = null;
         t = new Thread( listener );
         t.start();
-        
+
         ctx.destroySubcontext( "cn=Jack Black" );
-        
+
         start = System.currentTimeMillis();
         while ( t.isAlive() )
         {
@@ -603,8 +601,8 @@
         // assertNull( listener.result );
 
         // thread is still waiting for notifications try a modify
-        ctx.modifyAttributes( RDN, DirContext.REMOVE_ATTRIBUTE, 
-            new BasicAttributes( "description", PERSON_DESCRIPTION, true ) );
+        ctx.modifyAttributes( RDN, DirContext.REMOVE_ATTRIBUTE, new BasicAttributes( "description", PERSON_DESCRIPTION,
+            true ) );
         start = System.currentTimeMillis();
         while ( t.isAlive() )
         {
@@ -614,45 +612,48 @@
                 break;
             }
         }
-        
+
         assertNotNull( listener.result );
         // darn it getting normalized name back
         assertEquals( RDN.toLowerCase(), listener.result.getName().toLowerCase() );
         assertEquals( listener.result.control.getChangeType(), ChangeType.MODIFY );
     }
 
-    
     class JndiNotificationListener implements NamespaceChangeListener, ObjectChangeListener
     {
         ArrayList list = new ArrayList();
-        
-        public void objectAdded(NamingEvent evt)
+
+
+        public void objectAdded( NamingEvent evt )
         {
             list.add( 0, evt );
         }
 
-        public void objectRemoved(NamingEvent evt)
+
+        public void objectRemoved( NamingEvent evt )
         {
             list.add( 0, evt );
         }
 
-        public void objectRenamed(NamingEvent evt)
+
+        public void objectRenamed( NamingEvent evt )
         {
             list.add( 0, evt );
         }
 
-        public void namingExceptionThrown(NamingExceptionEvent evt)
+
+        public void namingExceptionThrown( NamingExceptionEvent evt )
         {
             list.add( 0, evt );
         }
 
-        public void objectChanged(NamingEvent evt)
+
+        public void objectChanged( NamingEvent evt )
         {
             list.add( 0, evt );
         }
     }
-    
-    
+
     class PSearchListener implements Runnable
     {
         boolean isReady = false;
@@ -660,23 +661,34 @@
         int count = 0;
         final PersistentSearchControl control;
 
-        PSearchListener() { control = new PersistentSearchControl(); }
-        PSearchListener( PersistentSearchControl control ) { this.control = control; }
-        
+
+        PSearchListener()
+        {
+            control = new PersistentSearchControl();
+        }
+
+
+        PSearchListener(PersistentSearchControl control)
+        {
+            this.control = control;
+        }
+
+
         public void run()
         {
             NamingEnumeration list = null;
             control.setCritical( true );
-            Control[] ctxCtls = new Control[] { control };
-            
+            Control[] ctxCtls = new Control[]
+                { control };
+
             try
             {
                 ctx.setRequestControls( ctxCtls );
                 isReady = true;
                 list = ctx.search( "", "objectClass=*", null );
                 EntryChangeControl ecControl = null;
-                
-                while( list.hasMore() )
+
+                while ( list.hasMore() )
                 {
                     Control[] controls = null;
                     SearchResult sresult = ( SearchResult ) list.next();
@@ -686,9 +698,9 @@
                         controls = ( ( HasControls ) sresult ).getControls();
                         if ( controls != null )
                         {
-                            for ( int ii = 0; ii < controls.length; ii ++ )
+                            for ( int ii = 0; ii < controls.length; ii++ )
                             {
-                                if ( controls[ii].getID().equals( 
+                                if ( controls[ii].getID().equals(
                                     org.apache.directory.shared.ldap.message.EntryChangeControl.CONTROL_OID ) )
                                 {
                                     EntryChangeControlDecoder decoder = new EntryChangeControlDecoder();
@@ -701,7 +713,7 @@
                     break;
                 }
             }
-            catch( Exception e ) 
+            catch ( Exception e )
             {
                 e.printStackTrace();
             }
@@ -709,24 +721,33 @@
             {
                 if ( list != null )
                 {
-                    try { list.close(); } catch ( Exception e ) { e.printStackTrace(); };
+                    try
+                    {
+                        list.close();
+                    }
+                    catch ( Exception e )
+                    {
+                        e.printStackTrace();
+                    };
                 }
             }
         }
     }
 
-
     class PSearchNotification extends SearchResult
     {
         private static final long serialVersionUID = 1L;
         final EntryChangeControl control;
-        
-        public PSearchNotification( SearchResult result, EntryChangeControl control )
+
+
+        public PSearchNotification(SearchResult result, EntryChangeControl control)
         {
-            super( result.getName(), result.getClassName(), result.getObject(), result.getAttributes(), result.isRelative() );
+            super( result.getName(), result.getClassName(), result.getObject(), result.getAttributes(), result
+                .isRelative() );
             this.control = control;
         }
-        
+
+
         public String toString()
         {
             StringBuffer buf = new StringBuffer();

Propchange: directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/PersistentSearchTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/server-unit/src/test/java/org/apache/directory/server/PersistentSearchTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id



Mime
View raw message